diff options
| author | Jeremy Allison <jra@samba.org> | 2004-11-25 00:07:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:26 -0500 |
| commit | 482f14871d568a24006fec5af68d722b5fa70a0d (patch) | |
| tree | cd543ea38cad80a2ac07871d04aa7bc8aac7b617 | |
| parent | 314ec086f3a015f97cc5dafc3038b3bf782d92af (diff) | |
| download | samba-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)
| -rw-r--r-- | source3/lib/util.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 2 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 2 | ||||
| -rw-r--r-- | source3/smbd/sesssetup.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index feb03fe439..0d5c7d7f07 100644 --- 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 d5069e6836..95f09c70e4 100644 --- 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 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; |