diff options
| author | Andres Freund | 2020-06-15 17:14:40 +0000 |
|---|---|---|
| committer | Andres Freund | 2020-07-08 20:24:35 +0000 |
| commit | a9a4a7ad565b136cbee735d4bb505d98d06da522 (patch) | |
| tree | 76afdb4c439ca6de54dc073755c2ff03399506cb /src/backend/libpq/hba.c | |
| parent | 7c89f8a5b810d10dae300ec58ea7d70024e9123e (diff) | |
code: replace most remaining uses of 'master'.
Author: Andres Freund
Reviewed-By: David Steele
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/backend/libpq/hba.c')
| -rw-r--r-- | src/backend/libpq/hba.c | 12 |
1 files changed, 7 insertions, 5 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))); |