s4:remove "util_ldb" submodule and integrate the three gendb_* calls in "dsdb/common...

They're only in use by SAMDB code.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Oct 17 09:40:13 UTC 2010 on sn-devel-104

diff --git a/lib/util/util_ldb.c b/lib/util/util_ldb.c
deleted file mode 100644 (file)
index 738d500..0000000
--- a/lib/util/util_ldb.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   common share info functions
-
-   Copyright (C) Andrew Tridgell 2004
-   Copyright (C) Tim Potter 2004
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "../lib/util/util_ldb.h"
-/*
-  search the sam for the specified attributes - va_list variant
-*/
-int gendb_search_v(struct ldb_context *ldb,
-                  TALLOC_CTX *mem_ctx,
-                  struct ldb_dn *basedn,
-                  struct ldb_message ***msgs,
-                  const char * const *attrs,
-                  const char *format,
-                  va_list ap) 
-{
-       enum ldb_scope scope = LDB_SCOPE_SUBTREE;
-       struct ldb_result *res;
-       char *expr = NULL;
-       int ret;
-
-       if (format) {
-               expr = talloc_vasprintf(mem_ctx, format, ap);
-               if (expr == NULL) {
-                       return -1;
-               }
-       } else {
-               scope = LDB_SCOPE_BASE;
-       }
-
-       res = NULL;
-
-       ret = ldb_search(ldb, mem_ctx, &res, basedn, scope, attrs,
-                        expr?"%s":NULL, expr);
-
-       if (ret == LDB_SUCCESS) {
-               talloc_steal(mem_ctx, res->msgs);
-
-               DEBUG(6,("gendb_search_v: %s %s -> %d\n",
-                        basedn?ldb_dn_get_linearized(basedn):"NULL",
-                        expr?expr:"NULL", res->count));
-
-               ret = res->count;
-               *msgs = res->msgs;
-               talloc_free(res);
-       } else if (scope == LDB_SCOPE_BASE && ret == LDB_ERR_NO_SUCH_OBJECT) {
-               ret = 0;
-               *msgs = NULL;
-       } else {
-               DEBUG(4,("gendb_search_v: search failed: %s\n",
-                                       ldb_errstring(ldb)));
-               ret = -1;
-       }
-
-       talloc_free(expr);
-
-       return ret;
-}
-
-/*
-  search the LDB for the specified attributes - varargs variant
-*/
-int gendb_search(struct ldb_context *ldb,
-                TALLOC_CTX *mem_ctx,
-                struct ldb_dn *basedn,
-                struct ldb_message ***res,
-                const char * const *attrs,
-                const char *format, ...) 
-{
-       va_list ap;
-       int count;
-
-       va_start(ap, format);
-       count = gendb_search_v(ldb, mem_ctx, basedn, res, attrs, format, ap);
-       va_end(ap);
-
-       return count;
-}
-
-/*
-  search the LDB for a specified record (by DN)
-*/
-
-int gendb_search_dn(struct ldb_context *ldb,
-                TALLOC_CTX *mem_ctx,
-                struct ldb_dn *dn,
-                struct ldb_message ***res,
-                const char * const *attrs)
-{
-       return gendb_search(ldb, mem_ctx, dn, res, attrs, NULL);
-}
-

diff --git a/lib/util/util_ldb.h b/lib/util/util_ldb.h
deleted file mode 100644 (file)
index f9eb028..0000000
--- a/lib/util/util_ldb.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIB_UTIL_UTIL_LDB_H__
-#define __LIB_UTIL_UTIL_LDB_H__
-
-struct ldb_dn;
-
-/* The following definitions come from lib/util/util_ldb.c  */
-
-int gendb_search_v(struct ldb_context *ldb,
-                  TALLOC_CTX *mem_ctx,
-                  struct ldb_dn *basedn,
-                  struct ldb_message ***msgs,
-                  const char * const *attrs,
-                  const char *format,
-                  va_list ap)  PRINTF_ATTRIBUTE(6,0);
-int gendb_search(struct ldb_context *ldb,
-                TALLOC_CTX *mem_ctx,
-                struct ldb_dn *basedn,
-                struct ldb_message ***res,
-                const char * const *attrs,
-                const char *format, ...) PRINTF_ATTRIBUTE(6,7);
-int gendb_search_dn(struct ldb_context *ldb,
-                TALLOC_CTX *mem_ctx,
-                struct ldb_dn *dn,
-                struct ldb_message ***res,
-                const char * const *attrs);
-int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string);
-char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n);
-
-#endif /* __LIB_UTIL_UTIL_LDB_H__ */

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 91c85f083796663773cdfa903555d363ad41de64..b551953f932396bab71d08993f6bcb7e6b79ed40 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -47,15 +47,6 @@ bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
        header_path=[ ('*', 'util') ],
        )
 
