diff options
Diffstat (limited to 'src/backend/libpq')
| -rw-r--r-- | src/backend/libpq/hba.c | 12 | ||||
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index da5189a4fa0..9d63830553e 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -145,7 +145,7 @@ static List *tokenize_inc_file(List *tokens, const char *outer_filename, static bool parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline, int elevel, char **err_msg); static bool verify_option_list_length(List *options, const char *optionname, - List *masters, const char *mastername, int line_num); + List *comparelist, const char *comparename, int line_num); static ArrayType *gethba_options(HbaLine *hba); static void fill_hba_line(Tuplestorestate *tuple_store, TupleDesc tupdesc, int lineno, HbaLine *hba, const char *err_msg); @@ -1648,11 +1648,13 @@ parse_hba_line(TokenizedLine *tok_line, int elevel) static bool -verify_option_list_length(List *options, const char *optionname, List *masters, const char *mastername, int line_num) +verify_option_list_length(List *options, const char *optionname, + List *comparelist, const char *comparename, + int line_num) { if (list_length(options) == 0 || list_length(options) == 1 || - list_length(options) == list_length(masters)) + list_length(options) == list_length(comparelist)) return true; ereport(LOG, @@ -1660,8 +1662,8 @@ verify_option_list_length(List *options, const char *optionname, List *masters, errmsg("the number of %s (%d) must be 1 or the same as the number of %s (%d)", optionname, list_length(options), - mastername, - list_length(masters) + comparename, + list_length(comparelist) ), errcontext("line %d of configuration file \"%s\"", line_num, HbaFileName))); diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 7717bb27195..ac986c05056 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -705,8 +705,8 @@ Setup_AF_UNIX(const char *sock_path) * server port. Set port->sock to the FD of the new connection. * * ASSUME: that this doesn't need to be non-blocking because - * the Postmaster uses select() to tell when the server master - * socket is ready for accept(). + * the Postmaster uses select() to tell when the socket is ready for + * accept(). * * RETURNS: STATUS_OK or STATUS_ERROR */ |