svn commit: samba r15283 - in branches/SAMBA_3_0/source: . auth lib passdb sam smbd

[paulg at samba.org]

Author: paulg
Date: 2006-04-26 15:41:25 +0000 (Wed, 26 Apr 2006)
New Revision: 15283

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15283

Log:
Oh yeah. The build farm doesn't do much with head.  OK, here is the patch to SAMBA_3_0 to declare prototypes for the initialization functions.  These are the same changes I just made to head.  --paulg
Modified:
   branches/SAMBA_3_0/source/aclocal.m4
   branches/SAMBA_3_0/source/auth/auth.c
   branches/SAMBA_3_0/source/auth/auth_script.c
   branches/SAMBA_3_0/source/lib/iconv.c
   branches/SAMBA_3_0/source/passdb/pdb_interface.c
   branches/SAMBA_3_0/source/sam/idmap.c
   branches/SAMBA_3_0/source/smbd/server.c
   branches/SAMBA_3_0/source/smbd/vfs.c


Changeset:
Modified: branches/SAMBA_3_0/source/aclocal.m4
===================================================================
--- branches/SAMBA_3_0/source/aclocal.m4	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/aclocal.m4	2006-04-26 15:41:25 UTC (rev 15283)
@@ -57,6 +57,7 @@
 		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)
@@ -73,6 +74,7 @@
 	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])
 ])
 

Modified: branches/SAMBA_3_0/source/auth/auth.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/auth/auth.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -23,6 +23,8 @@
 #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);

Modified: branches/SAMBA_3_0/source/auth/auth_script.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth_script.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/auth/auth_script.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -140,16 +140,14 @@
 	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);
 }
-#else
+
 /* Define this to build shared. */
 NTSTATUS init_module(void)
 {
 	return smb_register_auth(AUTH_INTERFACE_VERSION, "script", auth_init_script);
 }
-#endif

Modified: branches/SAMBA_3_0/source/lib/iconv.c
===================================================================
--- branches/SAMBA_3_0/source/lib/iconv.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/lib/iconv.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -51,6 +51,8 @@
  * @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 *);

Modified: branches/SAMBA_3_0/source/passdb/pdb_interface.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_interface.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/passdb/pdb_interface.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -30,6 +30,8 @@
 
 static struct samu *csamuser = NULL;
 
+static_decl_pdb;
+
 static struct pdb_init_function_entry *backends = NULL;
 
 static void lazy_initialize_passdb(void)

Modified: branches/SAMBA_3_0/source/sam/idmap.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/sam/idmap.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -25,6 +25,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
+static_decl_idmap;
+
 struct idmap_function_entry {
 	const char *name;
 	struct idmap_methods *methods;

Modified: branches/SAMBA_3_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/server.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/smbd/server.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 
+static_decl_rpc;
+
 static int am_parent = 1;
 
 /* the last message the was processed */

Modified: branches/SAMBA_3_0/source/smbd/vfs.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/vfs.c	2006-04-26 14:56:27 UTC (rev 15282)
+++ branches/SAMBA_3_0/source/smbd/vfs.c	2006-04-26 15:41:25 UTC (rev 15283)
@@ -27,6 +27,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
+static_decl_vfs;
+
 struct vfs_init_function_entry {
 	char *name;
  	vfs_op_tuple *vfs_op_tuples;