- As discussed at IPFire conf call on 7th Oct - disable cups for the samba configure stage - Update of rootfiles - Update of samba.cgi to remove the printing of a printer share into the samba configuration file. - Tested out on vm system. Installed samba with only avahi, perl-Parse-Yapp, perl-JSON and wsdd as dependencies. Installed without any problems. Existing share was able to be accessed without any problems and a new share was created and was also able to be accessed without problems. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/riscv64/samba | 3 +-- config/rootfiles/packages/x86_64/samba | 1 - html/cgi-bin/samba.cgi | 11 +---------- lfs/samba | 6 +++--- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index cb7407504..b18c92f38 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -998,7 +998,6 @@ usr/libexec/samba/rpcd_spoolss usr/libexec/samba/rpcd_winreg usr/libexec/samba/samba-bgqd usr/libexec/samba/samba-dcerpcd -usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd usr/sbin/samba-change-password diff --git a/config/rootfiles/packages/riscv64/samba b/config/rootfiles/packages/riscv64/samba index b530ea2b2..e040073fb 100644 --- a/config/rootfiles/packages/riscv64/samba +++ b/config/rootfiles/packages/riscv64/samba @@ -998,7 +998,6 @@ usr/libexec/samba/rpcd_spoolss usr/libexec/samba/rpcd_winreg usr/libexec/samba/samba-bgqd usr/libexec/samba/samba-dcerpcd -usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd usr/sbin/samba-change-password @@ -1024,4 +1023,4 @@ var/log/samba var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu -usr/local/bin/sambactrl \ No newline at end of file +usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index e720457a3..dc0e2bdc4 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -998,7 +998,6 @@ usr/libexec/samba/rpcd_spoolss usr/libexec/samba/rpcd_winreg usr/libexec/samba/samba-bgqd usr/libexec/samba/samba-dcerpcd -usr/libexec/samba/smbspool_krb5_wrapper usr/sbin/eventlogadm usr/sbin/nmbd usr/sbin/samba-change-password diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 5736ef0b8..e67f22541 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2013 IPFire Team # +# Copyright (C) 2005-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -785,15 +785,6 @@ if (-e "${General::swroot}/samba/smb.conf.local") { close(LOCAL); } -print FILE <