Add knob NO_NIS (fka NO_YP_LIBC) and make world compileable when set.

If turned on  no NIS support and related programs will be built.

Lost parts rediscovered by:	Danny Braniss <danny at cs.huji.ac.il>
PR:		bin/68303
No objections:	des, gshapiro, nectar
Reviewed by:	ru
Approved by:	rwatson (mentor)
MFC after:	2 weeks

8 files changed, 21 insertions, 8 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 18e0700..4b763fa 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -107,7 +107,7 @@ _libthread_db=	libthread_db
 _libusbhid=	libusbhid
 .endif
 
-.if !defined(NO_YP_LIBC)
+.if !defined(NO_NIS)
 _libypclnt=	libypclnt
 .endif
 
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 95356b9..169a366 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -60,7 +60,7 @@ NOASM=
 .if ${MACHINE_ARCH} == "arm"
 .include "${.CURDIR}/softfloat/Makefile.inc"
 .endif
-.if !defined(NO_YP_LIBC)
+.if !defined(NO_NIS)
 CFLAGS+= -DYP
 .include "${.CURDIR}/yp/Makefile.inc"
 .endif
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 2431fd7..04e2e88 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -202,7 +202,7 @@ setnetgrent(const char *group)
 				return;
 			}
 #else
-		if (netf = fopen(_PATH_NETGROUP, "r")) {
+		if ((netf = fopen(_PATH_NETGROUP, "r"))) {
 #endif
 			if (parse_netgrp(group))
 				endnetgrent();
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index fcdd639..1ad073d 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#ifdef YP
 #include <rpc/rpc.h>
+#ifdef YP
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 #endif
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 3777e16..1829a45 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -58,7 +58,9 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 
 static char    *OPSYS = "unix";
+#ifdef YP
 static char    *NETID = "netid.byname";
+#endif
 static char    *NETIDFILE = "/etc/netid";
 
 static int getnetid( char *, char * );
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index f8501a7..fde40fe 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -38,9 +38,13 @@ LIB=	pam_unix
 SRCS=	pam_unix.c
 MAN=	pam_unix.8
 
-CFLAGS+= -DYP
+DPADD= ${LIBUTIL} ${LIBCRYPT}
+LDADD= -lutil -lcrypt
 
-DPADD=	${LIBUTIL} ${LIBCRYPT} ${LIBYPCLNT}
-LDADD=	-lutil -lcrypt -lypclnt
+.if !defined(NO_NIS)
+CFLAGS+= -DYP
+DPADD+= ${LIBYPCLNT}
+LDADD+= -lypclnt
+.endif
 
 .include <bsd.lib.mk>
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index c572249..49a918b 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -9,9 +9,13 @@ RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
 	rquota.x rstat.x rwall.x sm_inter.x spray.x yppasswd.x ypxfrd.x \
 	ypupdate_prot.x
 
-OTHERSRCS=  rnusers.c rstat.c rwall.c yp_passwd.c yp_update.c
+OTHERSRCS=  rnusers.c rstat.c rwall.c
 SECRPCSRCS= secretkey.c xcrypt.c
 
+.if !defined(NO_NIS)
+OTHERSRCS+= yp_passwd.c yp_update.c
+.endif
+
 RPCCOM = rpcgen -C
 
 INCDIRS= -I${DESTDIR}/usr/include/rpcsvc
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index c559ce9..c780768 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -17,6 +17,9 @@ CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS
+.if defined(NO_NIS)
+CFLAGS+= -DUSE_GETDOMAIN
+.endif
 .if !defined(NOINET6)
 CFLAGS+=-DINET6
 .endif