66 * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
77 * Portions Copyright (c) 1994, Regents of the University of California
88 *
9- * $Id: user.c,v 1.52 2000/04/12 17:14:59 momjian Exp $
9+ * $Id: user.c,v 1.53 2000/05/04 20:06:07 tgl Exp $
1010 *
1111 *-------------------------------------------------------------------------
1212 */
@@ -56,6 +56,7 @@ write_password_file(Relation rel)
5656* tempname ;
5757int bufsize ;
5858FILE * fp ;
59+ int flagfd ;
5960mode_t oumask ;
6061HeapScanDesc scan ;
6162HeapTuple tuple ;
@@ -75,7 +76,7 @@ write_password_file(Relation rel)
7576fp = AllocateFile (tempname ,"w" );
7677umask (oumask );
7778if (fp == NULL )
78- elog (ERROR ,"%s: %s " ,tempname , strerror ( errno ) );
79+ elog (ERROR ,"%s: %m " ,tempname );
7980
8081/* read table */
8182scan = heap_beginscan (rel , false,SnapshotSelf ,0 ,NULL );
@@ -129,29 +130,38 @@ write_password_file(Relation rel)
129130null_v ?"\\N" :nabstimeout ((AbsoluteTime )datum_v )/* this is how the
130131 * parser wants it */
131132);
132- if (ferror (fp ))
133- elog (ERROR ,"%s: %s" ,tempname ,strerror (errno ));
134- fflush (fp );
135133}
136134heap_endscan (scan );
135+
136+ fflush (fp );
137+ if (ferror (fp ))
138+ elog (ERROR ,"%s: %m" ,tempname );
137139FreeFile (fp );
138140
139141/*
140142 * And rename the temp file to its final name, deleting the old
141143 * pg_pwd.
142144 */
143- rename (tempname ,filename );
145+ if (rename (tempname ,filename ))
146+ elog (ERROR ,"rename %s to %s: %m" ,tempname ,filename );
147+
148+ pfree ((void * )tempname );
149+ pfree ((void * )filename );
144150
145151/*
146152 * Create a flag file the postmaster will detect the next time it
147153 * tries to authenticate a user. The postmaster will know to reload
148- * the pg_pwd file contents.
154+ * the pg_pwd file contents. Note: we used to elog(ERROR) if the
155+ * creat() call failed, but it's a little silly to abort the transaction
156+ * at this point, so let's just make it a NOTICE.
149157 */
150158filename = crypt_getpwdreloadfilename ();
151- if (creat (filename ,S_IRUSR |S_IWUSR )== -1 )
152- elog (ERROR ,"%s: %s" ,filename ,strerror (errno ));
153-
154- pfree ((void * )tempname );
159+ flagfd = creat (filename ,S_IRUSR |S_IWUSR );
160+ if (flagfd == -1 )
161+ elog (NOTICE ,"%s: %m" ,filename );
162+ else
163+ close (flagfd );
164+ pfree ((void * )filename );
155165}
156166
157167