r13899: Get the shared library build building again. Just compiles for now,

but modules don't work yet..
(Run LIBRARY_OUTPUT_TYPE=SHARED_LIBRARY MODULE_OUTPUT_TYPE=SHARED_LIBRARY ./config.status)
(This used to be commit ba74f24e422eda0379615f2ab39bef1e1e025ce7)

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index ca057cd5438760f1716663236df6da36577e35b9..05893b62de8ee8e3574aa7818427b4e7ccf00ce9 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,3 +1,4 @@
+- sonames
 - get rid of include/structs.h
 - add register function to smbtorture
 - install shared modules

diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
index 77586bcb74780106208e078390c72c48d93cf5b5..9a2bef094cbd108c4e03c3f85a8e6543849710df 100644 (file)
--- a/source4/cldap_server/config.mk
+++ b/source4/cldap_server/config.mk
@@ -7,6 +7,6 @@ OBJ_FILES = \
                cldap_server.o \
                netlogon.o
 REQUIRED_SUBSYSTEMS = \
-               LIBCLI_CLDAP
+               LIBCLI_CLDAP LIBNETIF
 # End SUBSYSTEM CLDAPD
 #######################

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 7bfe3262341a6a8bae35264a25c0c99567aea94f..5148f08a9b685f87c318893340bc48f5ec892bd5 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -148,7 +148,6 @@ struct smbcli_tree;
 
 struct smb2_tree;
 
-struct com_context;
 struct IUnknown;
 struct IUnknown_vtable;
 

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 598d5954b0ef3917c0ea594b266d8eb92cbfc0b8..b57de3f6ef5917c321d4384bda68c1048284e90c 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -57,4 +57,4 @@ OBJ_FILES = \
 [SUBSYSTEM::DB_WRAP]
 OBJ_FILES = db_wrap.o \
                gendb.o
-REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB
+REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB LDBSAMBA

diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
index 12f0481b0f866abebfc2301e202b2ae4a0113c76..6c668521a58a7856b279e456c75e709024c4d208 100644 (file)
--- a/source4/lib/com/config.mk
+++ b/source4/lib/com/config.mk
@@ -1,10 +1,12 @@
 [SUBSYSTEM::COM]
+PRIVATE_PROTO_HEADER = com_proto.h
 OBJ_FILES = \
                tables.o \
                rot.o \
                main.o
 
 [SUBSYSTEM::DCOM]
+PRIVATE_PROTO_HEADER = dcom_proto.h
 OBJ_FILES = \
                dcom/main.o \
                dcom/tables.o

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 3d40760d2c6b821ad18485bc2e580b4f7c75ab0c..adfb6cedb798138041ffc1b30d597712148f5b8e 100644 (file)
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -152,7 +152,7 @@ OBJ_FILES = \
                common/ldb_controls.o \
                common/qsort.o
 REQUIRED_SUBSYSTEMS = \
-               LIBREPLACE LIBTALLOC LDBSAMBA
+               LIBREPLACE LIBTALLOC 
 NOPROTO = YES
 MANPAGE = man/ldb.3
 PUBLIC_HEADERS = include/ldb.h
@@ -163,6 +163,7 @@ PUBLIC_HEADERS = include/ldb.h
 ################################################
 # Start SUBSYSTEM LDBSAMBA
 [SUBSYSTEM::LDBSAMBA]
+REQUIRED_SUBSYSTEMS = LIB_SECURITY SAMDB
 OBJ_FILES = \
                samba/ldif_handlers.o
 # End SUBSYSTEM LDBSAMBA

diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 11af99e69514d8ecf96ea7389fb6929a73dc129e..676d9ec3b37d699842bab76fe7390f92ad46591d 100644 (file)
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -85,7 +85,7 @@ _PUBLIC_ NTSTATUS registry_init(void)
 }
 
 /** Check whether a certain backend is present. */
-BOOL reg_has_backend(const char *backend)
+_PUBLIC_ BOOL reg_has_backend(const char *backend)
 {
        return reg_find_backend_entry(backend) != NULL?True:False;
 }
