diff options
Diffstat (limited to 'contrib/oid2name/oid2name.c')
| -rw-r--r-- | contrib/oid2name/oid2name.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index e8a389e49e7..754eac5f8a2 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -44,6 +44,7 @@ struct options char *hostname; char *port; char *username; + const char *progname; }; /* function prototypes */ @@ -80,6 +81,7 @@ get_opts(int argc, char **argv, struct options * my_opts) my_opts->hostname = NULL; my_opts->port = NULL; my_opts->username = NULL; + my_opts->progname = progname; if (argc > 1) { @@ -308,14 +310,29 @@ sql_conn(struct options * my_opts) */ do { +#define PARAMS_ARRAY_SIZE 7 + + const char *keywords[PARAMS_ARRAY_SIZE]; + const char *values[PARAMS_ARRAY_SIZE]; + + keywords[0] = "host"; + values[0] = my_opts->hostname; + keywords[1] = "port"; + values[1] = my_opts->port; + keywords[2] = "user"; + values[2] = my_opts->username; + keywords[3] = "password"; + values[3] = password; + keywords[4] = "dbname"; + values[4] = my_opts->dbname; + keywords[5] = "fallback_application_name"; + values[5] = my_opts->progname; + keywords[6] = NULL; + values[6] = NULL; + new_pass = false; - conn = PQsetdbLogin(my_opts->hostname, - my_opts->port, - NULL, /* options */ - NULL, /* tty */ - my_opts->dbname, - my_opts->username, - password); + conn = PQconnectdbParams(keywords, values, true); + if (!conn) { fprintf(stderr, "%s: could not connect to database %s\n", |