Module Name: src
Committed By: roy
Date: Wed Apr 24 10:27:49 UTC 2019
Modified Files:
src/usr.sbin/rpcbind: Makefile security.c
Log Message:
Fix building rpcbind with MKYP=no
We add enough of the YP headers to security.c so the security checks
can remain as is.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rpcbind/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rpcbind/security.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpcbind/Makefile
diff -u src/usr.sbin/rpcbind/Makefile:1.14 src/usr.sbin/rpcbind/Makefile:1.15
--- src/usr.sbin/rpcbind/Makefile:1.14 Thu Aug 17 00:06:00 2017
+++ src/usr.sbin/rpcbind/Makefile Wed Apr 24 10:27:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/08/17 00:06:00 ginsbach Exp $
+# $NetBSD: Makefile,v 1.15 2019/04/24 10:27:49 roy Exp $
.include <bsd.own.mk>
@@ -18,6 +18,10 @@ CPPFLAGS+= -I${LIBCRPCDIR} -DPORTMAP -DL
CPPFLAGS+= -DINET6
.endif
+.if (${USE_YP} != "no")
+CPPFLAGS+= -DYP
+.endif
+
# Uncomment these to get any useful output from 'rpcbind -d'
# CPPFLAGS+= -DRPCBIND_DEBUG
# CPPFLAGS+= -DSVC_RUN_DEBUG
Index: src/usr.sbin/rpcbind/security.c
diff -u src/usr.sbin/rpcbind/security.c:1.12 src/usr.sbin/rpcbind/security.c:1.13
--- src/usr.sbin/rpcbind/security.c:1.12 Wed Aug 16 08:44:40 2017
+++ src/usr.sbin/rpcbind/security.c Wed Apr 24 10:27:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: security.c,v 1.12 2017/08/16 08:44:40 christos Exp $ */
+/* $NetBSD: security.c,v 1.13 2019/04/24 10:27:49 roy Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/security.c 262860 2014-03-06 17:33:27Z mav $ */
#include <sys/types.h>
@@ -24,9 +24,22 @@
#include <rpcsvc/mount.h>
#include <rpcsvc/rquota.h>
#include <rpcsvc/nfs_prot.h>
+
+#ifdef YP
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
#include <rpcsvc/yppasswd.h>
+#else
+/* Define enough to compile. */
+#define YPBINDPROG ((unsigned long)100007)
+#define YPBINDPROC_SETDOM ((unsigned long)2)
+#define YPPROG ((unsigned long)100004)
+#define YPPROC_FIRST ((unsigned long)4)
+#define YPPROC_NEXT ((unsigned long)5)
+#define YPPROC_MATCH ((unsigned long)3)
+#define YPPROC_ALL ((unsigned long)8)
+#define YPPASSWDPROG ((unsigned long)100009)
+#endif
#include "rpcbind.h"
