From 4368bf87bb2275b36b65dd7a5cfbfa707d0fd479 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Tue, 3 Jan 2017 17:14:11 -0800 Subject: [PATCH] Add field for CIFS version https://virtualmin.com/node/45199 --- mount/lang/en | 2 ++ mount/linux-lib.pl | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/mount/lang/en b/mount/lang/en index f889166ce..81060e2e4 100644 --- a/mount/lang/en +++ b/mount/lang/en @@ -390,6 +390,8 @@ linux_iocharset=IO character set linux_ecodepage=Missing or invalid code page linux_eiocharset=Missing or invalid IO character set linux_nounix=Disable CIFS Unix extensions? +linux_cvers=CIFS version +linux_ecvers=CIFS version must be a number log_mount=Mounted $3 log_mount_l=Mounted $2 $1 on $3 diff --git a/mount/linux-lib.pl b/mount/linux-lib.pl index f65d1d283..bc9eb57df 100755 --- a/mount/linux-lib.pl +++ b/mount/linux-lib.pl @@ -1558,6 +1558,10 @@ elsif ($type eq $smbfs_fs || $type eq "cifs") { print &ui_table_row($text{'linux_nounix'}, &ui_yesno_radio("smbfs_nounix", defined($options{"nounix"}))); + + print &ui_table_row($text{'linux_cvers'}, + &ui_opt_textbox("smbfs_vers", $options{"vers"}, + 5, $text{'linux_auto'})); } } elsif ($type eq "reiserfs") { @@ -2123,6 +2127,13 @@ elsif ($_[0] eq $smbfs_fs || $_[0] eq "cifs") { delete($options{'nounix'}); if ($in{'smbfs_nounix'}) { $options{'nounix'} = ''; } + + delete($options{'vers'}); + if (!$in{'smbfs_vers_def'}) { + $in{'smbfs_vers'} =~ /^[0-9\.]+$/ || + &error($text{'linux_ecvers'}); + $options{'vers'} = $in{'smbfs_vers'}; + } } } elsif ($_[0] eq "reiserfs") {