svn commit: samba r3947 - in trunk/source: lib param smbd

[jra at samba.org]

Author: jra
Date: 2004-11-25 00:07:01 +0000 (Thu, 25 Nov 2004)
New Revision: 3947

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

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

Modified:
   trunk/source/lib/util.c
   trunk/source/param/loadparm.c
   trunk/source/smbd/negprot.c
   trunk/source/smbd/nttrans.c
   trunk/source/smbd/reply.c
   trunk/source/smbd/sesssetup.c
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/lib/util.c
===================================================================
--- trunk/source/lib/util.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/lib/util.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -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,"",""};

Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/param/loadparm.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -4323,7 +4323,7 @@
 
 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;

Modified: trunk/source/smbd/negprot.c
===================================================================
--- trunk/source/smbd/negprot.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/smbd/negprot.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -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;

Modified: trunk/source/smbd/nttrans.c
===================================================================
--- trunk/source/smbd/nttrans.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/smbd/nttrans.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -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;

Modified: trunk/source/smbd/reply.c
===================================================================
--- trunk/source/smbd/reply.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/smbd/reply.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -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;

Modified: trunk/source/smbd/sesssetup.c
===================================================================
--- trunk/source/smbd/sesssetup.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/smbd/sesssetup.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -633,7 +633,7 @@
 	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;

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2004-11-25 00:07:01 UTC (rev 3946)
+++ trunk/source/smbd/trans2.c	2004-11-25 00:07:01 UTC (rev 3947)
@@ -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;