summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-05-19 10:45:38 +0200
committerStefan Metzmacher <metze@samba.org>2009-05-20 15:42:19 +0200
commitd23a1935e8180090474cbbba878d5bc5903579c6 (patch)
tree6332050203a51cfd6d0623ce84454d09332b986b
parentd59f84d738401f3ab8ec34aa053af05670a58a89 (diff)
downloadsamba-d23a1935e8180090474cbbba878d5bc5903579c6.tar.gz
samba-d23a1935e8180090474cbbba878d5bc5903579c6.tar.bz2
samba-d23a1935e8180090474cbbba878d5bc5903579c6.zip
s3:param: add PROTOCOL_SMB2
metze
-rw-r--r--source3/include/smb.h10
-rw-r--r--source3/param/loadparm.c1
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index fed7468f3e..abcd49451c 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1518,7 +1518,15 @@ char *strdup(char *s);
/* protocol types. It assumes that higher protocols include lower protocols
as subsets */
-enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANMAN1,PROTOCOL_LANMAN2,PROTOCOL_NT1};
+enum protocol_types {
+ PROTOCOL_NONE,
+ PROTOCOL_CORE,
+ PROTOCOL_COREPLUS,
+ PROTOCOL_LANMAN1,
+ PROTOCOL_LANMAN2,
+ PROTOCOL_NT1,
+ PROTOCOL_SMB2
+};
/* security levels */
enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN,SEC_ADS};
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index da3da63260..6da792a8d7 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -685,6 +685,7 @@ static void *lp_local_ptr(struct service *service, void *ptr);
static void add_to_file_list(const char *fname, const char *subfname);
static const struct enum_list enum_protocol[] = {
+ {PROTOCOL_SMB2, "SMB2"},
{PROTOCOL_NT1, "NT1"},
{PROTOCOL_LANMAN2, "LANMAN2"},
{PROTOCOL_LANMAN1, "LANMAN1"},