Date: Wed, 1 Jul 1998 22:50:00 -0700 (PDT) From: Poul-Henning Kamp <phk@critter.freebsd.dk> To: freebsd-bugs@FreeBSD.ORG Subject: Re: bin/6787 Message-ID: <199807020550.WAA23722@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR bin/6787; it has been noted by GNATS. From: Poul-Henning Kamp <phk@critter.freebsd.dk> To: freebsd-gnats-submit@freebsd.org Cc: Subject: Re: bin/6787 Date: Thu, 02 Jul 1998 07:47:22 +0200 ------- Forwarded Message Return-Path: paul@mu.org Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.8.7/8.8.5) with ESMTP id HAA02061 for <phk@localhost>; Thu, 2 Jul 1998 07:46:04 +0200 (CEST) Received: from phk.freebsd.dk by critter.freebsd.dk (fetchmail-4.3.2 POP3 run by phk) for <phk@localhost> (single-drop); Thu Jul 2 07:46:05 1998 Received: from cicero1.cybercity.dk (cicero1.cybercity.dk [195.8.135.242]) by phk.freebsd.dk (8.8.8/8.8.5) with ESMTP id HAA28388 for <phk@phk.freebsd.dk>; Thu, 2 Jul 1998 07:44:52 +0200 (CEST) Received: from hub.freebsd.org (hub.FreeBSD.ORG [204.216.27.18]) by cicero1.cybercity.dk (8.8.7/8.8.7) with ESMTP id HAA03076 for <phk@phk.freebsd.dk>; Thu, 2 Jul 1998 07:44:36 +0200 (CEST) (envelope-from paul@priscilla.mu.org) Received: from priscilla.mu.org (paul@priscilla.mu.org [206.156.231.1]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA06958 for <phk@freebsd.org>; Wed, 1 Jul 1998 22:44:31 -0700 (PDT) (envelope-from paul@priscilla.mu.org) Received: (from paul@localhost) by priscilla.mu.org (8.8.8/8.8.8) id AAA26073; Thu, 2 Jul 1998 00:43:28 -0500 (CDT) (envelope-from paul) Message-ID: <19980702004328.A26035@mu.org> Date: Thu, 2 Jul 1998 00:43:28 -0500 From: Paul Saab <paul@mu.org> To: phk@freebsd.org Subject: (fwd) Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.91.1i X-UIDL: 30b644c646ae528665ec85a66edefd93 Poul, I dont know if this is the right solution to pr 6787 but no-one else seems to want to fix it so here is something. Paul Index: Makefile =================================================================== RCS file: /usr/cvs/src/usr.sbin/pw/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile - --- Makefile 1997/02/22 16:12:17 1.5 +++ Makefile 1998/07/02 05:39:45 @@ -3,13 +3,16 @@ PROG= pw SRCS= pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c \ grupd.c pwupd.c fileupd.c edgroup.c psdate.c \ - - bitmap.c cpdir.c rm_r.c + bitmap.c cpdir.c rm_r.c pw_util.c +.PATH: ${.CURDIR}/../../usr.sbin/vipw + MAN5= pw.conf.5 MAN8= pw.8 #RND= -DUSE_MD5RAND CFLAGS+= -Wall $(CDB) $(RND) +CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw LDADD= -lcrypt DPADD= ${LIBCRYPT} Index: pwupd.c =================================================================== RCS file: /usr/cvs/src/usr.sbin/pw/pwupd.c,v retrieving revision 1.7 diff -u -r1.7 pwupd.c - --- pwupd.c 1998/02/11 23:31:24 1.7 +++ pwupd.c 1998/07/02 05:39:45 @@ -41,6 +41,8 @@ #include "pwupd.h" +char *tempname; + #define HAVE_PWDB_C 1 static int @@ -137,8 +139,11 @@ */ if (pwd != NULL) fmtpwentry(pwbuf, pwd, PWF_MASTER); - - if ((rc = fileupdate(_PATH_MASTERPASSWD, 0644, pwbuf, pfx, l, mode)) != 0) + if ((rc = fileupdate(_PATH_MASTERPASSWD, 0644, pwbuf, pfx, l, mode)) != 0) { + int fd = pw_lock(); rc = pwdb(NULL) == 0; + close(fd); + } } } return rc; ------- End of Forwarded Message To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199807020550.WAA23722>