From 5c3a1d76ffc7b9e41846f7eaf6039f58184737a0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 1 May 2006 18:11:15 +0000 Subject: r15379: Fix shared library build's unresolved dependencies (This used to be commit 0fafa2e59566f8f892d7dfd7dd33d0100b96a780) --- source4/auth/auth_simple.c | 2 +- source4/auth/kerberos/kerberos_pac.c | 2 +- source4/build/m4/check_ld.m4 | 2 +- source4/build/smb_build/makefile.pm | 4 ++-- source4/kdc/config.mk | 2 +- source4/ldap_server/config.mk | 2 +- source4/libcli/raw/rawioctl.c | 2 +- source4/ntvfs/config.mk | 4 ++-- source4/ntvfs/posix/config.mk | 2 +- source4/rpc_server/common/share_info.c | 2 +- source4/rpc_server/config.mk | 3 ++- source4/rpc_server/dcerpc_server.c | 14 +++++++------- source4/rpc_server/handles.c | 4 ++-- 13 files changed, 23 insertions(+), 22 deletions(-) (limited to 'source4') diff --git a/source4/auth/auth_simple.c b/source4/auth/auth_simple.c index 7976560bf1..4448e227e7 100644 --- a/source4/auth/auth_simple.c +++ b/source4/auth/auth_simple.c @@ -26,7 +26,7 @@ #include "auth/auth.h" #include "lib/events/events.h" -NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, +_PUBLIC_ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, const char *nt4_domain, const char *nt4_username, const char *password, diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c index c0733297a4..0be0ebaad7 100644 --- a/source4/auth/kerberos/kerberos_pac.c +++ b/source4/auth/kerberos/kerberos_pac.c @@ -312,7 +312,7 @@ static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, return status; } - NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx, +_PUBLIC_ NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx, struct PAC_LOGON_INFO **logon_info, DATA_BLOB blob, krb5_context context, diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4 index b98c2dab3c..90e2a94c2f 100644 --- a/source4/build/m4/check_ld.m4 +++ b/source4/build/m4/check_ld.m4 @@ -138,7 +138,7 @@ case "$host_os" in *next2*) AC_DEFINE(NEXT2,1,[Whether the host os is NeXT v2]) AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; - *dgux*) AC_CHECK_PROG( ROFF, groff, [groff -etpsR -Tascii -man]) + *dgux*) AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; *sysv4*) AC_DEFINE(SYSV,1,[Whether this is a system V system]) diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 2e92ed0b1a..67f591de1d 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -392,7 +392,7 @@ sub Binary($$) # bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ - \@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\ + \@\$(CC) \$(DYNEXP) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ @@ -402,7 +402,7 @@ __EOD__ $self->output(<< "__EOD__" $installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ - \@\$(CC) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ + \@\$(CC) \$(DYNEXP) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk index f83cc59bb2..5632ddc795 100644 --- a/source4/kdc/config.mk +++ b/source4/kdc/config.mk @@ -21,7 +21,7 @@ OBJ_FILES = \ hdb-ldb.o \ pac-glue.o PUBLIC_DEPENDENCIES = \ - ldb auth_sam + ldb auth_sam KERBEROS # End SUBSYSTEM KDC ####################### diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk index f92cf92058..0ef8ced928 100644 --- a/source4/ldap_server/config.mk +++ b/source4/ldap_server/config.mk @@ -11,6 +11,6 @@ OBJ_FILES = \ ldap_backend.o \ ldap_bind.o PUBLIC_DEPENDENCIES = \ - LIBCLI_LDAP SAMDB process_model + LIBCLI_LDAP SAMDB process_model auth # End SUBSYSTEM SMB ####################### diff --git a/source4/libcli/raw/rawioctl.c b/source4/libcli/raw/rawioctl.c index d4a299fe02..49237fe9da 100644 --- a/source4/libcli/raw/rawioctl.c +++ b/source4/libcli/raw/rawioctl.c @@ -147,7 +147,7 @@ NTSTATUS smb_raw_ioctl_recv(struct smbcli_request *req, /* send a raw ioctl - sync interface */ -NTSTATUS smb_raw_ioctl(struct smbcli_tree *tree, +_PUBLIC_ NTSTATUS smb_raw_ioctl(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx, union smb_ioctl *parms) { struct smbcli_request *req; diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk index a7194b049d..c40e103082 100644 --- a/source4/ntvfs/config.mk +++ b/source4/ntvfs/config.mk @@ -12,7 +12,7 @@ SUBSYSTEM = ntvfs OBJ_FILES = \ cifs/vfs_cifs.o PUBLIC_DEPENDENCIES = \ - LIBCLI_SMB + LIBCLI_SMB LIBCLI_RAW # End MODULE ntvfs_cifs ################################################ @@ -60,7 +60,7 @@ OBJ_FILES = \ ipc/vfs_ipc.o \ ipc/ipc_rap.o \ ipc/rap_server.o -PUBLIC_DEPENDENCIES = dcerpc_server +PUBLIC_DEPENDENCIES = dcerpc_server DCERPC_COMMON # End MODULE ntvfs_ipc ################################################ diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index 32ede78cc9..dde49a5531 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -32,6 +32,6 @@ OBJ_FILES = \ pvfs_notify.o \ xattr_system.o \ xattr_tdb.o -PUBLIC_DEPENDENCIES = NDR_XATTR XATTR BLKID ntvfs_common +PUBLIC_DEPENDENCIES = NDR_XATTR XATTR BLKID ntvfs_common MESSAGING # End MODULE ntvfs_posix ################################################ diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c index cf6d2f2270..285218bad1 100644 --- a/source4/rpc_server/common/share_info.c +++ b/source4/rpc_server/common/share_info.c @@ -35,7 +35,7 @@ uint32_t dcesrv_common_get_count_of_shares(TALLOC_CTX *mem_ctx, struct dcesrv_co return lp_numservices(); } -const char *dcesrv_common_get_share_name(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum) +_PUBLIC_ const char *dcesrv_common_get_share_name(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx, int snum) { return talloc_strdup(mem_ctx, lp_servicename(snum)); } diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index 86b12cdb7b..63fb1cefcc 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -156,7 +156,8 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ SAMDB \ DCERPC_COMMON \ - NDR_LSA + NDR_LSA \ + LIBCLI_AUTH # End MODULE dcerpc_lsa ################################################ diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index d5012c0609..b56e397cf0 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -149,7 +149,7 @@ static struct dcesrv_call_state *dcesrv_find_call(struct dcesrv_connection *dce_ /* register an interface on an endpoint */ -NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx, +_PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx, const char *ep_name, const struct dcesrv_interface *iface, const struct security_descriptor *sd) @@ -256,7 +256,7 @@ NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *p, /* fetch the user session key - may be default (above) or the SMB session key */ -NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p, +_PUBLIC_ NTSTATUS dcesrv_fetch_session_key(struct dcesrv_connection *p, DATA_BLOB *session_key) { return p->auth_state.session_key(p, session_key); @@ -334,7 +334,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx, /* search and connect to a dcerpc endpoint */ -NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx, +_PUBLIC_ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx, TALLOC_CTX *mem_ctx, const struct dcerpc_binding *ep_description, struct auth_session_info *session_info, @@ -803,7 +803,7 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call) return dcesrv_reply(call); } -NTSTATUS dcesrv_reply(struct dcesrv_call_state *call) +_PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call) { struct ndr_push *push; NTSTATUS status; @@ -1087,7 +1087,7 @@ NTSTATUS dcesrv_input_process(struct dcesrv_connection *dce_conn) provide some input to a dcerpc endpoint server. This passes data from a dcerpc client into the server */ -NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data) +_PUBLIC_ NTSTATUS dcesrv_input(struct dcesrv_connection *dce_conn, const DATA_BLOB *data) { NTSTATUS status; @@ -1205,7 +1205,7 @@ static NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, const char **endpoint_s /* initialise the dcerpc server context for ncacn_np based services */ -NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **_dce_ctx) +_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **_dce_ctx) { NTSTATUS status; struct dcesrv_context *dce_ctx; @@ -1232,7 +1232,7 @@ static int num_ep_servers; The 'type' is used to specify whether this is for a disk, printer or IPC$ share */ -NTSTATUS dcerpc_register_ep_server(const void *_ep_server) +_PUBLIC_ NTSTATUS dcerpc_register_ep_server(const void *_ep_server) { const struct dcesrv_endpoint_server *ep_server = _ep_server; diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c index 3cc9e8a425..6a7bf88310 100644 --- a/source4/rpc_server/handles.c +++ b/source4/rpc_server/handles.c @@ -39,7 +39,7 @@ static int dcesrv_handle_destructor(void *ptr) /* allocate a new rpc handle */ -struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *context, +_PUBLIC_ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *context, uint8_t handle_type) { struct dcesrv_handle *h; @@ -65,7 +65,7 @@ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection_context *contex find an internal handle given a wire handle. If the wire handle is NULL then allocate a new handle */ -struct dcesrv_handle *dcesrv_handle_fetch(struct dcesrv_connection_context *context, +_PUBLIC_ struct dcesrv_handle *dcesrv_handle_fetch(struct dcesrv_connection_context *context, struct policy_handle *p, uint8_t handle_type) { -- cgit