*** pgsql/src/backend/libpq/hba.c	2009/03/25 14:12:02	1.184
--- pgsql/src/backend/libpq/hba.c	2009/04/15 21:42:50	1.185
***************
*** 10,16 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.183 2009/03/07 21:28:00 mha Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 10,16 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.184 2009/03/25 14:12:02 petere Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** check_db(const char *dbname, const char
*** 578,585 ****
  #define INVALID_AUTH_OPTION(optname, validmethods) do {\
  	ereport(LOG, \
  			(errcode(ERRCODE_CONFIG_FILE_ERROR), \
! 			 errmsg("authentication option \"%s\" is only valid for authentication methods \"%s\"", \
! 					optname, validmethods), \
  			 errcontext("line %d of configuration file \"%s\"", \
  					line_num, HbaFileName))); \
  	return false; \
--- 578,586 ----
  #define INVALID_AUTH_OPTION(optname, validmethods) do {\
  	ereport(LOG, \
  			(errcode(ERRCODE_CONFIG_FILE_ERROR), \
! 			 /* translator: the second %s is a list of auth methods */ \
! 			 errmsg("authentication option \"%s\" is only valid for authentication methods %s", \
! 					optname, _(validmethods)), \
  			 errcontext("line %d of configuration file \"%s\"", \
  					line_num, HbaFileName))); \
  	return false; \
*************** parse_hba_line(List *line, int line_num,
*** 952,958 ****
  					parsedline->auth_method != uaGSS &&
  					parsedline->auth_method != uaSSPI &&
  					parsedline->auth_method != uaCert)
! 					INVALID_AUTH_OPTION("map", "ident, krb5, gssapi, sspi and cert");
  				parsedline->usermap = pstrdup(c);
  			}
  			else if (strcmp(token, "clientcert") == 0)
--- 953,959 ----
  					parsedline->auth_method != uaGSS &&
  					parsedline->auth_method != uaSSPI &&
  					parsedline->auth_method != uaCert)
! 					INVALID_AUTH_OPTION("map", gettext_noop("ident, krb5, gssapi, sspi and cert"));
  				parsedline->usermap = pstrdup(c);
  			}
  			else if (strcmp(token, "clientcert") == 0)
*************** parse_hba_line(List *line, int line_num,
*** 1050,1056 ****
  				if (parsedline->auth_method != uaKrb5 &&
  					parsedline->auth_method != uaGSS &&
  					parsedline->auth_method != uaSSPI)
! 					INVALID_AUTH_OPTION("krb_realm", "krb5, gssapi and sspi");
  				parsedline->krb_realm = pstrdup(c);
  			}
  			else if (strcmp(token, "include_realm") == 0)
--- 1051,1057 ----
  				if (parsedline->auth_method != uaKrb5 &&
  					parsedline->auth_method != uaGSS &&
  					parsedline->auth_method != uaSSPI)
! 					INVALID_AUTH_OPTION("krb_realm", gettext_noop("krb5, gssapi and sspi"));
  				parsedline->krb_realm = pstrdup(c);
  			}
  			else if (strcmp(token, "include_realm") == 0)
*************** parse_hba_line(List *line, int line_num,
*** 1058,1064 ****
  				if (parsedline->auth_method != uaKrb5 &&
  					parsedline->auth_method != uaGSS &&
  					parsedline->auth_method != uaSSPI)
! 					INVALID_AUTH_OPTION("include_realm", "krb5, gssapi and sspi");
  				if (strcmp(c, "1") == 0)
  					parsedline->include_realm = true;
  				else
--- 1059,1065 ----
  				if (parsedline->auth_method != uaKrb5 &&
  					parsedline->auth_method != uaGSS &&
  					parsedline->auth_method != uaSSPI)
! 					INVALID_AUTH_OPTION("include_realm", gettext_noop("krb5, gssapi and sspi"));
  				if (strcmp(c, "1") == 0)
  					parsedline->include_realm = true;
  				else