Move LDAPServer, LDAPConn, LDAPRequest, and LDAPCache

from ldap.h to ldap-int.

diff --git a/include/ldap.h b/include/ldap.h
index ce9a1941f902f6c433757ee64d5a5cecf92d5f6e..b84ece861365feca8b5d94491743175f540adf2e 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -355,80 +355,6 @@ typedef struct ldapmod {
 typedef struct ldapmsg LDAPMessage;
 #define NULLMSG        ((LDAPMessage *) NULL)
 
-
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-/*
- * structure for tracking LDAP server host, ports, DNs, etc.
- */
-typedef struct ldap_server {
-       char                    *lsrv_host;
-       char                    *lsrv_dn;       /* if NULL, use default */
-       int                     lsrv_port;
-       struct ldap_server      *lsrv_next;
-} LDAPServer;
-
-
-/*
- * structure for representing an LDAP server connection
- */
-typedef struct ldap_conn {
-       Sockbuf                 *lconn_sb;
-       int                     lconn_refcnt;
-       time_t          lconn_lastused; /* time */
-       int                     lconn_status;
-#define LDAP_CONNST_NEEDSOCKET         1
-#define LDAP_CONNST_CONNECTING         2
-#define LDAP_CONNST_CONNECTED          3
-       LDAPServer              *lconn_server;
-       char                    *lconn_krbinstance;
-       struct ldap_conn        *lconn_next;
-} LDAPConn;
-
-
-/*
- * structure used to track outstanding requests
- */
-typedef struct ldapreq {
-       int             lr_msgid;       /* the message id */
-       int             lr_status;      /* status of request */
-#define LDAP_REQST_INPROGRESS  1
-#define LDAP_REQST_CHASINGREFS 2
-#define LDAP_REQST_NOTCONNECTED        3
-#define LDAP_REQST_WRITING     4
-       int             lr_outrefcnt;   /* count of outstanding referrals */
-       int             lr_origid;      /* original request's message id */
-       int             lr_parentcnt;   /* count of parent requests */
-       int             lr_res_msgtype; /* result message type */
-       int             lr_res_errno;   /* result LDAP errno */
-       char            *lr_res_error;  /* result error string */
-       char            *lr_res_matched;/* result matched DN string */
-       BerElement      *lr_ber;        /* ber encoded request contents */
-       LDAPConn        *lr_conn;       /* connection used to send request */
-       struct ldapreq  *lr_parent;     /* request that spawned this referral */
-       struct ldapreq  *lr_refnext;    /* next referral spawned */
-       struct ldapreq  *lr_prev;       /* previous request */
-       struct ldapreq  *lr_next;       /* next request */
-} LDAPRequest;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
-
-
-/*
- * structure for client cache
- */
-#define LDAP_CACHE_BUCKETS     31      /* cache hash table size */
-typedef struct ldapcache {
-       LDAPMessage     *lc_buckets[LDAP_CACHE_BUCKETS];/* hash table */
-       LDAPMessage     *lc_requests;                   /* unfulfilled reqs */
-       long            lc_timeout;                     /* request timeout */
-       long            lc_maxmem;                      /* memory to use */
-       long            lc_memused;                     /* memory in use */
-       int             lc_enabled;                     /* enabled? */
-       unsigned long   lc_options;                     /* options */
-#define LDAP_CACHE_OPT_CACHENOERRS     0x00000001
-#define LDAP_CACHE_OPT_CACHEALLERRS    0x00000002
-}  LDAPCache;
-#define NULLLDCACHE ((LDAPCache *)NULL)
-
 /*
  * structures for ldap getfilter routines
  */

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index b8e8fc273c52c296b7f717d9e39b2293494a8b65..9fc14c3e67c3d1f0bcd90fc039a3ba1174255e5b 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -88,6 +88,79 @@ struct ldapoptions {
        LDAP_BOOLEANS ldo_booleans;     /* boolean options */
 };
 
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+/*
+ * structure for tracking LDAP server host, ports, DNs, etc.
+ */
+typedef struct ldap_server {
+       char                    *lsrv_host;
+       char                    *lsrv_dn;       /* if NULL, use default */
+       int                     lsrv_port;
+       struct ldap_server      *lsrv_next;
+} LDAPServer;
+
+
+/*
+ * structure for representing an LDAP server connection
+ */
+typedef struct ldap_conn {
+       Sockbuf                 *lconn_sb;
+       int                     lconn_refcnt;
+       time_t          lconn_lastused; /* time */
+       int                     lconn_status;
+#define LDAP_CONNST_NEEDSOCKET         1
+#define LDAP_CONNST_CONNECTING         2
+#define LDAP_CONNST_CONNECTED          3
+       LDAPServer              *lconn_server;
+       char                    *lconn_krbinstance;
+       struct ldap_conn        *lconn_next;
+} LDAPConn;
+
+
+/*
+ * structure used to track outstanding requests
+ */
+typedef struct ldapreq {
+       int             lr_msgid;       /* the message id */
+       int             lr_status;      /* status of request */
+#define LDAP_REQST_INPROGRESS  1
+#define LDAP_REQST_CHASINGREFS 2
+#define LDAP_REQST_NOTCONNECTED        3
+#define LDAP_REQST_WRITING     4
+       int             lr_outrefcnt;   /* count of outstanding referrals */
+       int             lr_origid;      /* original request's message id */
+       int             lr_parentcnt;   /* count of parent requests */
+       int             lr_res_msgtype; /* result message type */
+       int             lr_res_errno;   /* result LDAP errno */
+       char            *lr_res_error;  /* result error string */
+       char            *lr_res_matched;/* result matched DN string */
+       BerElement      *lr_ber;        /* ber encoded request contents */
+       LDAPConn        *lr_conn;       /* connection used to send request */
+       struct ldapreq  *lr_parent;     /* request that spawned this referral */
+       struct ldapreq  *lr_refnext;    /* next referral spawned */
+       struct ldapreq  *lr_prev;       /* previous request */
+       struct ldapreq  *lr_next;       /* next request */
+} LDAPRequest;
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+/*
+ * structure for client cache
+ */
+#define LDAP_CACHE_BUCKETS     31      /* cache hash table size */
+typedef struct ldapcache {
+       LDAPMessage     *lc_buckets[LDAP_CACHE_BUCKETS];/* hash table */
+       LDAPMessage     *lc_requests;                   /* unfulfilled reqs */
+       long            lc_timeout;                     /* request timeout */
+       long            lc_maxmem;                      /* memory to use */
+       long            lc_memused;                     /* memory in use */
+       int             lc_enabled;                     /* enabled? */
+       unsigned long   lc_options;                     /* options */
+#define LDAP_CACHE_OPT_CACHENOERRS     0x00000001
+#define LDAP_CACHE_OPT_CACHEALLERRS    0x00000002
+}  LDAPCache;
+#define NULLLDCACHE ((LDAPCache *)NULL)
+
+
 /*
  * structure representing an ldap connection
  */