r5157: BUG 2266: conditionally include rpc/nettype.h to work around missing header...

(This used to be commit 314da604735696da4cf350f35d84592356e31861)

diff --git a/source3/configure.in b/source3/configure.in
index 0dcfd9ab1e0db7138ae074cfd23bde5c8044f426..9a54a51dc2e8e1cbbe128d239765d5b478a67de3 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -670,7 +670,7 @@ AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
+AC_CHECK_HEADERS(arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h)
 AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h)
 AC_CHECK_HEADERS(rpc/rpc.h rpcsvc/nis.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h)
 AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/mode.h)

diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index a96f50ad02f4f9e7b7cb8b9baf3b7f8452c72e39..1117461bc25477ad133c1f6e2999e72a6e872014 100644 (file)
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -938,7 +938,9 @@ BOOL disk_quotas(const char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB
 #include <rpc/rpc.h>
 #include <rpc/types.h>
 #include <rpcsvc/rquota.h>
+#ifdef HAVE_RPC_NETTYPE_H
 #include <rpc/nettype.h>
+#endif
 #include <rpc/xdr.h>
 
 static int quotastat;