--- rpcbind-0.2.4.orig/src/security.c	2016-11-28 21:47:28.000000000 +0100
+++ rpcbind-0.2.4/src/security.c	2016-12-31 16:11:48.723119783 +0100
@@ -22,14 +22,6 @@
 /*
  * XXX for special case checks in check_callit.
  */
-#ifdef HAVE_RPCSVC_MOUNT_H
-#include <rpcsvc/mount.h>
-#include <rpcsvc/rquota.h>
-#include <rpcsvc/nfs_prot.h>
-#include <rpcsvc/yp.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/yppasswd.h>
-#else
 # define MOUNTPROC_MNT	1
 # define MOUNTPROC_UMNT	3
 # define NFS_PROGRAM	100003
@@ -44,7 +36,6 @@
 # define YPPROC_FIRST	4
 # define YPPROC_NEXT	5
 # define YPPROC_ALL	8
-#endif
 
 #include "rpcbind.h"
 
@@ -327,24 +318,9 @@ check_callit(SVCXPRT *xprt, struct r_rmt
 		    args->rmt_proc != MOUNTPROC_UMNT)
 			break;
 		goto deny;
-	case YPBINDPROG:
-		if (args->rmt_proc != YPBINDPROC_SETDOM)
-			break;
-		/* FALLTHROUGH */
-	case YPPASSWDPROG:
 	case NFS_PROGRAM:
 	case RQUOTAPROG:
 		goto deny;
-	case YPPROG:
-		switch (args->rmt_proc) {
-		case YPPROC_ALL:
-		case YPPROC_MATCH:
-		case YPPROC_FIRST:
-		case YPPROC_NEXT:
-			goto deny;
-		default:
-			break;
-		}
 	default:
 		break;
 	}