diff options
| -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 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samba3sid.c | 1 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 1 | ||||
| -rw-r--r-- | source4/kdc/db-glue.c | 1 | ||||
| -rw-r--r-- | source4/lib/basic.mk | 2 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/wscript_build | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_join.c | 1 | ||||
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 1 |
11 files changed, 4 insertions, 11 deletions
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 9762966bff..2d3518017d 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 UTIL_LDB HEIMDAL_GSSAPI + LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS HEIMDAL_GSSAPI PRIVATE_DEPENDENCIES = \ SECRETS SAMDB diff --git a/source4/auth/credentials/credentials_secrets.c b/source4/auth/credentials/credentials_secrets.c index 8c8043cad7..210590caff 100644 --- a/source4/auth/credentials/credentials_secrets.c +++ b/source4/auth/credentials/credentials_secrets.c @@ -27,7 +27,6 @@ #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 8de33ffa78..259efec8e5 100644 --- a/source4/auth/ntlm/auth_sam.c +++ b/source4/auth/ntlm/auth_sam.c @@ -22,7 +22,6 @@ #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 38fb1b7707..e44a0324f9 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 UTIL_LDB LIBSECURITY ldb tevent', + public_deps='SAMDB LIBSECURITY ldb tevent', deps='' ) diff --git a/source4/dsdb/samdb/ldb_modules/samba3sid.c b/source4/dsdb/samdb/ldb_modules/samba3sid.c index a5b3df185c..f6db0d1948 100644 --- a/source4/dsdb/samdb/ldb_modules/samba3sid.c +++ b/source4/dsdb/samdb/ldb_modules/samba3sid.c @@ -29,7 +29,6 @@ #include "dsdb/samdb/ldb_modules/util.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_security.h" -#include "../lib/util/util_ldb.h" #include "ldb_wrap.h" #include "param/param.h" diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 3a971e80c5..8db93b2a8a 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -37,7 +37,6 @@ #include "dsdb/samdb/ldb_modules/ridalloc.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_security.h" -#include "../lib/util/util_ldb.h" #include "ldb_wrap.h" #include "param/param.h" diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index 9d6a230b99..e9ae5b3486 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -30,7 +30,6 @@ #include "auth/auth.h" #include "auth/credentials/credentials.h" #include "auth/auth_sam.h" -#include "../lib/util/util_ldb.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" #include "librpc/ndr/libndr.h" diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 4b40ed41d4..7df92d432d 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -11,7 +11,7 @@ GENCACHE_OBJ_FILES = $(libgencachesrcdir)/gencache.o [SUBSYSTEM::LDB_WRAP] PUBLIC_DEPENDENCIES = LIBLDB -PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB +PRIVATE_DEPENDENCIES = LDBSAMBA LDB_WRAP_OBJ_FILES = $(libsrcdir)/ldb_wrap.o PUBLIC_HEADERS += $(libsrcdir)/ldb_wrap.h diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index fd07fd1aff..a2ac32bdbe 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('LDBSAMBA', autoproto='ldif_handlers_proto.h', public_deps='ldb', public_headers='ldb_wrap.h', - deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS UTIL_LDB NDR_DNSP SAMDB' + deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB' ) diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index da2110842b..6c030be728 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -27,7 +27,6 @@ #include "param/secrets.h" #include "dsdb/samdb/samdb.h" #include "ldb_wrap.h" -#include "../lib/util/util_ldb.h" #include "libcli/security/security.h" #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_krb5.h" diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index 8e231ccc23..81ee4c60ea 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -26,7 +26,6 @@ #include "lib/ldb/include/ldb.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" -#include "../lib/util/util_ldb.h" #include "param/param.h" #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" |