From: Jeremy Allison <jra@samba.org>
Date: Thu, 25 Nov 2004 00:07:01 +0000 (+0000)
Subject: r3946: Fix for bugid #2085 reported by Jason Mader <jason@ncac.gwu.edu>. Use consistent
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65dfae7ea45d4c9452b2a08efa09b01d870142f3;p=thirdparty%2Fsamba.git

r3946: Fix for bugid #2085 reported by Jason Mader <jason@ncac.gwu.edu>. Use consistent
enum type for Protocol extern.
Jeremy.
---

diff --git a/source/lib/util.c b/source/lib/util.c
index feb03fe4395..0d5c7d7f07b 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -49,7 +49,7 @@
 #endif /* WITH_NISPLUS_HOME */
 #endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */
 
-int Protocol = PROTOCOL_COREPLUS;
+enum protocol_types Protocol = PROTOCOL_COREPLUS;
 
 /* a default finfo structure to ensure all fields are sensible */
 file_info def_finfo = {-1,0,0,0,0,0,0,"",""};
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index d5069e68363..95f09c70e41 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -4304,7 +4304,7 @@ const char *lp_printcapname(void)
 
 BOOL lp_use_sendfile(int snum)
 {
-	extern int Protocol;
+	extern enum protocol_types Protocol;
 	/* Using sendfile blows the brains out of any DOS or Win9x TCP stack... JRA. */
 	if (Protocol < PROTOCOL_NT1) {
 		return False;
diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index 447073acd84..7da9d1281e1 100644
--- a/source/smbd/negprot.c
+++ b/source/smbd/negprot.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 
-extern int Protocol;
+extern enum protocol_types Protocol;
 extern int max_recv;
 BOOL global_encrypted_passwords_negotiated = False;
 BOOL global_spnego_negotiated = False;
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index 4c17396eb46..8e62a0f8bf7 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 
-extern int Protocol;
+extern enum protocol_types Protocol;
 extern int smb_read_error;
 extern int global_oplock_break;
 extern struct current_user current_user;
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index f8f6a140674..376ef24ff72 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 
 /* look in server.c for some explanation of these variables */
-extern int Protocol;
+extern enum protocol_types Protocol;
 extern int max_send;
 extern int max_recv;
 extern char magic_char;
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index 0122b662ebf..cff7d7371c6 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -633,7 +633,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 	static BOOL done_sesssetup = False;
 	extern BOOL global_encrypted_passwords_negotiated;
 	extern BOOL global_spnego_negotiated;
-	extern int Protocol;
+	extern enum protocol_types Protocol;
 	extern int max_send;
 
 	auth_usersupplied_info *user_info = NULL;
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index b877f7c518c..81ffe1dbe02 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 
-extern int Protocol;
+extern enum protocol_types Protocol;
 extern int smb_read_error;
 extern fstring local_machine;
 extern int global_oplock_break;