diff options
| author | peter <peter@FreeBSD.org> | 1996-01-01 08:39:39 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-01-01 08:39:39 +0000 |
| commit | ae296d31817ed7ad9749e5dcab3f2690d03dcb9c (patch) | |
| tree | 131521a2fb4a060a82dc7f9a9033c7702fa10104 /usr.sbin | |
| parent | 5e9ed8caa7a5b03bf42d07867b3053f67625b4c8 (diff) | |
| download | FreeBSD-src-ae296d31817ed7ad9749e5dcab3f2690d03dcb9c.zip FreeBSD-src-ae296d31817ed7ad9749e5dcab3f2690d03dcb9c.tar.gz | |
Make nfsd use setproctitle from libutil...
Old code is still #ifdef OLD_SETPROCTITLE for comparison with the old
code.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/nfsd/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/nfsd/nfsd.c | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile index cbc442d..9c89542 100644 --- a/usr.sbin/nfsd/Makefile +++ b/usr.sbin/nfsd/Makefile @@ -3,6 +3,8 @@ PROG= nfsd CFLAGS+=-DNFS MAN8= nfsd.8 +DPADD+= ${LIBUTIL} +LDADD+= -lutil .if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \ || defined(MAKE_EBONES)) diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c index 3de2251..2fad7c2 100644 --- a/usr.sbin/nfsd/nfsd.c +++ b/usr.sbin/nfsd/nfsd.c @@ -81,6 +81,7 @@ static char sccsid[] = "@(#)nfsd.c 8.7 (Berkeley) 2/22/94"; #include <stdlib.h> #include <strings.h> #include <unistd.h> +#include <libutil.h> /* Global defs */ #ifdef DEBUG @@ -91,8 +92,10 @@ int debug = 0; #endif struct nfsd_srvargs nsd; +#ifdef OLD_SETPROCTITLE char **Argv = NULL; /* pointer to argument vector */ char *LastArg = NULL; /* end of argv */ +#endif #ifdef NFSKERB char lnam[ANAME_SZ]; @@ -108,9 +111,11 @@ NFSKERBKEYSCHED_T kerb_keysched; void nonfs __P((int)); void reapchild __P((int)); +#ifdef OLD_SETPROCTITLE #ifdef __FreeBSD__ void setproctitle __P((char *)); #endif +#endif void usage __P((void)); /* @@ -167,6 +172,7 @@ main(argc, argv, envp) } #endif +#ifdef OLD_SETPROCTITLE /* Save start and extent of argv for setproctitle. */ Argv = argv; if (envp == 0 || *envp == 0) @@ -174,6 +180,7 @@ main(argc, argv, envp) while (*envp) envp++; LastArg = envp[-1] + strlen(envp[-1]); +#endif #define MAXNFSDCNT 20 #define DEFNFSDCNT 4 @@ -643,6 +650,7 @@ reapchild(signo) while (wait3(NULL, WNOHANG, NULL) > 0); } +#ifdef OLD_SETPROCTITLE #ifdef __FreeBSD__ void setproctitle(a) @@ -660,3 +668,4 @@ setproctitle(a) Argv[1] = NULL; } #endif /* __FreeBSD__ */ +#endif |
