1010 *
1111 *
1212 * IDENTIFICATION
13- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.187 2009/06/21 20:15:32 petere Exp $
13+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.188 2009/06/24 13:39:42 mha Exp $
1414 *
1515 *-------------------------------------------------------------------------
1616 */
@@ -1493,7 +1493,7 @@ parse_ident_usermap(List *line, int line_number, const char *usermap_name,
14931493char errstr [100 ];
14941494
14951495pg_regerror (r ,& re ,errstr ,sizeof (errstr ));
1496- ereport (ERROR ,
1496+ ereport (LOG ,
14971497(errcode (ERRCODE_INVALID_REGULAR_EXPRESSION ),
14981498errmsg ("invalid regular expression \"%s\": %s" ,file_ident_user + 1 ,errstr )));
14991499
@@ -1515,7 +1515,7 @@ parse_ident_usermap(List *line, int line_number, const char *usermap_name,
15151515{
15161516/* REG_NOMATCH is not an error, everything else is */
15171517pg_regerror (r ,& re ,errstr ,sizeof (errstr ));
1518- ereport (ERROR ,
1518+ ereport (LOG ,
15191519(errcode (ERRCODE_INVALID_REGULAR_EXPRESSION ),
15201520errmsg ("regular expression match for \"%s\" failed: %s" ,file_ident_user + 1 ,errstr )));
15211521* error_p = true;
@@ -1531,10 +1531,15 @@ parse_ident_usermap(List *line, int line_number, const char *usermap_name,
15311531{
15321532/* substitution of the first argument requested */
15331533if (matches [1 ].rm_so < 0 )
1534- ereport (ERROR ,
1534+ {
1535+ ereport (LOG ,
15351536(errcode (ERRCODE_INVALID_REGULAR_EXPRESSION ),
15361537errmsg ("regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\"" ,
15371538file_ident_user + 1 ,file_pgrole )));
1539+ pg_regfree (& re );
1540+ * error_p = true;
1541+ return ;
1542+ }
15381543
15391544/*
15401545 * length: original length minus length of \1 plus length of match