From: Ion Badulescu <ib42@cs.columbia.edu>
Date: Fri, 24 Oct 2003 14:34:40 +0000 (+0000)
Subject:         Compile fix for Solaris7 with LDAP:
X-Git-Tag: before-retrans-udp-tcp-split~62
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=1fb670c83a40bfa951709d6c574108de7afe2fd5;p=am-utils-6.0.git

    Compile fix for Solaris7 with LDAP:

        * include/am_defs.h: moved the ldap headers before am_nfs_prot.h
        to facilitate using ldap types in it

        * conf/nfs_prot/nfs_prot_sunos5_7.h: add a couple of ldap
        definitions that Sun left out of their headers
---

diff --git a/ChangeLog b/ChangeLog
index 8cb7cac..4aa6576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-24  Ion Badulescu  <ion@guppy.limebrokerage.com>
+
+	Compile fix for Solaris7 with LDAP:
+
+	* include/am_defs.h: moved the ldap headers before am_nfs_prot.h
+	to facilitate using ldap types in it
+
+	* conf/nfs_prot/nfs_prot_sunos5_7.h: add a couple of ldap
+	definitions that Sun left out of their headers
+
 2003-10-24  Ion Badulescu  <ionut@moisil.badula.org>
 
 	* conf/nfs_prot/nfs_prot_*.h: remove all NFSv3-related
diff --git a/conf/nfs_prot/nfs_prot_sunos5_7.h b/conf/nfs_prot/nfs_prot_sunos5_7.h
index 3ec3099..8e36012 100644
--- a/conf/nfs_prot/nfs_prot_sunos5_7.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_7.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: nfs_prot_sunos5_7.h,v 1.13 2002/12/27 22:44:02 ezk Exp $
+ * $Id: nfs_prot_sunos5_7.h,v 1.14 2003/10/24 14:34:41 ib42 Exp $
  *
  */
 
@@ -104,6 +104,11 @@
 
 #define AUTOFS_CONFTYPE "ticotsord"
 
+/* Sun has incomplete ldap headers, but libraries are ok */
+#ifndef LDAP_VERSION_MAX
+#define LDAP_VERSION_MAX LDAP_VERSION3
+#endif /* LDAP_VERSION_MAX */
+
 
 /*
  * TYPEDEFS:
@@ -212,6 +217,11 @@ extern void *nfsproc_writecache_2(void *, CLIENT *);
 extern void *nfsproc_writecache_2_svc(void *, struct svc_req *);
 extern int nfs_program_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
 
+/* Sun has incomplete ldap headers, but libraries are ok */
+#ifdef HAVE_LDAP_H
+extern int ldap_set_option(LDAP *, int, const void *);
+#endif /* HAVE_LDAP_H */
+
 
 /*
  * ENUMS:
diff --git a/include/am_defs.h b/include/am_defs.h
index b678f2a..5d0e0d0 100644
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: am_defs.h,v 1.46 2003/10/24 04:50:23 ib42 Exp $
+ * $Id: am_defs.h,v 1.47 2003/10/24 14:34:42 ib42 Exp $
  *
  */
 
@@ -669,6 +669,21 @@ struct ypall_callback;
 # endif /* HAVE_SYS_FS_AUTOFS_PROT_H */
 #endif /* not HAVE_RPCSVC_AUTOFS_PROT_H */
 
+/*
+ * Actions to take if <lber.h> exists.
+ * This header file is required before <ldap.h> can be included.
+ */
+#ifdef HAVE_LBER_H
+# include <lber.h>
+#endif /* HAVE_LBER_H */
+
+/*
+ * Actions to take if <ldap.h> exists.
+ */
+#ifdef HAVE_LDAP_H
+# include <ldap.h>
+#endif /* HAVE_LDAP_H */
+
 /****************************************************************************
  ** IMPORTANT!!!							   **
  ** We always include am-utils' amu_autofs_prot.h.			   **
@@ -756,21 +771,6 @@ struct ypall_callback;
 # include <hesiod.h>
 #endif /* HAVE_HESIOD_H */
 
-/*
- * Actions to take if <lber.h> exists.
- * This header file is required before <ldap.h> can be included.
- */
-#ifdef HAVE_LBER_H
-# include <lber.h>
-#endif /* HAVE_LBER_H */
-
-/*
- * Actions to take if <ldap.h> exists.
- */
-#ifdef HAVE_LDAP_H
-# include <ldap.h>
-#endif /* HAVE_LDAP_H */
-
 /*
  * Actions to take if <arpa/nameser.h> exists.
  * Should be included before <resolv.h>.