[src/netbsd-1-5]: src/lib/libutil Pullup 1.26 [itojun]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a37b62106d7d
branches:  netbsd-1-5
changeset: 489763:a37b62106d7d
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 01:17:38 2000 +0000

description:
Pullup 1.26 [itojun]:
honor behavior of warn(NULL).
[This fixes a bug in the format string changes.]

diffstat:

 lib/libutil/passwd.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 14fea0140f02 -r a37b62106d7d lib/libutil/passwd.c
--- a/lib/libutil/passwd.c      Tue Oct 17 01:14:49 2000 +0000
+++ b/lib/libutil/passwd.c      Tue Oct 17 01:17:38 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: passwd.c,v 1.19.4.1 2000/10/03 20:11:00 sommerfeld Exp $       */
+/*     $NetBSD: passwd.c,v 1.19.4.2 2000/10/17 01:17:38 tv Exp $       */
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: passwd.c,v 1.19.4.1 2000/10/03 20:11:00 sommerfeld Exp $");
+__RCSID("$NetBSD: passwd.c,v 1.19.4.2 2000/10/17 01:17:38 tv Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -328,8 +328,12 @@
        int err, eval;
 {
 
-       if (err)
-               warn("%s", name);
+       if (err) {
+               if (name)
+                       warn("%s", name);
+               else
+                       warn(NULL);
+       }
 
        warnx("%s: unchanged", _PATH_MASTERPASSWD);
        pw_abort();