samba: make SMBv2 + SMBv1 the default, and add a SMBv2-only option

Author: RMerl

release/src/router/libdisk/write_smb_conf.c

@@ -378,10 +378,14 @@ int main(int argc, char *argv[])
 //	fprintf(fp, "preferred master = yes\n");
 	fprintf(fp, "load printers = no\n");
 	fprintf(fp, "printable = no\n");
-	if (nvram_get_int("smbd_enable_smb2"))
-		fprintf(fp, "max protocol = SMB2\n");
-	else
+// 0 - smb1, 1 = smb2, 2 = smb1 + smb2
+	if (nvram_get_int("smbd_protocol") == 0)
 		fprintf(fp, "max protocol = NT1\n");
+	 else
+		fprintf(fp, "max protocol = SMB2\n");
+	if (nvram_get_int("smbd_protocol") == 1)
+		fprintf(fp, "min protocol = SMB2\n");
+
 	fprintf(fp, "smb encrypt = disabled\n");
 	fprintf(fp, "min receivefile size = 16384\n");
 	fprintf(fp, "passdb backend = smbpasswd\n");

release/src/router/shared/defaults.c

@@ -1744,7 +1744,7 @@ struct nvram_tuple router_defaults[] = {
 //	{ "smbd_wgroup", "WORKGROUP" },
 	{ "smbd_wins", "0" },
 	{ "smbd_simpler_naming", "0" },
-	{ "smbd_enable_smb2", "0" },
+	{ "smbd_protocol", "2" },	/* 0 = SMB1, 1 = SMB2, 2 = SMB1+SMB2 */
 	{ "enable_samba_tuxera", "0" },
 
 #ifdef RTCONFIG_NFS

release/src/router/www/Advanced_AiDisk_samba.asp

@@ -794,8 +794,11 @@ function validForm(){
 				<tr>
 					<th>Enable SMB2 protocol (default: No)</th>
 					<td>
-						<input type="radio" name="smbd_enable_smb2" class="input" value="1" <% nvram_match_x("", "smbd_enable_smb2", "1", "checked"); %>><#checkbox_Yes#>
-						<input type="radio" name="smbd_enable_smb2" class="input" value="0" <% nvram_match_x("", "smbd_enable_smb2", "0", "checked"); %>><#checkbox_No#>
+						<select name="smbd_protocol" class="input_option">
+							<option class="content_input_fd" value="0" <% nvram_match("smbd_protocol", "0","selected"); %>>SMBv1</option>
+							<option class="content_input_fd" value="1" <% nvram_match("smbd_protocol", "1","selected"); %>>SMBv2</option>
+							<option class="content_input_fd" value="2" <% nvram_match("smbd_protocol", "2","selected"); %>>SMBv1 + SMBv2</option>
+						</select>
 					</td>
                                 </tr>
 				<tr>