r14571: More improvements on shared library support in Samba. Only ldb is left now...

(This used to be commit e71cca7f0cec62357eba6ba02d13f1c3f04edaa7)

7 files changed, 14 insertions, 12 deletions

diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 32a4f019f4..9772a819a7 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -551,7 +551,7 @@ NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_context *sam_c
 	return NT_STATUS_OK;
 }
 
-NTSTATUS sam_get_results_principal(struct ldb_context *sam_ctx,
+_PUBLIC_ NTSTATUS sam_get_results_principal(struct ldb_context *sam_ctx,
 				   TALLOC_CTX *mem_ctx, const char *principal,
 				   struct ldb_message ***msgs,
 				   struct ldb_message ***msgs_domain_ref)
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 7a95f8824f..a9134c35a2 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,11 +1,6 @@
-- saner names for some of the .pc files (reduce the amount of .pc files?)
+- saner names for some of the .pc files and libraries (reduce the amount of .pc files?)
 - plugin loading support in ldb
-- proper #include dependencies:
-  for each subsystem:
-  - include line in Makefile
-  - rule in Makefile
 - generate headermap.txt
-- fixed shared library install
 
 set of test scripts that check the code:
 - configure_check_unused.pl
diff --git a/source4/headermap.txt b/source4/headermap.txt
index adfcfe1015..467dfaf497 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -52,6 +52,8 @@ lib/tdr/tdr_proto.h: tdr/proto.h
 auth/credentials/credentials.h: credentials.h
 auth/credentials/credentials_proto.h: credentials/proto.h
 rpc_server/dcerpc_server.h: dcerpc_server.h
+rpc_server/common/common.h: dcerpc_server/common.h
+rpc_server/common/proto.h: dcerpc_server/common_proto.h
 rpc_server/dcerpc_server_proto.h: dcerpc_server/proto.h
 auth/auth.h: auth.h
 auth/auth_proto.h: auth/proto.h
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index e8cb84d5ff..2a2e6f12e6 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -18,7 +18,7 @@ OBJ_FILES = \
 		hdb-ldb.o \
 		pac-glue.o 
 REQUIRED_SUBSYSTEMS = \
-		ldb KERBEROS_LIB HEIMDAL_HDB 
+		ldb KERBEROS_LIB HEIMDAL_HDB auth_sam
 # End SUBSYSTEM KDC
 #######################
 
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index f7f0a81ea4..8acd9ac092 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -3,7 +3,8 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
-PRIVATE_PROTO_HEADER = common/proto.h
+PUBLIC_PROTO_HEADER = common/proto.h
+PUBLIC_HEADERS = common/common.h
 OBJ_FILES = \
 		common/server_info.o \
 		common/share_info.o
@@ -202,7 +203,9 @@ REQUIRED_SUBSYSTEMS = \
 
 ################################################
 # Start SUBSYSTEM dcerpc_server
-[SUBSYSTEM::dcerpc_server]
+[LIBRARY::dcerpc_server]
+VERSION = 0.0.1
+SO_VERSION = 0
 PUBLIC_HEADERS = dcerpc_server.h
 PUBLIC_PROTO_HEADER = dcerpc_server_proto.h
 OBJ_FILES = \
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 121474051e..f9eb9e92d7 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1356,7 +1356,7 @@ static NTSTATUS dcesrv_init(struct event_context *event_context,
 NTSTATUS server_service_rpc_init(void)
 {
 	init_module_fn static_init[] = STATIC_dcerpc_server_MODULES;
-	init_module_fn *shared_init = load_samba_modules(NULL, "rpc_server");
+	init_module_fn *shared_init = load_samba_modules(NULL, "dcerpc_server");
 
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index c9fb73d0d3..0d29e20c0f 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -34,7 +34,9 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 
 ################################################
 # Start SUBSYSTEM process_model
-[SUBSYSTEM::process_model]
+[LIBRARY::process_model]
+VERSION = 0.0.1
+SO_VERSION = 0
 PRIVATE_PROTO_HEADER = process_model_proto.h
 OBJ_FILES = \
 		process_model.o