[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri May 21 01:40:11 MDT 2010
The branch, master has been updated
via c8a2314... s4:libcli/ldap Rename ldap.h to libcli_ldap.h
via 82c97e0... s4:auth Remove un-needed headers.
from 9453a0f... s4:auth Fix previous commit - segfault in determinging a user's groups
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c8a23147fe12c693fd7944af7bb09b88393789d9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 21 17:39:15 2010 +1000
s4:libcli/ldap Rename ldap.h to libcli_ldap.h
It is a problem if a samba header is called ldap.h if we also want
to use OpenLDAP's ldap.h
Andrew Bartlett
commit 82c97e0ab840d8acfc81c3096bebc8c3d3e0bde3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 21 16:38:44 2010 +1000
s4:auth Remove un-needed headers.
-----------------------------------------------------------------------
Summary of changes:
source4/auth/auth_sam_reply.c | 1 -
source4/auth/gensec/cyrus_sasl.c | 1 -
source4/auth/sam.c | 4 ----
source4/auth/session.c | 2 --
source4/auth/system_session.c | 1 -
source4/cldap_server/cldap_server.c | 1 -
source4/cldap_server/cldap_server.h | 1 +
source4/cldap_server/rootdse.c | 1 -
source4/dsdb/samdb/ldb_modules/local_password.c | 1 -
source4/ldap_server/ldap_backend.c | 1 -
source4/ldap_server/ldap_bind.c | 1 -
source4/ldap_server/ldap_extended.c | 1 -
source4/ldap_server/ldap_server.c | 1 -
source4/ldap_server/ldap_server.h | 2 +-
source4/lib/ldb/ldb_ildap/ldb_ildap.c | 2 +-
source4/libcli/ldap/ldap_bind.c | 2 +-
source4/libcli/ldap/ldap_client.c | 2 +-
source4/libcli/ldap/ldap_client.h | 2 +-
source4/libcli/ldap/ldap_controls.c | 2 +-
source4/libcli/ldap/ldap_ildap.c | 2 +-
source4/libcli/ldap/{ldap.h => libcli_ldap.h} | 0
source4/torture/ldap/cldap.c | 2 +-
22 files changed, 9 insertions(+), 24 deletions(-)
rename source4/libcli/ldap/{ldap.h => libcli_ldap.h} (100%)
Changeset truncated at 500 lines:
diff --git a/source4/auth/auth_sam_reply.c b/source4/auth/auth_sam_reply.c
index 0aa41ae..d7792e5 100644
--- a/source4/auth/auth_sam_reply.c
+++ b/source4/auth/auth_sam_reply.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "auth/auth.h"
#include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
#include "auth/auth_sam_reply.h"
NTSTATUS auth_convert_server_info_sambaseinfo(TALLOC_CTX *mem_ctx,
diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c
index f563867..c4f9544 100644
--- a/source4/auth/gensec/cyrus_sasl.c
+++ b/source4/auth/gensec/cyrus_sasl.c
@@ -24,7 +24,6 @@
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
#include "auth/gensec/gensec_proto.h"
-#include "lib/socket/socket.h"
#include <sasl/sasl.h>
struct gensec_sasl_state {
diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index d6d1a50..894ba37 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -24,12 +24,8 @@
#include "system/time.h"
#include "auth/auth.h"
#include <ldb.h>
-#include "../lib/util/util_ldb.h"
#include "dsdb/samdb/samdb.h"
#include "libcli/security/security.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
-#include "librpc/gen_ndr/ndr_security.h"
-#include "param/param.h"
#include "auth/auth_sam.h"
#include "dsdb/common/util.h"
diff --git a/source4/auth/session.c b/source4/auth/session.c
index a21fbcf..29ba13e 100644
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -26,8 +26,6 @@
#include "libcli/security/security.h"
#include "libcli/auth/libcli_auth.h"
#include "dsdb/samdb/samdb.h"
-#include "auth/credentials/credentials.h"
-#include "param/param.h"
#include "auth/session_proto.h"
_PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
diff --git a/source4/auth/system_session.c b/source4/auth/system_session.c
index 2835a20..8fdf527 100644
--- a/source4/auth/system_session.c
+++ b/source4/auth/system_session.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "libcli/security/security.h"
-#include "libcli/auth/libcli_auth.h"
#include "auth/credentials/credentials.h"
#include "param/param.h"
#include "auth/auth.h" /* for auth_serversupplied_info */
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index da59e0c..8bed38b 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -21,7 +21,6 @@
#include "includes.h"
#include <talloc.h>
-#include "libcli/ldap/ldap.h"
#include "lib/messaging/irpc.h"
#include "smbd/service_task.h"
#include "smbd/service.h"
diff --git a/source4/cldap_server/cldap_server.h b/source4/cldap_server/cldap_server.h
index e40a1bd..fe7788f 100644
--- a/source4/cldap_server/cldap_server.h
+++ b/source4/cldap_server/cldap_server.h
@@ -20,6 +20,7 @@
*/
#include "libcli/cldap/cldap.h"
+#include "libcli/ldap/libcli_ldap.h"
/*
top level context structure for the cldap server
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index 7e867de..3592ffa 100644
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -21,7 +21,6 @@
#include "includes.h"
#include <tevent.h>
-#include "libcli/ldap/ldap.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
#include "smbd/service_task.h"
diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c b/source4/dsdb/samdb/ldb_modules/local_password.c
index aa4d3af..4f9cfd6 100644
--- a/source4/dsdb/samdb/ldb_modules/local_password.c
+++ b/source4/dsdb/samdb/ldb_modules/local_password.c
@@ -30,7 +30,6 @@
*/
#include "includes.h"
-#include "libcli/ldap/ldap.h"
#include "ldb_module.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/ndr/libndr.h"
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index e6f6c66..d9f15b8 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -21,7 +21,6 @@
#include "includes.h"
#include "ldap_server/ldap_server.h"
#include "../lib/util/dlinklist.h"
-#include "libcli/ldap/ldap.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
#include "param/param.h"
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 9abc611..1b235f2 100644
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -20,7 +20,6 @@
#include "includes.h"
#include "ldap_server/ldap_server.h"
#include "auth/auth.h"
-#include "libcli/ldap/ldap.h"
#include "smbd/service.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index ac8f6c1..78fd43c 100644
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -20,7 +20,6 @@
#include "includes.h"
#include "ldap_server/ldap_server.h"
#include "../lib/util/dlinklist.h"
-#include "libcli/ldap/ldap.h"
#include "lib/tls/tls.h"
#include "smbd/service_stream.h"
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 92c549e..00698ee 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -37,7 +37,6 @@
#include "lib/messaging/irpc.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
-#include "libcli/ldap/ldap.h"
#include "libcli/ldap/ldap_proto.h"
#include "system/network.h"
#include "lib/socket/netif.h"
diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h
index efa802d..8b45285 100644
--- a/source4/ldap_server/ldap_server.h
+++ b/source4/ldap_server/ldap_server.h
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "lib/socket/socket.h"
#include "lib/stream/packet.h"
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 9f81c4e..dc1d987 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -44,7 +44,7 @@
#include "ldb_module.h"
#include "dlinklist.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "libcli/ldap/ldap_client.h"
#include "auth/auth.h"
#include "auth/credentials/credentials.h"
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index 5e6a5fa..804c57c 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -22,7 +22,7 @@
*/
#include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "libcli/ldap/ldap_proto.h"
#include "libcli/ldap/ldap_client.h"
#include "lib/tls/tls.h"
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index eb53276..2812663 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -27,7 +27,7 @@
#include "lib/socket/socket.h"
#include "../lib/util/asn1.h"
#include "../lib/util/dlinklist.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "libcli/ldap/ldap_proto.h"
#include "libcli/ldap/ldap_client.h"
#include "libcli/composite/composite.h"
diff --git a/source4/libcli/ldap/ldap_client.h b/source4/libcli/ldap/ldap_client.h
index 084de2e..3b4da6b 100644
--- a/source4/libcli/ldap/ldap_client.h
+++ b/source4/libcli/ldap/ldap_client.h
@@ -20,7 +20,7 @@
*/
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
enum ldap_request_state { LDAP_REQUEST_SEND=1, LDAP_REQUEST_PENDING=2, LDAP_REQUEST_DONE=3, LDAP_REQUEST_ERROR=4 };
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 94b32b3..b0c024a 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "../lib/util/asn1.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "lib/ldb/include/ldb.h"
#include "libcli/ldap/ldap_proto.h"
#include "dsdb/samdb/samdb.h"
diff --git a/source4/libcli/ldap/ldap_ildap.c b/source4/libcli/ldap/ldap_ildap.c
index f059e38..77bf3f0 100644
--- a/source4/libcli/ldap/ldap_ildap.c
+++ b/source4/libcli/ldap/ldap_ildap.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "libcli/ldap/ldap_client.h"
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/libcli_ldap.h
similarity index 100%
rename from source4/libcli/ldap/ldap.h
rename to source4/libcli/ldap/libcli_ldap.h
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 73bbcd1..8b67943 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "libcli/cldap/cldap.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/libcli_ldap.h"
#include "librpc/gen_ndr/netlogon.h"
#include "torture/torture.h"
#include "param/param.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list