smbldap: Move ldapsam_privates to pdb_ldap.h

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Apr 18 22:52:03 CEST 2017 on sn-devel-144

diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 4ee4a0ba3f0738383261f5ced8af8e84bea20945..b287d6249f93967bc037fbdbd747f0567263dbae 100644 (file)
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -58,36 +58,6 @@ struct smbldap_state {
        struct timeval last_rebind; /* monotonic */
 };
 
-/* struct used by both pdb_ldap.c and pdb_nds.c */
-
-struct ldapsam_privates {
-       struct smbldap_state *smbldap_state;
-
-       /* Former statics */
-       LDAPMessage *result;
-       LDAPMessage *entry;
-       int index;
-
-       const char *domain_name;
-       struct dom_sid domain_sid;
-
-       /* configuration items */
-       int schema_ver;
-
-       char *domain_dn;
-
-       /* Is this NDS ldap? */
-       int is_nds_ldap;
-
-       /* ldap server location parameter */
-       char *location;
-
-       struct {
-               char *filter;
-               LDAPMessage *result;
-       } search_cache;
-};
-
 /* The following definitions come from lib/smbldap.c  */
 
 NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx,

diff --git a/source3/passdb/pdb_ldap.h b/source3/passdb/pdb_ldap.h
index 04203140443282b6ce374d66d47fea0c3c29e728..e55b0a461b51f73be479f8a0ea4a1bde24f08ed0 100644 (file)
--- a/source3/passdb/pdb_ldap.h
+++ b/source3/passdb/pdb_ldap.h
@@ -26,6 +26,36 @@
 #ifndef _PASSDB_PDB_LDAP_H_
 #define _PASSDB_PDB_LDAP_H_
 
+/* struct used by both pdb_ldap.c and pdb_nds.c */
+
+struct ldapsam_privates {
+       struct smbldap_state *smbldap_state;
+
+       /* Former statics */
+       LDAPMessage *result;
+       LDAPMessage *entry;
+       int index;
+
+       const char *domain_name;
+       struct dom_sid domain_sid;
+
+       /* configuration items */
+       int schema_ver;
+
+       char *domain_dn;
+
+       /* Is this NDS ldap? */
+       int is_nds_ldap;
+
+       /* ldap server location parameter */
+       char *location;
+
+       struct {
+               char *filter;
+               LDAPMessage *result;
+       } search_cache;
+};
+
 /* The following definitions come from passdb/pdb_ldap.c  */
 
 const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver );