r3946: Fix for bugid #2085 reported by Jason Mader <jason@ncac.gwu.edu>. Use consistent

enum type for Protocol extern.
Jeremy.
(This used to be commit 65dfae7ea45d4c9452b2a08efa09b01d870142f3)

diff --git a/source3/lib/util.c b/source3/lib/util.c
index feb03fe439513fed47e28362501db29b20936788..0d5c7d7f07b2229f2ab9ebc98773326f034e3c12 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/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/source3/param/loadparm.c b/source3/param/loadparm.c
index d5069e68363fda0474dd8dd1c76918074b92a06f..95f09c70e41b2355d8d8693e20cdc548eb0caddf 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/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/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 447073acd841e271b541f63ee875d5dc88e9a622..7da9d1281e1419a0a3ddca2ba0d9f8d6a20bb1c8 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/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/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 4c17396eb46ed7ae4db7e5489e17718d00d7d5be..8e62a0f8bf7faac17365a563a883e62c2c270f89 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/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/source3/smbd/reply.c b/source3/smbd/reply.c
index f8f6a14067495b24f330408749624444e0bcbedc..376ef24ff720da5bb8e3743735d41ded2f461e84 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/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/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 0122b662ebfabb7f0ed223b6919f879652ab5157..cff7d7371c611d7f9e08cd9c01941671089f58c5 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/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/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b877f7c518c6c9eaab83766f47d1811aacffaefd..81ffe1dbe025bc349481ab9b039ba3644a7bc78c 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/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;