summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-11-25 00:07:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:26 -0500
commit482f14871d568a24006fec5af68d722b5fa70a0d (patch)
treecd543ea38cad80a2ac07871d04aa7bc8aac7b617 /source3/smbd
parent314ec086f3a015f97cc5dafc3038b3bf782d92af (diff)
downloadsamba-482f14871d568a24006fec5af68d722b5fa70a0d.tar.gz
samba-482f14871d568a24006fec5af68d722b5fa70a0d.tar.bz2
samba-482f14871d568a24006fec5af68d722b5fa70a0d.zip
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)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/negprot.c2
-rw-r--r--source3/smbd/nttrans.c2
-rw-r--r--source3/smbd/reply.c2
-rw-r--r--source3/smbd/sesssetup.c2
-rw-r--r--source3/smbd/trans2.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 447073acd8..7da9d1281e 100644
--- 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 4c17396eb4..8e62a0f8bf 100644
--- 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 f8f6a14067..376ef24ff7 100644
--- 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 0122b662eb..cff7d7371c 100644
--- 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 b877f7c518..81ffe1dbe0 100644
--- 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;