summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2017-04-17 17:12:27 +0200
committerAndreas Schneider <asn@cryptomilk.org>2017-04-18 22:52:03 +0200
commit4fe2b24b34192606e3a45f64a3e5e5449873bf3c (patch)
treea28774b67f7d58aea268b1dd99d2836133a5b87f
parent91e9ff99752c42581db67d4e1e85556ea5c07fbf (diff)
downloadsamba-4fe2b24b34192606e3a45f64a3e5e5449873bf3c.tar.gz
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
-rw-r--r--source3/include/smbldap.h30
-rw-r--r--source3/passdb/pdb_ldap.h30
2 files changed, 30 insertions, 30 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 4ee4a0ba3f0..b287d6249f9 100644
--- 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 04203140443..e55b0a461b5 100644
--- 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 );