r6225: get rid of warnings from my compiler about nested externs

(This used to be commit efea76ac71412f8622cd233912309e91b9ea52da)

4 files changed, 11 insertions, 8 deletions

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 615a8d73b0..af30e900ac 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -21,6 +21,8 @@
 
 #include "includes.h"
 
+extern struct current_user current_user;
+
 fstring local_machine="";
 fstring remote_arch="UNKNOWN";
 userdom_struct current_user_info;
@@ -800,7 +802,6 @@ char *alloc_sub_conn(connection_struct *conn, const char *str)
 
 void standard_sub_snum(int snum, char *str, size_t len)
 {
-	extern struct current_user current_user;
 	static uid_t cached_uid = -1;
 	static fstring cached_user;
 	/* calling uidtoname() on every substitute would be too expensive, so
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b76d561ccd..d244e390d2 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -23,6 +23,11 @@
 
 #include "includes.h"
 
+extern fstring local_machine;
+extern char *global_clobber_region_function;
+extern unsigned int global_clobber_region_line;
+extern fstring remote_arch;
+
 /* Max allowable allococation - 256mb - 0x10000000 */
 #define MAX_ALLOC_SIZE (1024*1024*256)
 
@@ -230,7 +235,6 @@ BOOL set_netbios_aliases(const char **str_array)
 
 BOOL init_names(void)
 {
-	extern fstring local_machine;
 	char *p;
 	int n;
 
@@ -1453,8 +1457,6 @@ void smb_panic2(const char *why, BOOL decrement_pid_count )
 
 #ifdef DEVELOPER
 	{
-		extern char *global_clobber_region_function;
-		extern unsigned int global_clobber_region_line;
 
 		if (global_clobber_region_function) {
 			DEBUG(0,("smb_panic: clobber_region() last called from [%s(%u)]\n",
@@ -1919,7 +1921,6 @@ void ra_lanman_string( const char *native_lanman )
 
 void set_remote_arch(enum remote_arch_types type)
 {
-	extern fstring remote_arch;
 	ra_type = type;
 	switch( type ) {
 	case RA_WFWG:
diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index cb0f46e2f9..362504e46b 100644
--- a/source3/lib/util_seaccess.c
+++ b/source3/lib/util_seaccess.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 
 extern DOM_SID global_sid_Builtin;
+extern DOM_SID global_sid_World;
+extern NT_USER_TOKEN anonymous_token;
 
 /*********************************************************************************
  Check an ACE against a SID.  We return the remaining needed permission
@@ -214,7 +216,6 @@ BOOL se_access_check(const SEC_DESC *sd, const NT_USER_TOKEN *token,
 		     uint32 acc_desired, uint32 *acc_granted, 
 		     NTSTATUS *status)
 {
-	extern NT_USER_TOKEN anonymous_token;
 	size_t i;
 	SEC_ACL *the_acl;
 	fstring sid_str;
@@ -323,7 +324,6 @@ BOOL se_access_check(const SEC_DESC *sd, const NT_USER_TOKEN *token,
 
 NTSTATUS samr_make_sam_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size)
 {
-	extern DOM_SID global_sid_World;
 	DOM_SID adm_sid;
 	DOM_SID act_sid;
 
diff --git a/source3/lib/wins_srv.c b/source3/lib/wins_srv.c
index b82e04e13c..c139f427ca 100644
--- a/source3/lib/wins_srv.c
+++ b/source3/lib/wins_srv.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 
+extern struct in_addr loopback_ip;
+
 /*
   This is pretty much a complete rewrite of the earlier code. The main
   aim of the rewrite is to add support for having multiple wins server
@@ -280,7 +282,6 @@ struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip)
 
 	/* if we are a wins server then we always just talk to ourselves */
 	if (lp_wins_support()) {
-		extern struct in_addr loopback_ip;
 		return loopback_ip;
 	}