diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 5bfd378f8a..fa34407d17 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.34 2007/12/11 02:08:59 tgl Exp $ + * $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.35 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -308,7 +308,7 @@ usage(void) fprintf(stdout, " -v\t\tWrite a lot of progress messages\n"); fprintf(stdout, " -n\t\tDon't remove large objects, just show what would be done\n"); fprintf(stdout, " -U username\tUsername to connect as\n"); - fprintf(stdout, " -W\t\tPrompt for password\n"); + fprintf(stdout, " -W\t\tForce password prompt\n"); fprintf(stdout, " -h hostname\tDatabase server host\n"); fprintf(stdout, " -p port\tDatabase server port\n\n"); } diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml index 15caa1affa..2990b2c8af 100644 --- a/doc/src/sgml/ref/clusterdb.sgml +++ b/doc/src/sgml/ref/clusterdb.sgml @@ -1,5 +1,5 @@ @@ -164,7 +164,18 @@ PostgreSQL documentation - Force password prompt. + Force clusterdb to prompt for a + password before connecting to a database. + + + + This option is never essential, since + clusterdb will automatically prompt + for a password if the server demands password authentication. + However, clusterdb will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml index 3b12e94f79..c75042c9b7 100644 --- a/doc/src/sgml/ref/createdb.sgml +++ b/doc/src/sgml/ref/createdb.sgml @@ -1,5 +1,5 @@ @@ -183,7 +183,7 @@ PostgreSQL documentation - User name to connect as + User name to connect as. @@ -193,7 +193,18 @@ PostgreSQL documentation - Force password prompt. + Force createdb to prompt for a + password before connecting to a database. + + + + This option is never essential, since + createdb will automatically prompt + for a password if the server demands password authentication. + However, createdb will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml index 9441eef1de..8383c66a8f 100644 --- a/doc/src/sgml/ref/createlang.sgml +++ b/doc/src/sgml/ref/createlang.sgml @@ -1,5 +1,5 @@ @@ -144,7 +144,18 @@ PostgreSQL documentation - Force password prompt. + Force createlang to prompt for a + password before connecting to a database. + + + + This option is never essential, since + createlang will automatically prompt + for a password if the server demands password authentication. + However, createlang will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml index b002593a23..95283e6775 100644 --- a/doc/src/sgml/ref/createuser.sgml +++ b/doc/src/sgml/ref/createuser.sgml @@ -1,5 +1,5 @@ @@ -295,9 +295,20 @@ PostgreSQL documentation - Force password prompt (to connect to the server, not for the + Force createuser to prompt for a + password (for connecting to the server, not for the password of the new user). + + + This option is never essential, since + createuser will automatically prompt + for a password if the server demands password authentication. + However, createuser will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml index b60c7a8252..daf01287fb 100644 --- a/doc/src/sgml/ref/dropdb.sgml +++ b/doc/src/sgml/ref/dropdb.sgml @@ -1,5 +1,5 @@ @@ -123,7 +123,7 @@ PostgreSQL documentation - User name to connect as + User name to connect as. @@ -133,7 +133,18 @@ PostgreSQL documentation - Force password prompt. + Force dropdb to prompt for a + password before connecting to a database. + + + + This option is never essential, since + dropdb will automatically prompt + for a password if the server demands password authentication. + However, dropdb will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml index c284476c2a..ee334e13e5 100644 --- a/doc/src/sgml/ref/droplang.sgml +++ b/doc/src/sgml/ref/droplang.sgml @@ -1,5 +1,5 @@ @@ -142,7 +142,7 @@ PostgreSQL documentation - User name to connect as + User name to connect as. @@ -152,7 +152,18 @@ PostgreSQL documentation - Force password prompt. + Force droplang to prompt for a + password before connecting to a database. + + + + This option is never essential, since + droplang will automatically prompt + for a password if the server demands password authentication. + However, droplang will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml index a1d560009e..af57135f12 100644 --- a/doc/src/sgml/ref/dropuser.sgml +++ b/doc/src/sgml/ref/dropuser.sgml @@ -1,5 +1,5 @@ @@ -125,7 +125,7 @@ PostgreSQL documentation - User name to connect as (not the user name to drop) + User name to connect as (not the user name to drop). @@ -135,8 +135,18 @@ PostgreSQL documentation - Force password prompt (to connect to the server, not for the - password of the user to be dropped). + Force dropuser to prompt for a + password before connecting to a database. + + + + This option is never essential, since + dropuser will automatically prompt + for a password if the server demands password authentication. + However, dropuser will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index 6bb1cf4a47..fd0d56d8c0 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -1,5 +1,5 @@ @@ -647,7 +647,7 @@ PostgreSQL documentation - Connect as the given user. + User name to connect as. @@ -657,8 +657,18 @@ PostgreSQL documentation - Force a password prompt. This should happen automatically if - the server requires password authentication. + Force pg_dump to prompt for a + password before connecting to a database. + + + + This option is never essential, since + pg_dump will automatically prompt + for a password if the server demands password authentication. + However, pg_dump will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml index 0d944278c4..a697cdbb91 100644 --- a/doc/src/sgml/ref/pg_dumpall.sgml +++ b/doc/src/sgml/ref/pg_dumpall.sgml @@ -1,5 +1,5 @@ @@ -59,7 +59,7 @@ PostgreSQL documentation pg_dumpall needs to connect several times to the PostgreSQL server (once per - database). If you use password authentication it is likely to ask for + database). If you use password authentication it will ask for a password each time. It is convenient to have a ~/.pgpass file in such cases. See for more information. @@ -367,7 +367,7 @@ PostgreSQL documentation --username=username - Connect as the given user. + User name to connect as. @@ -377,8 +377,24 @@ PostgreSQL documentation --password - Force a password prompt. This should happen automatically if - the server requires password authentication. + Force pg_dumpall to prompt for a + password before connecting to a database. + + + + This option is never essential, since + pg_dumpall will automatically prompt + for a password if the server demands password authentication. + However, pg_dumpall will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing + + + Note that the password prompt will occur again for each database + to be dumped. Usually, it's better to set up a + ~/.pgpass file than to rely on manual password entry. diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml index a311affc3c..17a99e5395 100644 --- a/doc/src/sgml/ref/pg_restore.sgml +++ b/doc/src/sgml/ref/pg_restore.sgml @@ -1,4 +1,4 @@ - + @@ -458,7 +458,7 @@ - Connect as the given user. + User name to connect as. @@ -468,8 +468,18 @@ - Force a password prompt. This should happen automatically if - the server requires password authentication. + Force pg_restore to prompt for a + password before connecting to a database. + + + + This option is never essential, since + pg_restore will automatically prompt + for a password if the server demands password authentication. + However, pg_restore will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 63c9c4303c..40a02812fe 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -406,25 +406,24 @@ PostgreSQL documentation - Forces psql to prompt for a - password before connecting to a database. + Force psql to prompt for a + password before connecting to a database. - psql should automatically prompt for a - password whenever the server requests password authentication. - However, currently password request detection is not totally - reliable, hence this option to force a prompt. If no password - prompt is issued and the server requires password authentication, - the connection attempt will fail. + This option is never essential, since psql + will automatically prompt for a password if the server demands + password authentication. However, psql + will waste a connection attempt finding out that the server wants a + password. In some cases it is worth typing - This option will remain set for the entire session, even if you - change the database connection with the meta-command - \connect. + Note that this option will remain set for the entire session, + and so it affects uses of the meta-command + \connect as well as the initial connection attempt. - diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml index e4469bb12e..259b170860 100644 --- a/doc/src/sgml/ref/reindexdb.sgml +++ b/doc/src/sgml/ref/reindexdb.sgml @@ -186,7 +186,18 @@ PostgreSQL documentation - Force password prompt. + Force reindexdb to prompt for a + password before connecting to a database. + + + + This option is never essential, since + reindexdb will automatically prompt + for a password if the server demands password authentication. + However, reindexdb will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml index 87c34cee4b..1e915eed5d 100644 --- a/doc/src/sgml/ref/vacuumdb.sgml +++ b/doc/src/sgml/ref/vacuumdb.sgml @@ -1,5 +1,5 @@ @@ -199,7 +199,7 @@ PostgreSQL documentation - User name to connect as + User name to connect as. @@ -209,7 +209,18 @@ PostgreSQL documentation - Force password prompt. + Force vacuumdb to prompt for a + password before connecting to a database. + + + + This option is never essential, since + vacuumdb will automatically prompt + for a password if the server demands password authentication. + However, vacuumdb will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml index ab4c60551f..4152d3f59a 100644 --- a/doc/src/sgml/vacuumlo.sgml +++ b/doc/src/sgml/vacuumlo.sgml @@ -1,4 +1,4 @@ - + vacuumlo @@ -38,42 +38,55 @@ vacuumlo [options] database [database2 ... databaseN] - Write a lot of progress messages + Write a lot of progress messages. - Don't remove anything, just show what would be done + Don't remove anything, just show what would be done. username - Username to connect as + Username to connect as. - Force prompt for password (generally useless) + + Force vacuumlo to prompt for a + password before connecting to a database. + + + + This option is never essential, since + vacuumlo will automatically prompt + for a password if the server demands password authentication. + However, vacuumlo will waste a + connection attempt finding out that the server wants a password. + In some cases it is worth typing hostname - Database server's host + Database server's host. port - Database server's port + Database server's port. diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 7fb82b66bd..9cca4c2826 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.119 2007/11/15 21:14:42 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.120 2007/12/11 19:57:32 tgl Exp $ */ #include "postgres_fe.h" @@ -132,7 +132,7 @@ usage(void) if (!env) env = user; printf(_(" -U NAME database user name (default: \"%s\")\n"), env); - puts(_(" -W prompt for password (should happen automatically)")); + puts(_(" -W force password prompt (should happen automatically)")); puts(_( "\nFor more information, type \"\\?\" (for internal commands) or \"\\help\"\n" diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c index 261aea2c02..09985830c5 100644 --- a/src/bin/scripts/clusterdb.c +++ b/src/bin/scripts/clusterdb.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 2002-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.19 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -236,7 +236,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_("\nRead the description of the SQL command CLUSTER for details.\n")); printf(_("\nReport bugs to .\n")); } diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c index 71f81aa2c8..b059e0f515 100644 --- a/src/bin/scripts/createdb.c +++ b/src/bin/scripts/createdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.24 2007/10/13 20:18:41 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.25 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -218,7 +218,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_("\nBy default, a database with the same name as the current user is created.\n")); printf(_("\nReport bugs to .\n")); } diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c index e1d2841673..6fe6f25e6f 100644 --- a/src/bin/scripts/createlang.c +++ b/src/bin/scripts/createlang.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.26 2007/08/10 00:39:31 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.27 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -212,7 +212,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); printf(_("\nReport bugs to .\n")); diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c index aa7eac674f..f0c087545a 100644 --- a/src/bin/scripts/createuser.c +++ b/src/bin/scripts/createuser.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.36 2007/06/04 10:02:40 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.37 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -329,7 +329,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as (not the one to create)\n")); - printf(_(" -W, --password prompt for password to connect\n")); + printf(_(" -W, --password force password prompt\n")); printf(_("\nIf one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n" "be prompted interactively.\n")); printf(_("\nReport bugs to .\n")); diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c index d912338d56..4be42c3b32 100644 --- a/src/bin/scripts/dropdb.c +++ b/src/bin/scripts/dropdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.20 2007/06/04 10:02:40 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.21 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -145,7 +145,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); printf(_("\nReport bugs to .\n")); diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c index 47da28e33a..bd255585b4 100644 --- a/src/bin/scripts/droplang.c +++ b/src/bin/scripts/droplang.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.23 2007/08/10 00:39:31 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.24 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -329,7 +329,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); printf(_("\nReport bugs to .\n")); diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c index 3ee2502fe0..5d757a1221 100644 --- a/src/bin/scripts/dropuser.c +++ b/src/bin/scripts/dropuser.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.21 2007/06/04 10:02:40 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.22 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -144,7 +144,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as (not the one to drop)\n")); - printf(_(" -W, --password prompt for password to connect\n")); + printf(_(" -W, --password force password prompt\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); printf(_("\nReport bugs to .\n")); diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index 99a676f8f5..0e32e1714c 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.11 2007/06/04 10:02:40 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.12 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -322,7 +322,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_("\nRead the description of the SQL command REINDEX for details.\n")); printf(_("\nReport bugs to .\n")); } diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index b4f65b2dc2..3d4f719aee 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.19 2007/12/11 19:57:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -265,7 +265,7 @@ help(const char *progname) printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -p, --port=PORT database server port\n")); printf(_(" -U, --username=USERNAME user name to connect as\n")); - printf(_(" -W, --password prompt for password\n")); + printf(_(" -W, --password force password prompt\n")); printf(_("\nRead the description of the SQL command VACUUM for details.\n")); printf(_("\nReport bugs to .\n")); }