r15283: Oh yeah. The build farm doesn't do much with head. OK, here is the patch...

diff --git a/source/aclocal.m4 b/source/aclocal.m4
index 86c43f80dc0b5dcde72f895de11677538280091f..cb8c7f00e213c48939699e59ad7a45b3ee587854 100644 (file)
--- a/source/aclocal.m4
+++ b/source/aclocal.m4
@@ -57,6 +57,7 @@ AC_DEFUN(SMB_MODULE,
                string_shared_modules="$string_shared_modules $1"
        elif test x"$DEST" = xSTATIC; then
                [init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z])  $1_init();"
                string_shared_modules="$string_shared_modules $1"
        elif test x"$DEST" = xSTATIC; then
                [init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z])  $1_init();"

+               [decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init();"

                string_static_modules="$string_static_modules $1"
                $4_STATIC="$$4_STATIC $2"
                AC_SUBST($4_STATIC)
                string_static_modules="$string_static_modules $1"
                $4_STATIC="$$4_STATIC $2"
                AC_SUBST($4_STATIC)


@@ -73,6 +74,7 @@ AC_DEFUN(SMB_SUBSYSTEM,
        AC_SUBST($1_STATIC)
        AC_SUBST($1_MODULES)
        AC_DEFINE_UNQUOTED([static_init_]translit([$1], [A-Z], [a-z]), [{$init_static_modules_]translit([$1], [A-Z], [a-z])[}], [Static init functions])
        AC_SUBST($1_STATIC)
        AC_SUBST($1_MODULES)
        AC_DEFINE_UNQUOTED([static_init_]translit([$1], [A-Z], [a-z]), [{$init_static_modules_]translit([$1], [A-Z], [a-z])[}], [Static init functions])

+       AC_DEFINE_UNQUOTED([static_decl_]translit([$1], [A-Z], [a-z]), [$decl_static_modules_]translit([$1], [A-Z], [a-z]), [Decl of Static init functions])

        ifelse([$2], , :, [rm -f $2])
 ])
 
        ifelse([$2], , :, [rm -f $2])
 ])
 

diff --git a/source/auth/auth.c b/source/auth/auth.c
index 5329e736ff14927517c4b4a90b655370342c2678..139ba5482b748226d0f6b54acef0b1c6d0a60c51 100644 (file)
--- a/source/auth/auth.c
+++ b/source/auth/auth.c
@@ -23,6 +23,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 

+static_decl_auth;
+

 static struct auth_init_function_entry *backends = NULL;
 
 static struct auth_init_function_entry *auth_find_backend_entry(const char *name);
 static struct auth_init_function_entry *backends = NULL;
 
 static struct auth_init_function_entry *auth_find_backend_entry(const char *name);

diff --git a/source/auth/auth_script.c b/source/auth/auth_script.c
index 1bc33ec59e7915ae3c9c107101c211764d5c1a66..05bae44865fe7b8fe5d865a08cddb3093fd7253e 100644 (file)
--- a/source/auth/auth_script.c
+++ b/source/auth/auth_script.c
@@ -140,16 +140,14 @@ static NTSTATUS auth_init_script(struct auth_context *auth_context, const char *
        return NT_STATUS_OK;
 }
 
        return NT_STATUS_OK;
 }
 

-#if 0

 /* Define this to build static. */
 NTSTATUS auth_script_init(void)
 {
        return smb_register_auth(AUTH_INTERFACE_VERSION, "script", auth_init_script);
 }
 /* Define this to build static. */
 NTSTATUS auth_script_init(void)
 {
        return smb_register_auth(AUTH_INTERFACE_VERSION, "script", auth_init_script);
 }

-#else
+

 /* Define this to build shared. */
 NTSTATUS init_module(void)
 {
        return smb_register_auth(AUTH_INTERFACE_VERSION, "script", auth_init_script);
 }
 /* Define this to build shared. */
 NTSTATUS init_module(void)
 {
        return smb_register_auth(AUTH_INTERFACE_VERSION, "script", auth_init_script);
 }

-#endif

diff --git a/source/lib/iconv.c b/source/lib/iconv.c
index f738f45efa9e8bea1743d2fd1ce4e8e0b308ad2f..c96243633fbaf6b2049747f27743d1389a63c4fd 100644 (file)
--- a/source/lib/iconv.c
+++ b/source/lib/iconv.c
@@ -51,6 +51,8 @@
  * @sa Samba Developers Guide
  **/
 
  * @sa Samba Developers Guide
  **/
 

+static_decl_charset;
+

 static size_t ascii_pull(void *,const char **, size_t *, char **, size_t *);
 static size_t ascii_push(void *,const char **, size_t *, char **, size_t *);
 static size_t latin1_push(void *,const char **, size_t *, char **, size_t *);
 static size_t ascii_pull(void *,const char **, size_t *, char **, size_t *);
 static size_t ascii_push(void *,const char **, size_t *, char **, size_t *);
 static size_t latin1_push(void *,const char **, size_t *, char **, size_t *);

diff --git a/source/passdb/pdb_interface.c b/source/passdb/pdb_interface.c
index b3522e33a7f5a39a46fd96f78eddbc6652cf3185..393b60516cc1c808b4f27007d19e74ca0e58d3f0 100644 (file)
--- a/source/passdb/pdb_interface.c
+++ b/source/passdb/pdb_interface.c
@@ -30,6 +30,8 @@
 
 static struct samu *csamuser = NULL;
 
 
 static struct samu *csamuser = NULL;
 

+static_decl_pdb;
+

 static struct pdb_init_function_entry *backends = NULL;
 
 static void lazy_initialize_passdb(void)
 static struct pdb_init_function_entry *backends = NULL;
 
 static void lazy_initialize_passdb(void)

diff --git a/source/sam/idmap.c b/source/sam/idmap.c
index aac8b70013ac3bf424c8dbf7b5fd243b44fa059c..aa5b923d3ddcb815b6f7dcb2b9a6fe7db521ff5e 100644 (file)
--- a/source/sam/idmap.c
+++ b/source/sam/idmap.c
@@ -25,6 +25,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 

+static_decl_idmap;
+

 struct idmap_function_entry {
        const char *name;
        struct idmap_methods *methods;
 struct idmap_function_entry {
        const char *name;
        struct idmap_methods *methods;

diff --git a/source/smbd/server.c b/source/smbd/server.c
index b76ade957c2aee43d12fcd72b67609c88553e541..d16579f24a8d7a124798c7a56d4ac7dfeaf377ec 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 
 
 #include "includes.h"
 

+static_decl_rpc;
+

 static int am_parent = 1;
 
 /* the last message the was processed */
 static int am_parent = 1;
 
 /* the last message the was processed */

diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c
index 9a6327b33b5321a85f2c919d11bb4f975fec5496..2c9403a079092734c535a9596943d4a6537a1b14 100644 (file)
--- a/source/smbd/vfs.c
+++ b/source/smbd/vfs.c
@@ -27,6 +27,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 

+static_decl_vfs;
+

 struct vfs_init_function_entry {
        char *name;
        vfs_op_tuple *vfs_op_tuples;
 struct vfs_init_function_entry {
        char *name;
        vfs_op_tuple *vfs_op_tuples;