From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 19 May 2009 08:45:38 +0000 (+0200)
Subject: s3:param: add PROTOCOL_SMB2
X-Git-Tag: tdb-1.1.5~459
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d23a1935e8180090474cbbba878d5bc5903579c6;p=thirdparty%2Fsamba.git

s3:param: add PROTOCOL_SMB2

metze
---

diff --git a/source3/include/smb.h b/source3/include/smb.h
index fed7468f3ee..abcd49451c2 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 da3da632600..6da792a8d7a 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"},