samba: Remove deprecated encrypt/null passwords options

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

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

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'}

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/"