Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/rpcbind Fix building rpcbind with MKYP=no



details:   https://anonhg.NetBSD.org/src/rev/4c17f457bd37
branches:  trunk
changeset: 450734:4c17f457bd37
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Apr 24 10:27:49 2019 +0000

description:
Fix building rpcbind with MKYP=no

We add enough of the YP headers to security.c so the security checks
can remain as is.

diffstat:

 usr.sbin/rpcbind/Makefile   |   6 +++++-
 usr.sbin/rpcbind/security.c |  15 ++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r ee478bbf9450 -r 4c17f457bd37 usr.sbin/rpcbind/Makefile
--- a/usr.sbin/rpcbind/Makefile Wed Apr 24 10:26:43 2019 +0000
+++ b/usr.sbin/rpcbind/Makefile Wed Apr 24 10:27:49 2019 +0000
@@ -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+=     -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
diff -r ee478bbf9450 -r 4c17f457bd37 usr.sbin/rpcbind/security.c
--- a/usr.sbin/rpcbind/security.c       Wed Apr 24 10:26:43 2019 +0000
+++ b/usr.sbin/rpcbind/security.c       Wed Apr 24 10:27:49 2019 +0000
@@ -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"
 



Home | Main Index | Thread Index | Old Index