sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

r19676: Fix some more dependencies.

Browse Source 
(This used to be commit 8768bec81f57131a0c9754e8121b345c0be4a5d0)
This commit is contained in:
Jelmer Vernooij 2006-11-12 02:49:05 +00:00 committed by Gerald (Jerry) Carter
parent fff74b4bca
commit c81f2930a2
17 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/auth/auth_util.c
View File

@ -620,7 +620,7 @@ NTSTATUS auth_system_session_info(TALLOC_CTX *parent_ctx,
return NT_STATUS_OK;
}
struct auth_session_info *system_session(TALLOC_CTX *mem_ctx)
_PUBLIC_ struct auth_session_info *system_session(TALLOC_CTX *mem_ctx)
{
NTSTATUS nt_status;
struct auth_session_info *session_info = NULL;

6
source4/auth/config.mk
View File

@ -65,9 +65,9 @@ OBJ_FILES = pam_errors.o
#######################
# Start SUBSYSTEM auth
[LIBRARY::auth]
VERSION = 0.0.1
SO_VERSION = 0
[SUBSYSTEM::auth]
#VERSION = 0.0.1
#SO_VERSION = 0
PUBLIC_HEADERS = auth.h
PUBLIC_PROTO_HEADER = auth_proto.h
OBJ_FILES = \

2
source4/auth/credentials/config.mk
View File

@ -19,6 +19,6 @@ PUBLIC_PROTO_HEADER = credentials_krb5_proto.h
PUBLIC_HEADERS = credentials_krb5.h
OBJ_FILES = credentials_krb5.o
PUBLIC_DEPENDENCIES = \
HEIMDAL_GSSAPI
HEIMDAL_GSSAPI
# End SUBSYSTEM CREDENTIALS
#################################

2
source4/auth/gensec/config.mk
View File

@ -8,7 +8,7 @@ PUBLIC_HEADERS = gensec.h spnego.h
PUBLIC_PROTO_HEADER = gensec_proto.h
OBJ_FILES = gensec.o
PUBLIC_DEPENDENCIES = \
CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL
CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL
# End SUBSYSTEM gensec
#################################

4
source4/lib/ldb/config.mk
View File

@ -177,7 +177,9 @@ OBJ_FILES = \
common/ldb_controls.o \
common/qsort.o
PUBLIC_DEPENDENCIES = \
LIBTALLOC
LIBTALLOC \
DYNCONFIG \
SOCKET_WRAPPER
MANPAGE = man/ldb.3
PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
#

1
source4/lib/messaging/config.mk
View File

@ -5,6 +5,7 @@
OBJ_FILES = \
messaging.o
PUBLIC_DEPENDENCIES = \
LIBSAMBA-UTIL \
DB_WRAP \
NDR_IRPC \
UNIX_PRIVS \

2
source4/lib/samba3/config.mk
View File

@ -9,5 +9,7 @@ PUBLIC_HEADERS = samba3.h
OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
idmap.o winsdb.o samba3.o group.o \
registry.o secrets.o share_info.o
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBTDB NDR_SECURITY \
CREDENTIALS
# End SUBSYSTEM LIBSAMBA3
################################################

4
source4/libcli/auth/smbencrypt.c
View File

@ -63,7 +63,7 @@ BOOL SMBencrypt(const char *passwd, const uint8_t *c8, uint8_t p24[24])
* @param p16 return password hashed with md4, caller allocated 16 byte buffer
*/
BOOL E_md4hash(const char *passwd, uint8_t p16[16])
_PUBLIC_ BOOL E_md4hash(const char *passwd, uint8_t p16[16])
{
int len;
void *wpwd;
@ -91,7 +91,7 @@ BOOL E_md4hash(const char *passwd, uint8_t p16[16])
* @note p16 is filled in regardless
*/
BOOL E_deshash(const char *passwd, uint8_t p16[16])
_PUBLIC_ BOOL E_deshash(const char *passwd, uint8_t p16[16])
{
BOOL ret = True;
fstring dospwd;

5
source4/libcli/config.mk
View File

@ -54,7 +54,7 @@ OBJ_FILES = \
nbt/namerefresh.o \
nbt/namerelease.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
NDR_SECURITY samba-socket
NDR_SECURITY samba-socket LIBSAMBA-UTIL
[LIBRARY::swig_libcli_nbt]
LIBRARY_REALNAME = swig/_libcli_nbt.$(SHLIBEXT)
@ -77,6 +77,7 @@ DESCRIPTION = CLDAP client library
OBJ_FILES = cldap/cldap.o
PUBLIC_HEADERS = cldap/cldap.h
PUBLIC_DEPENDENCIES = LIBCLI_LDAP
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL ldb
[LIBRARY::LIBCLI_WREPL]
PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
@ -85,7 +86,7 @@ SO_VERSION = 0
DESCRIPTION = WINS Replication client library
OBJ_FILES = \
wrepl/winsrepl.o
PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS
PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS LIBPACKET
[SUBSYSTEM::LIBCLI_RESOLVE]
PRIVATE_PROTO_HEADER = resolve/proto.h

39
source4/librpc/config.mk
View File

@ -11,7 +11,8 @@ OBJ_FILES = \
ndr/ndr_basic.o \
ndr/ndr_string.o \
ndr/uuid.o
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL \
LIBSAMBA-CONFIG
# End SUBSYSTEM LIBNDR
################################################
@ -24,7 +25,7 @@ DESCRIPTION = NDR support for compressed subcontexts
PRIVATE_PROTO_HEADER = ndr/ndr_compression.h
OBJ_FILES = \
ndr/ndr_compression.o
PUBLIC_DEPENDENCIES = LIBCOMPRESSION LIBSAMBA-ERRORS
PUBLIC_DEPENDENCIES = LIBCOMPRESSION LIBSAMBA-ERRORS LIBNDR
# End SUBSYSTEM NDR_COMPRESSION
################################################
@ -61,7 +62,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_irpc.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT
[LIBRARY::NDR_DSBACKUP]
VERSION = 0.0.1
@ -82,7 +83,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
[SUBSYSTEM::NDR_ROT]
OBJ_FILES = gen_ndr/ndr_rot.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
[LIBRARY::NDR_LSA]
VERSION = 0.0.1
@ -95,7 +96,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dfs.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
[LIBRARY::NDR_FRSRPC]
VERSION = 0.0.1
@ -113,13 +114,13 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_drsuapi.o ndr/ndr_drsuapi.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY
PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR
[LIBRARY::NDR_DRSBLOBS]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_drsblobs.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI
[SUBSYSTEM::NDR_SASL_HELPERS]
OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
@ -154,7 +155,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_SECURITY
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_spoolss.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF
PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY
[SUBSYSTEM::NDR_SPOOLSS_BUF]
PRIVATE_PROTO_HEADER = ndr/ndr_spoolss_buf.h
@ -164,20 +165,20 @@ OBJ_FILES = ndr/ndr_spoolss_buf.o
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_wkssvc.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_SRVSVC NDR_MISC NDR_SECURITY
[LIBRARY::NDR_SRVSVC]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_srvsvc.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL
PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL NDR_SECURITY
[LIBRARY::NDR_SVCCTL]
VERSION = 0.0.1
PUBLIC_HEADERS = gen_ndr/svcctl.h
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_svcctl.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
[LIBRARY::NDR_ATSVC]
VERSION = 0.0.1
@ -189,13 +190,13 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_eventlog.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA
[LIBRARY::NDR_EPMAPPER]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_epmapper.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
[LIBRARY::NDR_DBGIDL]
VERSION = 0.0.1
@ -207,7 +208,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_dssetup.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
[LIBRARY::NDR_MSGSVC]
VERSION = 0.0.1
@ -225,7 +226,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_winreg.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN
PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN NDR_SECURITY NDR_MISC
[LIBRARY::NDR_INITSHUTDOWN]
VERSION = 0.0.1
@ -237,7 +238,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_mgmt.o
PUBLIC_DEPENDENCIES = LIBNDR
PUBLIC_DEPENDENCIES = LIBNDR NDR_DCERPC
[LIBRARY::NDR_PROTECTED_STORAGE]
VERSION = 0.0.1
@ -257,13 +258,13 @@ PUBLIC_DEPENDENCIES = LIBNDR
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_oxidresolver.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
[LIBRARY::NDR_REMACT]
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_remact.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
[LIBRARY::NDR_WZCSVC]
VERSION = 0.0.1
@ -484,7 +485,7 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
VERSION = 0.0.1
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_epmapper_c.o
PUBLIC_DEPENDENCIES = NDR_EPMAPPER
PUBLIC_DEPENDENCIES = dcerpc NDR_EPMAPPER
[LIBRARY::RPC_NDR_DBGIDL]
VERSION = 0.0.1

2
source4/librpc/rpc/dcerpc.c
View File

@ -1345,7 +1345,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
/*
receive the answer from a dcerpc_ndr_request_send()
*/
NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
_PUBLIC_ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
{
struct dcerpc_pipe *p = req->p;
NTSTATUS status;

3
source4/main.mk
View File

@ -1,4 +1,5 @@
all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries libraries modules
all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules
everything: all libraries
include dynconfig.mk
include heimdal_build/config.mk

1
source4/ntvfs/config.mk
View File

@ -90,6 +90,7 @@ OBJ_FILES = \
ntvfs_generic.o \
ntvfs_interface.o \
ntvfs_util.o
PRIVATE_DEPENDENCIES = auth
#
# End SUBSYSTEM NTVFS
################################################

1
source4/param/config.mk
View File

@ -21,6 +21,7 @@ DESCRIPTION = Services Configuration Library
PUBLIC_HEADERS = share.h
PUBLIC_PROTO_HEADER = share_proto.h
OBJ_FILES = share.o
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
# End SUBSYSTEM share
#################################

1
source4/smbd/process_model.mk
View File

@ -40,6 +40,7 @@ SO_VERSION = 0
PRIVATE_PROTO_HEADER = process_model_proto.h
OBJ_FILES = \
process_model.o
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG
#
# End SUBSYSTEM process_model
################################################

16
source4/torture/config.mk
View File

@ -7,10 +7,12 @@ PUBLIC_HEADERS = torture.h ui.h
PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \
torture.o \
subunit.o
subunit.o \
ui.o
PUBLIC_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL
LIBSAMBA-UTIL \
LIBTALLOC
[SUBSYSTEM::TORTURE_UTIL]
OBJ_FILES = util.o util_smb.o
@ -18,11 +20,6 @@ PRIVATE_DEPENDENCIES = LIBCLI_RAW
PUBLIC_PROTO_HEADER = util.h
PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
[SUBSYSTEM::TORTURE_UI]
OBJ_FILES = ui.o
PUBLIC_HEADERS = ui.h
PUBLIC_DEPENDENCIES = LIBTALLOC
#################################
# Start SUBSYSTEM TORTURE_BASIC
[MODULE::TORTURE_BASIC]
@ -277,7 +274,6 @@ PRIVATE_DEPENDENCIES = \
LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS \
TORTURE_UI \
dcerpc \
LIBCLI_SMB \
SMBREADLINE
@ -327,9 +323,9 @@ INSTALLDIR = BINDIR
OBJ_FILES = \
locktest.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-UTIL \
LIBCLI_SMB \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL
LIBSAMBA-CONFIG
MANPAGE = man/locktest.1
# End BINARY locktest
#################################

1
source4/torture/local/config.mk
View File

@ -38,7 +38,6 @@ PUBLIC_DEPENDENCIES = \
registry \
LIBCRYPTO \
POPT_CREDENTIALS \
TORTURE_UI \
TORTURE_AUTH \
TORTURE_UTIL
# End SUBSYSTEM TORTURE_LOCAL