Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0bba6bd

Browse files
committed
Improve wording of authentication files.
1 parent 2c5aa2a commit 0bba6bd

File tree

4 files changed

+241
-210
lines changed

4 files changed

+241
-210
lines changed

doc/src/sgml/ref/pg_passwd.sgml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pg_passwd.sgml,v 1.6 2001/02/20 01:16:49 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pg_passwd.sgml,v 1.7 2001/06/18 16:11:30 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -16,7 +16,7 @@ Postgres documentation
1616

1717
<refnamediv>
1818
<refname>pg_passwd</refname>
19-
<refpurpose>Manipulate a text password file</refpurpose>
19+
<refpurpose>Manipulate a secondary password file</refpurpose>
2020
</refnamediv>
2121

2222
<refsynopsisdiv>
@@ -29,30 +29,28 @@ Postgres documentation
2929
<refsect1 id="app-pg-passwd-description">
3030
<title>Description</title>
3131
<para>
32-
<application>pg_passwd</application> is a tool to manipulate a flat
33-
text password file for the purpose of using that file to control
34-
client authentication of the
35-
<productname>PostgreSQL</productname> server. More information
32+
<application>pg_passwd</application> is a tool for manipulating flat
33+
text password files. These files can control client authentication of
34+
the <productname>PostgreSQL</productname> server. More information
3635
about setting up this authentication mechanism can be found in the
3736
<citetitle>Administrator's Guide</citetitle>.
3837
</para>
3938

4039
<para>
41-
The form of a text password file is one entry per line; the fields
42-
of each entry are separated by colons. The first field is the user
43-
name, the second field is the encrypted password. Other fields are
40+
The format of a text password file is one entry per line; the fields
41+
of each entry are separated by colons. The first field is the user
42+
name, the second field is the encrypted password. Other fields are
4443
ignored (to allow password files to be shared between applications
45-
that use similar formats). The functionality of the
46-
<application>pg_passwd</application> utility is to enable a user to
47-
interactively add entries to such a file, to alter passwords of
48-
existing entries, and to take care of encrypting the passwords.
44+
that use similar formats). <application>pg_passwd</application>
45+
enables users to interactively add entries to such a file, to alter
46+
passwords of existing entries, and to encrypt such passwords.
4947
</para>
5048

5149
<para>
52-
Supply the name of the password file as argument to the <application>pg_passwd</application>
53-
command. To be of use for client authentication the file needs to
54-
be located in the server's data directory, and the base name of
55-
the file needs to be specified in the
50+
Supply the name of the password file as argument to the
51+
<application>pg_passwd</application> command. To be used by
52+
PostgreSQL, the file needs to be located in the server's data
53+
directory, and the base name of the file needs to be specified in the
5654
<filename>pg_hba.conf</filename> access control file.
5755

5856
<screen>
@@ -90,11 +88,11 @@ host mydb 133.65.96.250 255.255.255.255 password passwords
9088

9189
<note>
9290
<para>
93-
It is also useful to have entries in a password file with an empty
94-
password field. (This is different from an empty password.)
95-
These entries cannot be managed by
96-
<application>pg_passwd</application>, but it is always possible to
97-
edit password files manually.
91+
It is also useful to have entries in a password file with empty
92+
password fields. (This is different from an empty password.) Such
93+
entries allow you to restrict users who can access the system. These
94+
entries cannot be managed by <application>pg_passwd</application>,
95+
but you can edit password files manually.
9896
</para>
9997
</note>
10098
</refsect1>

src/backend/libpq/password.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
33
* Portions Copyright (c) 1994, Regents of the University of California
44
*
5-
* $Id: password.c,v 1.36 2001/03/22 03:59:30 momjian Exp $
5+
* $Id: password.c,v 1.37 2001/06/18 16:11:30 momjian Exp $
66
*
77
*/
88

@@ -76,9 +76,11 @@ verify_password(const Port *port, const char *user, const char *password)
7676
FreeFile(pw_file);
7777

7878
/*
79-
* If the password is empty of "+" then we use the regular
79+
* If the password is empty or "+" then we use the regular
8080
* pg_shadow passwords. If we use crypt then we have to use
81-
* pg_shadow passwords no matter what.
81+
* pg_shadow passwords no matter what. This is because
82+
* the current code needs non-encrypted passwords to
83+
* encrypt with a random salt.
8284
*/
8385
if (port->auth_method == uaCrypt
8486
|| test_pw == NULL || test_pw[0] == '\0'

0 commit comments

Comments
 (0)