diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 21:39:49 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:33 +0100 |
| commit | 41db2ab12cea20b271d690be554ab8e6095c2b4e (patch) | |
| tree | 3bafb5adbdacb1c0ca0f639ace6c9c1ae8e3d08a /source4/dsdb/samdb | |
| parent | 090d251c19e31450d8fc4af50e7c6b0c09af5f89 (diff) | |
| download | samba-41db2ab12cea20b271d690be554ab8e6095c2b4e.tar.gz samba-41db2ab12cea20b271d690be554ab8e6095c2b4e.tar.bz2 samba-41db2ab12cea20b271d690be554ab8e6095c2b4e.zip | |
r26319: Split encoding functions out of libcli_ldap.
(This used to be commit 95a6ef7fc8757ccfd90dbf0d6c9b5098f10b10b6)
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/cracknames.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/config.mk | 4 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb_privilege.c | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index dea00f7ab1..338bc4f138 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -27,10 +27,11 @@ #include "lib/ldb/include/ldb_errors.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "auth/auth.h" +#include "ldb.h" #include "util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "param/param.h" diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 3dce205eb3..b585d0da7f 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -75,7 +75,7 @@ OBJ_FILES = \ [MODULE::ldb_samldb] SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY -PRIVATE_DEPENDENCIES = LIBTALLOC +PRIVATE_DEPENDENCIES = LIBTALLOC LDAP_ENCODE INIT_FUNCTION = samldb_module_init OBJ_FILES = \ samldb.o @@ -143,7 +143,7 @@ SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = password_hash_module_init OBJ_FILES = password_hash.o -PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 +PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE # # End MODULE ldb_password_hash ################################################ diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 529b1aa96f..d139cc23a4 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -32,8 +32,9 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "ldb/include/ldb_errors.h" +#include "ldb/include/ldb.h" #include "ldb/include/ldb_private.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 85ca1a7f4b..3638b91799 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -33,8 +33,9 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "lib/ldb/include/ldb_errors.h" +#include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_private.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index 939de4b048..4366b7d0b9 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -29,7 +29,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "system/time.h" #include "system/filesys.h" #include "ldb_wrap.h" diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c index 0baa7ee794..3945dbb14b 100644 --- a/source4/dsdb/samdb/samdb_privilege.c +++ b/source4/dsdb/samdb/samdb_privilege.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_ndr.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "libcli/security/security.h" |