svn commit: samba r26319 - in branches/SAMBA_4_0: . source/auth
source/cldap_server source/dsdb source/dsdb/common
source/dsdb/samdb source/dsdb/samdb/ldb_modules
source/libcli/cldap source/libcli/ldap source/libnet
source/rpc_server/lsa source/rpc_server/samr
jelmer at samba.org
jelmer at samba.org
Thu Dec 6 21:39:52 GMT 2007
Author: jelmer
Date: 2007-12-06 21:39:49 +0000 (Thu, 06 Dec 2007)
New Revision: 26319
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26319
Log:
Split encoding functions out of libcli_ldap.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/auth_sam.c
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/cldap_server/netlogon.c
branches/SAMBA_4_0/source/dsdb/common/sidmap.c
branches/SAMBA_4_0/source/dsdb/config.mk
branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c
branches/SAMBA_4_0/source/libcli/cldap/cldap.c
branches/SAMBA_4_0/source/libcli/ldap/config.mk
branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
branches/SAMBA_4_0/source/rpc_server/lsa/lsa.h
branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/auth_sam.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_sam.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/auth/auth_sam.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -28,7 +28,7 @@
#include "auth/auth_sam.h"
#include "dsdb/samdb/samdb.h"
#include "libcli/security/security.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "param/param.h"
extern const char *user_attrs[];
Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/auth/config.mk 2007-12-06 21:39:49 UTC (rev 26319)
@@ -17,6 +17,7 @@
PRIVATE_PROTO_HEADER = auth_sam.h
OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o
PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB
+PRIVATE_DEPENDENCIES = LDAP_ENCODE
#######################
# Start MODULE auth_sam
Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
#include "lib/events/events.h"
Modified: branches/SAMBA_4_0/source/dsdb/common/sidmap.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/common/sidmap.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/common/sidmap.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -24,7 +24,8 @@
#include "dsdb/common/flags.h"
#include "dsdb/samdb/samdb.h"
#include "auth/auth.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
+#include "ldb.h"
#include "util/util_ldb.h"
#include "libcli/security/security.h"
#include "param/param.h"
Modified: branches/SAMBA_4_0/source/dsdb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/dsdb/config.mk 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/config.mk 2007-12-06 21:39:49 UTC (rev 26319)
@@ -7,9 +7,9 @@
[SUBSYSTEM::SAMDB]
PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
PUBLIC_HEADERS = samdb/samdb.h
-PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5
PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
- auth_system_session
+ auth_system_session LDAP_ENCODE
OBJ_FILES = \
samdb/samdb.o \
samdb/samdb_privilege.o \
Modified: branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -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"
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk 2007-12-06 21:39:49 UTC (rev 26319)
@@ -75,7 +75,7 @@
[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 @@
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
################################################
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -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"
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -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"
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -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"
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -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"
Modified: branches/SAMBA_4_0/source/libcli/cldap/cldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/cldap/cldap.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/libcli/cldap/cldap.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -35,6 +35,7 @@
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "libcli/cldap/cldap.h"
#include "lib/socket/socket.h"
#include "libcli/security/security.h"
Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2007-12-06 21:39:49 UTC (rev 26319)
@@ -5,9 +5,14 @@
ldap_client.o \
ldap_bind.o \
ldap_msg.o \
- ldap_ndr.o \
ldap_ildap.o \
ldap_controls.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL GENSEC_SOCKET
-#FIXME: PRIVATE_DEPENDENCIES = gensec
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket NDR_SAMR LIBTLS ASN1_UTIL \
+ LDAP_ENCODE LIBNDR
+
+
+[SUBSYSTEM::LDAP_ENCODE]
+PUBLIC_PROTO_HEADER = ldap_ndr.h
+OBJ_FILES = ldap_ndr.o
+# FIXME PRIVATE_DEPENDENCIES = LIBLDB
Modified: branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -24,7 +24,7 @@
#include "includes.h"
#include "libnet/libnet.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "dsdb/samdb/samdb.h"
#include "auth/auth.h"
#include "util/util_ldb.h"
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -22,6 +22,7 @@
#include "rpc_server/lsa/lsa.h"
#include "util/util_ldb.h"
+#include "libcli/ldap/ldap_ndr.h"
/*
this type allows us to distinguish handle types
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/lsa.h
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/lsa.h 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/lsa.h 2007-12-06 21:39:49 UTC (rev 26319)
@@ -25,7 +25,7 @@
#include "rpc_server/common/common.h"
#include "auth/auth.h"
#include "dsdb/samdb/samdb.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "lib/ldb/include/ldb_errors.h"
#include "libcli/security/security.h"
#include "libcli/auth/libcli_auth.h"
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2007-12-06 21:16:40 UTC (rev 26318)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2007-12-06 21:39:49 UTC (rev 26319)
@@ -31,7 +31,7 @@
#include "lib/ldb/include/ldb_errors.h"
#include "dsdb/common/flags.h"
#include "dsdb/samdb/samdb.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_ndr.h"
#include "libcli/security/security.h"
#include "rpc_server/samr/proto.h"
#include "util/util_ldb.h"
More information about the samba-cvs
mailing list