-
-bld.SAMBA_SUBSYSTEM('UTIL_LDB',
-       source='util_ldb.c',
-        local_include=False,
-       public_deps='ldb',
-        public_headers='util_ldb.h'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD',
        source='util_runcmd.c',
        local_include=False,

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 573f1972bc5fa4e16b555e78b70540202a1aa38d..58d7ed43caa53cedfed0a6b1e8be2cd46f3e597a 100644 (file)
--- 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 UTIL_LDB LIBSECURITY
+PUBLIC_DEPENDENCIES = SAMDB 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 32f415a8bfc74f44630d6c9bbaae14492a5eff1c..2d3518017d04ebd3915fc20c37f57e67173c3e90 100644 (file)
--- 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 8c8043cad7b6015c44768729f618c3d4de8d891b..210590caff22d3e90f20f9f7c63a44a55265f018 100644 (file)
--- 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 8de33ffa7826fa4cc6ab4f7208a6e45e91a7d761..259efec8e5b9af06dcd44162782b095aae39153c 100644 (file)
--- 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 38fb1b7707b17851aebdcc7cbc40ca99bc3edaab..e44a0324f9fefc0ca9877073c6da5d0c3b2eb56c 100644 (file)
--- 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/common/util.c b/source4/dsdb/common/util.c
index 9e6ccbc9114a2e8e88451e635a3568ffd898a591..b7f6b69fce0e792dab646808590df9fa081d23c3 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -26,7 +26,6 @@
 #include "ldb.h"
 #include "ldb_module.h"
 #include "ldb_errors.h"
-#include "../lib/util/util_ldb.h"
 #include "../lib/crypto/crypto.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/security.h"
@@ -44,6 +43,92 @@
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/irpc.h"
 
+/*
+ * search the SAMDB for the specified attributes - va_list variant
+ */
+int gendb_search_v(struct ldb_context *ldb,
+                  TALLOC_CTX *mem_ctx,
+                  struct ldb_dn *basedn,
+                  struct ldb_message ***msgs,
+                  const char * const *attrs,
+                  const char *format,
+                  va_list ap)
+{
+       enum ldb_scope scope = LDB_SCOPE_SUBTREE;
+       struct ldb_result *res;
+       char *expr = NULL;
+       int ret;
+
+       if (format) {
+               expr = talloc_vasprintf(mem_ctx, format, ap);
+               if (expr == NULL) {
+                       return -1;
+               }
+       } else {
+               scope = LDB_SCOPE_BASE;
+       }
+
+       res = NULL;
+
+       ret = ldb_search(ldb, mem_ctx, &res, basedn, scope, attrs,
+                        expr?"%s":NULL, expr);
+
+       if (ret == LDB_SUCCESS) {
+               talloc_steal(mem_ctx, res->msgs);
+
+               DEBUG(6,("gendb_search_v: %s %s -> %d\n",
+                        basedn?ldb_dn_get_linearized(basedn):"NULL",
+                        expr?expr:"NULL", res->count));
+
+               ret = res->count;
+               *msgs = res->msgs;
+               talloc_free(res);
+       } else if (scope == LDB_SCOPE_BASE && ret == LDB_ERR_NO_SUCH_OBJECT) {
+               ret = 0;
+               *msgs = NULL;
+       } else {
+               DEBUG(4,("gendb_search_v: search failed: %s\n",
+                                       ldb_errstring(ldb)));
+               ret = -1;
+       }
+
+       talloc_free(expr);
+
+       return ret;
+}
+
+/*
+ * search the SAMDB for the specified attributes - varargs variant
+ */
+int gendb_search(struct ldb_context *ldb,
+                TALLOC_CTX *mem_ctx,
+                struct ldb_dn *basedn,
+                struct ldb_message ***res,
+                const char * const *attrs,
+                const char *format, ...)
+{
+       va_list ap;
+       int count;
+
+       va_start(ap, format);
+       count = gendb_search_v(ldb, mem_ctx, basedn, res, attrs, format, ap);
+       va_end(ap);
+
+       return count;
+}
+
+/*
+ * search the SAMDB for a specified record (by DN)
+ */
+int gendb_search_dn(struct ldb_context *ldb,
+                TALLOC_CTX *mem_ctx,
+                struct ldb_dn *dn,
+                struct ldb_message ***res,
+                const char * const *attrs)
+{
+       return gendb_search(ldb, mem_ctx, dn, res, attrs, NULL);
+}
+
 /*
   search the sam for the specified attributes in a specific domain, filter on
   objectSid being in domain_sid.

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 6df140fed376bfd7efd819fae6d14bba62f423f2..d4b122056b5ee344afb8bd5cebbe2fea0f47a41e 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -32,7 +32,6 @@
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
 #include "auth/auth.h"
-#include "../lib/util/util_ldb.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
 #include "param/param.h"

diff --git a/source4/dsdb/samdb/ldb_modules/samba3sid.c b/source4/dsdb/samdb/ldb_modules/samba3sid.c
index a5b3df185ce6227f7c2f3f3c03b5e3672dcb8260..f6db0d194881f119806cae4148e7fc6a86087a53 100644 (file)
--- 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 3a971e80c565facaea29a7ae0df7ae2b8a10ccf2..8db93b2a8a278a53e87a3e1ae5c146f65393f25a 100644 (file)
--- 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/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index c7d2c3085ddca1c5b3603e99d856978157ee05c6..93fc122d21d65795f588a6b5221b386d2f144fc4 100644 (file)
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -34,7 +34,6 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "ldb_wrap.h"
-#include "../lib/util/util_ldb.h"
 #include "dsdb/samdb/samdb.h"
 #include "../libds/common/flags.h"
 #include "param/param.h"

diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index 69c4ebea6172f594883773057fb263cb47c22bfe..e6d9a9a0324ace1cda137438d5b0566179340177 100644 (file)
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -24,7 +24,6 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
-#include "../lib/util/util_ldb.h"
 #include "param/param.h"
 #include "ldb_wrap.h"
 

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index db2f38b1b1daa47d77fd391937e1c5749b1ed482..832adb7d1d92d59bc2b71fec72d53c3b5262ba44 100644 (file)
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -14,7 +14,7 @@ bld.SAMBA_LIBRARY('SAMDB',
 bld.SAMBA_SUBSYSTEM('SAMDB_COMMON',
        source='common/util.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c ../../libds/common/flag_mapping.c',
        autoproto='common/proto.h',
-       deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH LIBTSOCKET samba_socket LIBSAMBA-HOSTCONFIG'
+       deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR LIBCLI_AUTH LIBTSOCKET samba_socket LIBSAMBA-HOSTCONFIG'
        )
 
 

diff --git a/source4/headermap.txt b/source4/headermap.txt
index e8dbbce7cbbb54d27384508adcd1652477df8c02..dbf18cbf35eab03dfb3c82bb1ccc5f99ad77d653 100644 (file)
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -51,7 +51,6 @@ lib/ldb_wrap.h: ldb_wrap.h
 torture/smbtorture.h: smbtorture.h
 param/share.h: share.h
 ../lib/util/util_tdb.h: util_tdb.h
-../lib/util/util_ldb.h: util_ldb.h
 ../lib/util/wrap_xattr.h: wrap_xattr.h
 ../libcli/ldap/ldap_message.h: ldap_message.h
 ../libcli/ldap/ldap_errors.h: ldap_errors.h

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 9d6a230b99d19ed7406f3b008c5e9ff8be7c47f5..e9ae5b348626bdd385c13e4dcba92a1aa8fc314a 100644 (file)
--- 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/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 5254b62384bfc5624a711f1a424498da83477ef9..bddc0a90697b7e7a7f57a9a30dff4affd1e72ac7 100644 (file)
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -33,7 +33,6 @@
 #include "auth/credentials/credentials_krb5.h"
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
-#include "../lib/util/util_ldb.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/samr/proto.h"
 #include "libcli/security/security.h"

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 4b40ed41d4551be32b30fe8e38cc63eb3f9db481..7df92d432de3e1df0ab316ca4841cd805436c5ac 100644 (file)
--- 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 fd07fd1aff35c80f87cb317af621792b2d9c4ddf..a2ac32bdbee5c330abc13d55b4215082909c4e0d 100644 (file)
--- 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 da2110842bf26ad40060f3f4dfa2ca28131edaf8..6c030be72834dd7b5b59daf144599920204d2085 100644 (file)
--- 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/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 917257de85a7fe4fdaa3a1b01800ccbf3d61d068..fc53c368237a1a0e2b8487bf6036fa059d89d3d9 100644 (file)
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -27,7 +27,6 @@
 #include "libcli/ldap/ldap_ndr.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
-#include "../lib/util/util_ldb.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ldb_wrap.h"
 #include "libcli/security/security.h"

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 8e231ccc23326cfd28818cbcc5dcd39793b10122..81ee4c60ea61cfa8224ae96d6e5b2ac71bdfadab 100644 (file)
--- 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"

diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index 2790f8359d613aee8f53eadf4d9449e887cda804..bdf5b6f8b69997cfa333129a859b161ad01034f4 100644 (file)
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -34,7 +34,6 @@
 #include "auth/auth.h"
 #include "dsdb/samdb/samdb.h"
 #include "ldb_wrap.h"
-#include "../lib/util/util_ldb.h"
 #include "rpc_server/common/common.h"
 #include "param/param.h"
 

diff --git a/source4/rpc_server/lsa/lsa.h b/source4/rpc_server/lsa/lsa.h
index 53fe1026303c34c885248072e243f8cdb1977330..8edd570b98bae4c725e25ce280c941c0f8eeabc4 100644 (file)
--- a/source4/rpc_server/lsa/lsa.h
+++ b/source4/rpc_server/lsa/lsa.h
@@ -30,7 +30,6 @@
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/secrets.h"
-#include "../lib/util/util_ldb.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
 #include "param/param.h"
 

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index b4fe5dca883066cccf898543c1764f59b1f06dfe..eda23fff98ff4cb08bfd1e7da0af9dbfc626af02 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -26,7 +26,6 @@
 #include "auth/auth.h"
 #include "auth/auth_sam_reply.h"
 #include "dsdb/samdb/samdb.h"
-#include "../lib/util/util_ldb.h"
 #include "../libcli/auth/schannel.h"
 #include "libcli/security/security.h"
 #include "param/param.h"

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index ac75b417f92c14f4d97538a830212fc346246d43..f4e1921fe7423f4823db61a710f3b47d3df7dd15 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -36,7 +36,6 @@
 #include "libcli/ldap/ldap_ndr.h"
 #include "libcli/security/security.h"
 #include "rpc_server/samr/proto.h"
-#include "../lib/util/util_ldb.h"
 #include "param/param.h"
 #include "lib/util/tsort.h"
 

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index d95a31d322b0104282ba58295549c307407e194e..baea71efe9bb2fc6506498b69923437f7c809067 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -28,7 +28,6 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "libcli/auth/libcli_auth.h"
-#include "../lib/util/util_ldb.h"
 
 /* 
   samr_ChangePasswordUser 

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 97581850460f0438096aa90fa26768ebe1f99869..b8644d3674041acf1122343749db740d262c2f39 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -33,7 +33,6 @@
 #include "param/param.h"
 #include "libcli/security/security.h"
 #include "lib/ldb/include/ldb.h"
-#include "lib/util/util_ldb.h"
 #include "ldb_wrap.h"
 #include "lib/replace/system/network.h"
 #include "dsdb/samdb/samdb.h"

diff --git a/source4/utils/net/drs/net_drs_showrepl.c b/source4/utils/net/drs/net_drs_showrepl.c
index 584c29470785ed9b485cb3e104aa3d3b5e475907..8d81de159497f32172e72752a7733e01c9818f8e 100644 (file)
--- a/source4/utils/net/drs/net_drs_showrepl.c
+++ b/source4/utils/net/drs/net_drs_showrepl.c
@@ -24,7 +24,6 @@
 #include "net_drs.h"
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/util/util_ldb.h"
 
 
 /**