[08/54] samba: Remove deprecated encrypt/null passwords options

Message ID 20201013160812.27754-8-michael.tremer@ipfire.org
State Accepted
Commit 2a4ac08fccd3f442dfb4a560e14074701ccff9a3
Headers show
Series [01/54] samba: Migrate configuration from Samba 3.6 to 4.x | expand

Commit Message

Michael Tremer Oct. 13, 2020, 4:07 p.m. UTC
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/samba/default.global | 2 --
 html/cgi-bin/samba.cgi      | 2 --
 src/paks/samba/install.sh   | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

Patch

diff --git a/config/samba/default.global b/config/samba/default.global
index 5a6a81729..30587e47a 100644
--- 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 981d5dcbe..fd43afd17 100644
--- 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 1cd6a1156..8b61298d5 100644
--- 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/"