samba: Remove deprecated encrypt/null passwords options

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/samba/default.global b/config/samba/default.global
index 5a6a81729e3307c4eabc334ca702fa8d29f2b581..30587e47a51fb6b1d934cb90f08443262e7f8891 100644 (file)
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -16,10 +16,8 @@ smb ports = 445 139
 unix charset = CP850
 
 security = user
-encrypt passwords = yes
 guest account = samba
 unix password sync = false
-null passwords = yes
 
 bind interfaces only = true
 interfaces =  green0 127.0.0.1

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 981d5dcbea88eb3fc1be5f7ea166caf99562bf10..fd43afd17dcabd06d9c7b792a8963592643fe5bb 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -294,10 +294,8 @@ dos charset = $sambasettings{'DOSCHARSET'}
 unix charset = $sambasettings{'UNIXCHARSET'}
 
 security = $sambasettings{'SECURITY'}
-encrypt passwords = yes
 guest account = $sambasettings{'GUESTACCOUNT'}
 unix password sync = $sambasettings{'PASSWORDSYNC'}
-null passwords = yes
 
 bind interfaces only = true
 interfaces = $sambasettings{'INTERFACES'}

diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index 1cd6a115695f1a131213a864c3819e348e49b471..8b61298d557b51079eaddf1751a2bb3d83a975ca 100644 (file)
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -36,6 +36,8 @@ restore_backup ${NAME}
 # Migrate configuration from Samba 3.6 to 4.x
 sed -i /var/ipfire/samba/smb.conf \
        -e "/^display charset =/d" \
+       -e "/^encrypt passwords =/d" \
+       -e "/^null passwords =/d" \
        -e "/^socket options =/d" \
        -e "/^syslog/d" \
        -e "s/^security = share$/security = user/"