1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

r26464: Tighten dependencies.

(This used to be commit 2b7cfa5d9a)
This commit is contained in:
Jelmer Vernooij 2007-12-15 22:23:45 +01:00 committed by Stefan Metzmacher
parent 5b7ed0cd7f
commit 1bc38f9fb3
7 changed files with 12 additions and 9 deletions

View File

@ -11,7 +11,7 @@ PUBLIC_PROTO_HEADER = session_proto.h
[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

View File

@ -7,7 +7,7 @@ OBJ_FILES = credentials.o \
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
#################################

View File

@ -33,7 +33,7 @@ INIT_FUNCTION = s4_events_standard_init
[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
##############################

View File

@ -35,7 +35,7 @@ OBJ_FILES = \
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 @@ OBJ_FILES = \
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

View File

@ -6,7 +6,7 @@ OBJ_FILES = security_token.o \
access_check.o \
privilege.o \
sddl.o
PUBLIC_DEPENDENCIES = NDR_MISC
PUBLIC_DEPENDENCIES = NDR_MISC LIBNDR
[PYTHON::swig_security]
SWIG_FILE = security.i

View File

@ -8,7 +8,7 @@ OBJ_FILES = loadparm.o \
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 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
SUBSYSTEM = share
INIT_FUNCTION = share_ldb_init
OBJ_FILES = share_ldb.o
PRIVATE_DEPENDENCIES = LIBLDB
PRIVATE_DEPENDENCIES = LIBLDB LDB_WRAP
# End MODULE share_ldb
################################################

View File

@ -2586,8 +2586,11 @@ int lp_maxprintjobs(struct loadparm_service *service)
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;
}