@@ -123,7 +123,7 @@ _PUBLIC_ int reg_list_predefs(TALLOC_CTX *mem_ctx, char ***predefs, uint32_t **h
 }
 
 /** Obtain name of specific hkey. */
-const char *reg_get_predef_name(uint32_t hkey)
+_PUBLIC_ const char *reg_get_predef_name(uint32_t hkey)
 {
        int i;
        for (i = 0; predef_names[i].name; i++) {
@@ -134,7 +134,7 @@ const char *reg_get_predef_name(uint32_t hkey)
 }
 
 /** Get predefined key by name. */
-WERROR reg_get_predefined_key_by_name(struct registry_context *ctx, const char *name, struct registry_key **key)
+_PUBLIC_ WERROR reg_get_predefined_key_by_name(struct registry_context *ctx, const char *name, struct registry_key **key)
 {
        int i;
        
@@ -148,7 +148,7 @@ WERROR reg_get_predefined_key_by_name(struct registry_context *ctx, const char *
 }
 
 /** Get predefined key by id. */
-WERROR reg_get_predefined_key(struct registry_context *ctx, uint32_t hkey, struct registry_key **key)
+_PUBLIC_ WERROR reg_get_predefined_key(struct registry_context *ctx, uint32_t hkey, struct registry_key **key)
 {
        WERROR ret = ctx->get_predefined_key(ctx, hkey, key);
 
@@ -283,7 +283,7 @@ _PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, const struct reg
 /** 
  * Get the number of subkeys.
  */
-WERROR reg_key_num_subkeys(const struct registry_key *key, uint32_t *count)
+_PUBLIC_ WERROR reg_key_num_subkeys(const struct registry_key *key, uint32_t *count)
 {
        if(!key) return WERR_INVALID_PARAM;
        
@@ -311,7 +311,7 @@ WERROR reg_key_num_subkeys(const struct registry_key *key, uint32_t *count)
 /**
  * Get the number of values of a key.
  */
-WERROR reg_key_num_values(const struct registry_key *key, uint32_t *count)
+_PUBLIC_ WERROR reg_key_num_values(const struct registry_key *key, uint32_t *count)
 {
        
        if(!key) return WERR_INVALID_PARAM;
@@ -340,7 +340,7 @@ WERROR reg_key_num_values(const struct registry_key *key, uint32_t *count)
 /**
  * Get subkey by index.
  */
-WERROR reg_key_get_subkey_by_index(TALLOC_CTX *mem_ctx, const struct registry_key *key, int idx, struct registry_key **subkey)
+_PUBLIC_ WERROR reg_key_get_subkey_by_index(TALLOC_CTX *mem_ctx, const struct registry_key *key, int idx, struct registry_key **subkey)
 {
        if(!key) return WERR_INVALID_PARAM;
 
@@ -399,7 +399,7 @@ WERROR reg_key_get_subkey_by_name(TALLOC_CTX *mem_ctx, const struct registry_key
 /**
  * Get value by name.
  */
-WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, const struct registry_key *key, const char *name, struct registry_value **val)
+_PUBLIC_ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, const struct registry_key *key, const char *name, struct registry_value **val)
 {
        int i;
        WERROR error = WERR_OK;
@@ -426,7 +426,7 @@ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, const struct registry_key
 /**
  * Delete a key.
  */
-WERROR reg_key_del(struct registry_key *parent, const char *name)
+_PUBLIC_ WERROR reg_key_del(struct registry_key *parent, const char *name)
 {
        WERROR error;
        if(!parent) return WERR_INVALID_PARAM;
@@ -444,7 +444,7 @@ WERROR reg_key_del(struct registry_key *parent, const char *name)
 /**
  * Add a key.
  */
-WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, const struct registry_key *parent, const char *name, uint32_t access_mask, struct security_descriptor *desc, struct registry_key **newkey)
+_PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, const struct registry_key *parent, const char *name, uint32_t access_mask, struct security_descriptor *desc, struct registry_key **newkey)
 {
        WERROR error;
        
@@ -485,7 +485,7 @@ _PUBLIC_ WERROR reg_val_set(struct registry_key *key, const char *value, uint32_
 /**
  * Get the security descriptor on a key.
  */
-WERROR reg_get_sec_desc(TALLOC_CTX *ctx, const struct registry_key *key, struct security_descriptor **secdesc)
+_PUBLIC_ WERROR reg_get_sec_desc(TALLOC_CTX *ctx, const struct registry_key *key, struct security_descriptor **secdesc)
 {
        /* A 'real' set function has preference */
        if (key->hive->functions->key_get_sec_desc) 
@@ -514,7 +514,7 @@ _PUBLIC_ WERROR reg_del_value(const struct registry_key *key, const char *valnam
 /**
  * Flush a key to disk.
  */
-WERROR reg_key_flush(const struct registry_key *key)
+_PUBLIC_ WERROR reg_key_flush(const struct registry_key *key)
 {
        if (!key) {
                return WERR_INVALID_PARAM;
@@ -531,7 +531,7 @@ WERROR reg_key_flush(const struct registry_key *key)
 /**
  * Get the maximum name and data lengths of the subkeys.
  */
-WERROR reg_key_subkeysizes(const struct registry_key *key, uint32_t *max_subkeylen, uint32_t *max_subkeysize)
+_PUBLIC_ WERROR reg_key_subkeysizes(const struct registry_key *key, uint32_t *max_subkeylen, uint32_t *max_subkeysize)
 {
        int i = 0; 
        struct registry_key *subkey;
@@ -559,7 +559,7 @@ WERROR reg_key_subkeysizes(const struct registry_key *key, uint32_t *max_subkeyl
 /**
  * Get the maximum name and data lengths of the values.
  */
-WERROR reg_key_valuesizes(const struct registry_key *key, uint32_t *max_valnamelen, uint32_t *max_valbufsize)
+_PUBLIC_ WERROR reg_key_valuesizes(const struct registry_key *key, uint32_t *max_valnamelen, uint32_t *max_valbufsize)
 {
        int i = 0; 
        struct registry_value *value;

diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index a35e55696b2fbdb2d2ce9daf1c9cfb96bd70e325..da18102d1fecd7325105064aa1960f9130a37900 100644 (file)
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -40,7 +40,7 @@ static const struct {
 };
 
 /** Return string description of registry value type */
-const char *str_regtype(int type)
+_PUBLIC_ const char *str_regtype(int type)
 {
        int i;
        for (i = 0; reg_value_types[i].name; i++) {
@@ -51,7 +51,7 @@ const char *str_regtype(int type)
        return "Unknown";
 }
 
-char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, DATA_BLOB *data)
+_PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, DATA_BLOB *data)
 { 
   char *ret = NULL;
 
@@ -85,12 +85,12 @@ char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, DATA_BLOB *data)
 }
 
 /** Generate a string that describes a registry value */
-char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value *val) 
+_PUBLIC_ char *reg_val_description(TALLOC_CTX *mem_ctx, struct registry_value *val) 
 {
        return talloc_asprintf(mem_ctx, "%s = %s : %s", val->name?val->name:"<No Name>", str_regtype(val->data_type), reg_val_data_string(mem_ctx, val->data_type, &val->data));
 }
 
-BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data)
+_PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data)
 {
        int i;
        *type = -1;

diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 8194fc1963be39a4fae79b09b97f13307d1a87d2..177ce5d77b11b4edb0bca49e7252b08eee466378 100644 (file)
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -77,6 +77,7 @@ OBJ_FILES = \
                common/brlock.o \
                common/opendb.o \
                common/sidmap.o
+REQUIRED_SUBSYSTEMS = NDR_OPENDB
 #
 # End SUBSYSTEM NTVFS
 ################################################

diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 6d63908330be22ac93346eaf35796d9a16e7173d..8092c04fb7f046e8689133089443571739b5f756 100644 (file)
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -86,7 +86,8 @@ REQUIRED_SUBSYSTEMS = \
                LIBBASIC \
                LIBCLI_NBT \
                LIBPOPT \
-               POPT_SAMBA
+               POPT_SAMBA \
+               LIBNETIF
 # End BINARY nmblookup
 #################################