Makefile.in configure configure.in include/config.h.in: Changes for DGUX and UNIXWARE.

groupdb/aliasdb.c groupdb/aliasfile.c groupdb/groupfile.c: Don't use snprinf, use slprintf.
include/includes.h: Fix YP problem.
include/smb.h: Fix ZERO_STRUCTP.
lib/util_sock.c: Added strerror() in debugs.
passdb/ldap.c: Don't use snprinf, use slprintf.
rpc_client/cli_lsarpc.c rpc_client/cli_pipe.c rpc_parse/parse_sec.c rpc_server/srv_pipe.c: Don't use snprinf, use slprintf.
script/installman.sh: DGUX changes.
smbd/open.c smbd/oplock.c: Fixed gcc warnings.
web/swat.c: Changes USER to SWAT_USER.
(This used to be commit 4c2b5a00983501e5d4aad1456ba8b5ab0dfd9b4c)

4 files changed, 21 insertions, 4 deletions

diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index f9627a1203..39381e9714 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -563,6 +563,9 @@
 /* Define if you have the strpbrk function.  */
 #undef HAVE_STRPBRK
 
+/* Define if you have the syscall function.  */
+#undef HAVE_SYSCALL
+
 /* Define if you have the utime function.  */
 #undef HAVE_UTIME
 
@@ -629,6 +632,9 @@
 /* Define if you have the <rpc/clnt.h> header file.  */
 #undef HAVE_RPC_CLNT_H
 
+/* Define if you have the <rpc/rpc.h> header file.  */
+#undef HAVE_RPC_RPC_H
+
 /* Define if you have the <rpc/types.h> header file.  */
 #undef HAVE_RPC_TYPES_H
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6c7a67afef..274d3ccf24 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -586,9 +586,17 @@ union semun {
 #define HAVE_NETGROUP 1
 #endif
 
-#if defined (HAVE_NETGROUP) && defined(HAVE_RPCSVC_YPCLNT_H)
-#include "rpcsvc/ypclnt.h"
+#if defined (HAVE_NETGROUP)
+#if defined(HAVE_RPC_RPC_H)
+#include <rpc/rpc.h>
 #endif
+#if defined(HAVE_RPCSVC_YP_PROT_H)
+#include <rpcsvc/yp_prot.h>
+#endif
+#if defined(HAVE_RPCSVC_YPCLNT_H)
+#include <rpcsvc/ypclnt.h>
+#endif
+#endif /* HAVE_NETGROUP */
 
 #ifndef ALLOW_CHANGE_PASSWORD
 #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID))
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 843c0a3311..c5029dae9e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2217,7 +2217,7 @@ void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_I
 char *get_sec_mask_str(uint32 type);
 void display_sec_access(FILE *out_hnd, enum action_type action, SEC_ACCESS *info);
 void display_sec_ace(FILE *out_hnd, enum action_type action, SEC_ACE *ace);
-void display_sec_acl(FILE *out_hnd, enum action_type action, SEC_ACL *acl);
+void display_sec_acl(FILE *out_hnd, enum action_type action, SEC_ACL *sec_acl);
 void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *sec);
 char *get_reg_val_type_str(uint32 type);
 void display_reg_value_info(FILE *out_hnd, enum action_type action,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index bb055214ec..e94d45bf07 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1654,8 +1654,11 @@ extern int unix_ERR_code;
 /* zero a structure */
 #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
 
+/* zero a structure given a pointer to the structure - no zero check */
+#define ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x)))
+
 /* zero a structure given a pointer to the structure */
-#define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); }
+#define ZERO_STRUCTP(x) { if ((x) != NULL) ZERO_STRUCTPN(x); }
 
 /* zero an array - note that sizeof(array) must work - ie. it must not be a 
    pointer */