|
10 | 10 | * |
11 | 11 | * |
12 | 12 | * IDENTIFICATION |
13 | | - * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.184 2009/03/25 14:12:02 petere Exp $ |
| 13 | + * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.185 2009/04/15 21:42:50 alvherre Exp $ |
14 | 14 | * |
15 | 15 | *------------------------------------------------------------------------- |
16 | 16 | */ |
@@ -578,8 +578,9 @@ check_db(const char *dbname, const char *role, char *param_str) |
578 | 578 | #defineINVALID_AUTH_OPTION(optname,validmethods) do {\ |
579 | 579 | ereport(LOG, \ |
580 | 580 | (errcode(ERRCODE_CONFIG_FILE_ERROR), \ |
581 | | - errmsg("authentication option \"%s\" is only valid for authentication methods \"%s\"", \ |
582 | | -optname, validmethods), \ |
| 581 | +/* translator: the second %s is a list of auth methods */ \ |
| 582 | +errmsg("authentication option \"%s\" is only valid for authentication methods %s", \ |
| 583 | +optname,_(validmethods)), \ |
583 | 584 | errcontext("line %d of configuration file \"%s\"", \ |
584 | 585 | line_num,HbaFileName))); \ |
585 | 586 | return false; \ |
@@ -952,7 +953,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline) |
952 | 953 | parsedline->auth_method!=uaGSS&& |
953 | 954 | parsedline->auth_method!=uaSSPI&& |
954 | 955 | parsedline->auth_method!=uaCert) |
955 | | -INVALID_AUTH_OPTION("map","ident, krb5, gssapi, sspi and cert"); |
| 956 | +INVALID_AUTH_OPTION("map",gettext_noop("ident, krb5, gssapi, sspi and cert")); |
956 | 957 | parsedline->usermap=pstrdup(c); |
957 | 958 | } |
958 | 959 | elseif (strcmp(token,"clientcert")==0) |
@@ -1050,15 +1051,15 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline) |
1050 | 1051 | if (parsedline->auth_method!=uaKrb5&& |
1051 | 1052 | parsedline->auth_method!=uaGSS&& |
1052 | 1053 | parsedline->auth_method!=uaSSPI) |
1053 | | -INVALID_AUTH_OPTION("krb_realm","krb5, gssapi and sspi"); |
| 1054 | +INVALID_AUTH_OPTION("krb_realm",gettext_noop("krb5, gssapi and sspi")); |
1054 | 1055 | parsedline->krb_realm=pstrdup(c); |
1055 | 1056 | } |
1056 | 1057 | elseif (strcmp(token,"include_realm")==0) |
1057 | 1058 | { |
1058 | 1059 | if (parsedline->auth_method!=uaKrb5&& |
1059 | 1060 | parsedline->auth_method!=uaGSS&& |
1060 | 1061 | parsedline->auth_method!=uaSSPI) |
1061 | | -INVALID_AUTH_OPTION("include_realm","krb5, gssapi and sspi"); |
| 1062 | +INVALID_AUTH_OPTION("include_realm",gettext_noop("krb5, gssapi and sspi")); |
1062 | 1063 | if (strcmp(c,"1")==0) |
1063 | 1064 | parsedline->include_realm= true; |
1064 | 1065 | else |
|