[src/netbsd-1-5]: src pullup, approved by releng-1-5

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

details:   https://anonhg.NetBSD.org/src/rev/a6d00abbfc41
branches:  netbsd-1-5
changeset: 488460:a6d00abbfc41
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Jul 07 11:33:33 2000 +0000

description:
pullup, approved by releng-1-5
udit setproctitle() - don't use variable alone, use with "%s".
from openbsd

usr.sbin/faithd/faithd.c 1.12 -> 1.13
libexec/ftpd/ftpd.c 1.96 -> 1.97
usr.sbin/rpc.lockd/lockd_lock.c 1.2 -> 1.3

diffstat:

 libexec/ftpd/ftpd.c             |  10 +++++-----
 usr.sbin/faithd/faithd.c        |   4 ++--
 usr.sbin/rpc.lockd/lockd_lock.c |   4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 48b6161abf30 -r a6d00abbfc41 libexec/ftpd/ftpd.c
--- a/libexec/ftpd/ftpd.c       Fri Jul 07 11:13:14 2000 +0000
+++ b/libexec/ftpd/ftpd.c       Fri Jul 07 11:33:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpd.c,v 1.95.2.1 2000/06/22 08:45:10 lukem Exp $      */
+/*     $NetBSD: ftpd.c,v 1.95.2.2 2000/07/07 11:33:33 itojun Exp $     */
 
 /*
  * Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpd.c     8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ftpd.c,v 1.95.2.1 2000/06/22 08:45:10 lukem Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.95.2.2 2000/07/07 11:33:33 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -963,7 +963,7 @@
                    "%s: anonymous/%.*s", remotehost,
                    (int) (sizeof(proctitle) - sizeof(remotehost) -
                    sizeof(": anonymous/")), passwd);
-               setproctitle(proctitle);
+               setproctitle("%s", proctitle);
 #endif /* HASSETPROCTITLE */
                if (logging)
                        syslog(LOG_INFO,
@@ -975,7 +975,7 @@
 #ifdef HASSETPROCTITLE
                snprintf(proctitle, sizeof(proctitle),
                    "%s: %s", remotehost, pw->pw_name);
-               setproctitle(proctitle);
+               setproctitle("%s", proctitle);
 #endif /* HASSETPROCTITLE */
                if (logging)
                        syslog(LOG_INFO,
@@ -1904,7 +1904,7 @@
        getnameinfo(who, who->sa_len, remotehost, sizeof(remotehost), NULL,0,0);
 #ifdef HASSETPROCTITLE
        snprintf(proctitle, sizeof(proctitle), "%s: connected", remotehost);
-       setproctitle(proctitle);
+       setproctitle("%s", proctitle);
 #endif /* HASSETPROCTITLE */
        if (logging)
                syslog(LOG_INFO, "connection from %s to %s",
diff -r 48b6161abf30 -r a6d00abbfc41 usr.sbin/faithd/faithd.c
--- a/usr.sbin/faithd/faithd.c  Fri Jul 07 11:13:14 2000 +0000
+++ b/usr.sbin/faithd/faithd.c  Fri Jul 07 11:33:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: faithd.c,v 1.10.2.1 2000/06/29 07:08:05 itojun Exp $   */
+/*     $NetBSD: faithd.c,v 1.10.2.2 2000/07/07 11:33:34 itojun Exp $   */
 /*     $KAME: faithd.c,v 1.19 2000/06/29 01:17:29 itojun Exp $ */
 
 /*
@@ -303,7 +303,7 @@
         * Wait, accept, fork, faith....
         */
 again:
-       setproctitle(procname);
+       setproctitle("%s", procname);
 
        FD_ZERO(&rfds);
        FD_SET(s_wld, &rfds);
diff -r 48b6161abf30 -r a6d00abbfc41 usr.sbin/rpc.lockd/lockd_lock.c
--- a/usr.sbin/rpc.lockd/lockd_lock.c   Fri Jul 07 11:13:14 2000 +0000
+++ b/usr.sbin/rpc.lockd/lockd_lock.c   Fri Jul 07 11:33:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lockd_lock.c,v 1.2 2000/06/09 14:00:53 fvdl Exp $      */
+/*     $NetBSD: lockd_lock.c,v 1.2.2.1 2000/07/07 11:33:34 itojun Exp $        */
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -465,7 +465,7 @@
                         * Attempt a blocking lock. Will have to call
                         * NLM_GRANTED later.
                         */
-                       setproctitle(fl->client_name);
+                       setproctitle("%s", fl->client_name);
                        lflags &= ~LOCK_NB;
                        if(flock(fl->fd, lflags) != 0) {
                                syslog(LOG_NOTICE, "flock failed: %s",