svn commit: samba r26464 - in branches/SAMBA_4_0: . source/auth source/auth/credentials source/lib/events source/libcli source/libcli/security source/param

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-15 22:23:45 +0000 (Sat, 15 Dec 2007)
New Revision: 26464

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26464

Log:
Tighten dependencies.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/config.mk
   branches/SAMBA_4_0/source/auth/credentials/config.mk
   branches/SAMBA_4_0/source/lib/events/config.mk
   branches/SAMBA_4_0/source/libcli/config.mk
   branches/SAMBA_4_0/source/libcli/security/config.mk
   branches/SAMBA_4_0/source/param/config.mk
   branches/SAMBA_4_0/source/param/loadparm.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/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/auth/config.mk	2007-12-15 22:23:45 UTC (rev 26464)
@@ -11,7 +11,7 @@
 [SUBSYSTEM::auth_system_session]
 OBJ_FILES = system_session.o
 PUBLIC_PROTO_HEADER = system_session_proto.h
-PRIVATE_DEPENDENCIES = auth_session
+PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL
 
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h

Modified: branches/SAMBA_4_0/source/auth/credentials/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/config.mk	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/auth/credentials/config.mk	2007-12-15 22:23:45 UTC (rev 26464)
@@ -7,7 +7,7 @@
 		credentials_files.o \
 		credentials_ntlm.o
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS
+		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB
 PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5
 # End SUBSYSTEM CREDENTIALS
 #################################

Modified: branches/SAMBA_4_0/source/lib/events/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/events/config.mk	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/lib/events/config.mk	2007-12-15 22:23:45 UTC (rev 26464)
@@ -33,7 +33,7 @@
 [SUBSYSTEM::LIBEVENTS]
 OBJ_FILES = events.o events_timed.o events_signal.o
 PUBLIC_HEADERS = events.h events_internal.h
-PUBLIC_DEPENDENCIES = LIBTALLOC
+PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
 # End SUBSYSTEM LIBEVENTS
 ##############################
 

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/libcli/config.mk	2007-12-15 22:23:45 UTC (rev 26464)
@@ -35,7 +35,7 @@
 	smb_composite/fetchfile.o \
 	smb_composite/appendacl.o \
 	smb_composite/fsinfo.o 
-PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec
+PUBLIC_DEPENDENCIES = LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE
 
 [SUBSYSTEM::NDR_NBT_BUF]
 PRIVATE_PROTO_HEADER = nbt/nbtname.h
@@ -74,7 +74,7 @@
 	dgram/netlogon.o \
 	dgram/ntlogon.o \
 	dgram/browse.o
-PUBLIC_DEPENDENCIES = LIBCLI_NBT
+PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
 
 [LIBRARY::LIBCLI_CLDAP]
 VERSION = 0.0.1

Modified: branches/SAMBA_4_0/source/libcli/security/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/config.mk	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/libcli/security/config.mk	2007-12-15 22:23:45 UTC (rev 26464)
@@ -6,7 +6,7 @@
 		access_check.o \
 		privilege.o \
 		sddl.o
-PUBLIC_DEPENDENCIES = NDR_MISC
+PUBLIC_DEPENDENCIES = NDR_MISC LIBNDR
 
 [PYTHON::swig_security]
 SWIG_FILE = security.i

Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/param/config.mk	2007-12-15 22:23:45 UTC (rev 26464)
@@ -8,7 +8,7 @@
 			util.o \
 			../lib/version.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
-PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT
+PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
 PUBLIC_PROTO_HEADER = proto.h
 PUBLIC_HEADERS = param.h
 
@@ -41,7 +41,7 @@
 SUBSYSTEM = share
 INIT_FUNCTION = share_ldb_init
 OBJ_FILES = share_ldb.o 
-PRIVATE_DEPENDENCIES = LIBLDB
+PRIVATE_DEPENDENCIES = LIBLDB LDB_WRAP
 # End MODULE share_ldb
 ################################################
 

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2007-12-15 22:23:42 UTC (rev 26463)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2007-12-15 22:23:45 UTC (rev 26464)
@@ -2586,8 +2586,11 @@
 struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_ctx)
 {
 	if (lp_ctx == NULL) {
-		return smb_iconv_convenience_init(talloc_autofree_context(), 
+		static struct smb_iconv_convenience *fallback_ic = NULL;
+		if (fallback_ic == NULL)
+			fallback_ic = smb_iconv_convenience_init(talloc_autofree_context(), 
 						  "CP850", "UTF8", true);
+		return fallback_ic;
 	}
 	return lp_ctx->iconv_convenience;
 }