@@ -19,14 +19,23 @@ extern char *crypt(const char *, const char *);
1919
2020#endif
2121
22- #define PG_PASSWD_LEN 13/* not including null */
22+ /*
23+ * We assume that the output of crypt(3) is always 13 characters,
24+ * and that at most 8 characters can usefully be sent to it.
25+ *
26+ * Postgres usernames are assumed to be less than NAMEDATALEN chars long.
27+ */
28+ #define CLEAR_PASSWD_LEN 8/* not including null */
29+ #define CRYPTED_PASSWD_LEN 13/* not including null */
2330
2431const char * progname ;
2532
2633static void usage (void );
2734static void read_pwd_file (char * filename );
2835static void write_pwd_file (char * filename ,char * bkname );
29- static void encrypt_pwd (char key [9 ],char salt [3 ],char passwd [PG_PASSWD_LEN + 1 ]);
36+ static void encrypt_pwd (char key [CLEAR_PASSWD_LEN + 1 ],
37+ char salt [3 ],
38+ char passwd [CRYPTED_PASSWD_LEN + 1 ]);
3039static void prompt_for_username (char * username );
3140static void prompt_for_password (char * prompt ,char * password );
3241
@@ -94,7 +103,9 @@ read_pwd_file(char *filename)
94103}
95104
96105/* read all the entries */
97- for (npwds = 0 ;npwds < MAXPWDS && fgets (line ,512 ,fp )!= NULL ;++ npwds )
106+ for (npwds = 0 ;
107+ npwds < MAXPWDS && fgets (line ,sizeof (line ),fp )!= NULL ;
108+ ++ npwds )
98109{
99110int l ;
100111char * p ,
@@ -123,13 +134,13 @@ read_pwd_file(char *filename)
123134}
124135pwds [npwds ].uname = strdup (p );
125136
126- /* check duplicate */
137+ /* checkfor duplicate user name */
127138for (i = 0 ;i < npwds ;++ i )
128139{
129140if (strcmp (pwds [i ].uname ,pwds [npwds ].uname )== 0 )
130141{
131- fprintf (stderr ,"Duplicated entry: %s\n" ,
132- pwds [npwds ].uname );
142+ fprintf (stderr ,"Duplicate username %s in entry %d \n" ,
143+ pwds [npwds ].uname , npwds + 1 );
133144exit (1 );
134145}
135146}
@@ -143,7 +154,7 @@ read_pwd_file(char *filename)
143154if (q != NULL )
144155* (q ++ )= '\0' ;
145156
146- if (strlen (p )!= PG_PASSWD_LEN && strcmp (p ,"+" )!= 0 )
157+ if (strlen (p )!= CRYPTED_PASSWD_LEN && strcmp (p ,"+" )!= 0 )
147158{
148159fprintf (stderr ,"%s:%d: warning: invalid password length\n" ,
149160filename ,npwds + 1 );
@@ -209,11 +220,13 @@ write_pwd_file(char *filename, char *bkname)
209220}
210221
211222static void
212- encrypt_pwd (char key [9 ],char salt [3 ],char passwd [PG_PASSWD_LEN + 1 ])
223+ encrypt_pwd (char key [CLEAR_PASSWD_LEN + 1 ],
224+ char salt [3 ],
225+ char passwd [CRYPTED_PASSWD_LEN + 1 ])
213226{
214227int n ;
215228
216- /*get encrypted password */
229+ /*select a salt, if not already given */
217230if (salt [0 ]== '\0' )
218231{
219232srand (time (NULL ));
@@ -229,32 +242,16 @@ encrypt_pwd(char key[9], char salt[3], char passwd[PG_PASSWD_LEN + 1])
229242salt [1 ]= n ;
230243salt [2 ]= '\0' ;
231244}
245+
246+ /* get encrypted password */
232247strcpy (passwd ,crypt (key ,salt ));
233248
249+ #ifdef PG_PASSWD_DEBUG
234250/* show it */
235-
236- /*
237- * fprintf(stderr, "key = %s, salt = %s, password = %s\n", key, salt,
238- * passwd);
239- */
240- }
241-
242- #ifdef NOT_USED
243- static int
244- check_pwd (char key [9 ],char passwd [PG_PASSWD_LEN + 1 ])
245- {
246- char shouldbe [PG_PASSWD_LEN + 1 ];
247- char salt [3 ];
248-
249- salt [0 ]= passwd [0 ];
250- salt [1 ]= passwd [1 ];
251- salt [2 ]= '\0' ;
252- encrypt_pwd (key ,salt ,shouldbe );
253-
254- return strncmp (shouldbe ,passwd ,PG_PASSWD_LEN )== 0 ?1 :0 ;
255- }
256-
251+ fprintf (stderr ,"key = %s, salt = %s, password = %s\n" ,
252+ key ,salt ,passwd );
257253#endif
254+ }
258255
259256static void
260257prompt_for_username (char * username )
@@ -263,7 +260,7 @@ prompt_for_username(char *username)
263260
264261printf ("Username: " );
265262fflush (stdout );
266- if (fgets (username ,9 ,stdin )== NULL )
263+ if (fgets (username ,NAMEDATALEN ,stdin )== NULL )
267264username [0 ]= '\0' ;
268265
269266length = strlen (username );
@@ -295,16 +292,19 @@ prompt_for_password(char *prompt, char *password)
295292
296293#endif
297294
298- printf (prompt );
299- fflush (stdout );
300295#ifdef HAVE_TERMIOS_H
301296tcgetattr (0 ,& t );
302297t_orig = t ;
303298t .c_lflag &= ~ECHO ;
304299tcsetattr (0 ,TCSADRAIN ,& t );
305300#endif
306- if (fgets (password ,9 ,stdin )== NULL )
301+
302+ printf (prompt );
303+ fflush (stdout );
304+
305+ if (fgets (password ,CLEAR_PASSWD_LEN + 1 ,stdin )== NULL )
307306password [0 ]= '\0' ;
307+
308308#ifdef HAVE_TERMIOS_H
309309tcsetattr (0 ,TCSADRAIN ,& t_orig );
310310#endif
@@ -332,13 +332,13 @@ prompt_for_password(char *prompt, char *password)
332332int
333333main (int argc ,char * argv [])
334334{
335- static char bkname [MAXPGPATH ];
336335char * filename ;
337- char username [9 ];
336+ char bkname [MAXPGPATH ];
337+ char username [NAMEDATALEN ];
338338char salt [3 ];
339- char key [9 ],
340- key2 [9 ];
341- char e_passwd [PG_PASSWD_LEN + 1 ];
339+ char key [CLEAR_PASSWD_LEN + 1 ],
340+ key2 [CLEAR_PASSWD_LEN + 1 ];
341+ char e_passwd [CRYPTED_PASSWD_LEN + 1 ];
342342int i ;
343343
344344progname = argv [0 ];
@@ -376,7 +376,7 @@ main(int argc, char *argv[])
376376prompt_for_username (username );
377377prompt_for_password ("New password: " ,key );
378378prompt_for_password ("Re-enter new password: " ,key2 );
379- if (strncmp (key ,key2 , 8 )!= 0 )
379+ if (strcmp (key ,key2 )!= 0 )
380380{
381381fprintf (stderr ,"Password mismatch\n" );
382382exit (1 );
@@ -397,7 +397,7 @@ main(int argc, char *argv[])
397397{/* did not exist */
398398if (npwds == MAXPWDS )
399399{
400- fprintf (stderr ,"Cannot handle somay entries\n" );
400+ fprintf (stderr ,"Cannot handle somany entries\n" );
401401exit (1 );
402402}
403403pwds [npwds ].uname = strdup (username );