diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-10-17 14:27:18 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-10-17 13:37:16 +0000 |
| commit | a3f61dea40d8a907d56abe1c0eee980f78228b79 (patch) | |
| tree | 6371c9b0ba971eb014fa10e54ddc241d336fa09d /source4/auth | |
| parent | 8a2ce5c47cee499f90b125ebde83de5f9f1a9aa0 (diff) | |
| download | samba-a3f61dea40d8a907d56abe1c0eee980f78228b79.tar.gz samba-a3f61dea40d8a907d56abe1c0eee980f78228b79.tar.bz2 samba-a3f61dea40d8a907d56abe1c0eee980f78228b79.zip | |
Revert "s4:remove "util_ldb" submodule and integrate the three gendb_* calls in "dsdb/common/util.c""
This reverts commit 8a2ce5c47cee499f90b125ebde83de5f9f1a9aa0.
Jelmer pointed out that these are also in use by other LDB databases - not only
SAMDB ones.
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Oct 17 13:37:16 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/credentials/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_secrets.c | 1 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth_sam.c | 1 | ||||
| -rw-r--r-- | source4/auth/wscript_build | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 58d7ed43ca..573f1972bc 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -29,7 +29,7 @@ auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) $(eval $(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES:.o=.c))) [SUBSYSTEM::auth_sam] -PUBLIC_DEPENDENCIES = SAMDB LIBSECURITY +PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY PRIVATE_DEPENDENCIES = LDAP_ENCODE auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 2d3518017d..9762966bff 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM CREDENTIALS [SUBSYSTEM::CREDENTIALS] PUBLIC_DEPENDENCIES = \ - LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS HEIMDAL_GSSAPI + LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI PRIVATE_DEPENDENCIES = \ SECRETS SAMDB diff --git a/source4/auth/credentials/credentials_secrets.c b/source4/auth/credentials/credentials_secrets.c index 210590caff..8c8043cad7 100644 --- a/source4/auth/credentials/credentials_secrets.c +++ b/source4/auth/credentials/credentials_secrets.c @@ -27,6 +27,7 @@ #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */ #include "param/secrets.h" #include "system/filesys.h" +#include "../lib/util/util_ldb.h" #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_krb5.h" #include "auth/kerberos/kerberos_util.h" diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c index 259efec8e5..8de33ffa78 100644 --- a/source4/auth/ntlm/auth_sam.c +++ b/source4/auth/ntlm/auth_sam.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/time.h" #include "lib/ldb/include/ldb.h" +#include "../lib/util/util_ldb.h" #include "libcli/ldap/ldap_ndr.h" #include "libcli/security/security.h" #include "auth/auth.h" diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index e44a0324f9..38fb1b7707 100644 --- a/source4/auth/wscript_build +++ b/source4/auth/wscript_build @@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session', bld.SAMBA_SUBSYSTEM('auth_sam', source='sam.c', autoproto='auth_sam.h', - public_deps='SAMDB LIBSECURITY ldb tevent', + public_deps='SAMDB UTIL_LDB LIBSECURITY ldb tevent', deps='' ) |