samba: Remove reset options

This only requires that we have to change multiple files with
the same settings.

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

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index a707895d99a8da2ab288f6ac2ead162f9e7ecd26..3bef0733e4caa605ff3061213324bb1c1d92dc3e 100644 (file)
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -793,11 +793,6 @@ usr/sbin/smbd
 usr/sbin/winbindd
 var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
 var/ipfire/samba/global
 var/ipfire/samba/pdc
 var/ipfire/samba/printer

diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba
index 885d9e15456ee9f0ad42bd24f8a48bfd21377bc9..f58d4fc2fb850082733b1a345e9a3780cddb71fb 100644 (file)
--- a/config/rootfiles/packages/armv5tel/samba
+++ b/config/rootfiles/packages/armv5tel/samba
@@ -793,11 +793,6 @@ usr/sbin/smbd
 usr/sbin/winbindd
 var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
 var/ipfire/samba/global
 var/ipfire/samba/pdc
 var/ipfire/samba/printer

diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index e942471e2a2d619dd086c6e804f94676eb86d8d5..e74caeea06a0cc59af84cf072eb25c6e46e46d35 100644 (file)
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -793,11 +793,6 @@ usr/sbin/smbd
 usr/sbin/winbindd
 var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
 var/ipfire/samba/global
 var/ipfire/samba/pdc
 var/ipfire/samba/printer

diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index 1c31256db12c943d7144bd949af37285afcd4973..c91252a3050f8f2368d4b7fe53213a56a936afc3 100644 (file)
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -793,11 +793,6 @@ usr/sbin/smbd
 usr/sbin/winbindd
 var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
-var/ipfire/samba/default.global
-var/ipfire/samba/default.pdc
-var/ipfire/samba/default.printer
-var/ipfire/samba/default.settings
-var/ipfire/samba/default.shares
 var/ipfire/samba/global
 var/ipfire/samba/pdc
 var/ipfire/samba/printer

diff --git a/config/samba/default.global b/config/samba/global
similarity index 100%
rename from config/samba/default.global
rename to config/samba/global

diff --git a/config/samba/default.pdc b/config/samba/pdc
similarity index 100%
rename from config/samba/default.pdc
rename to config/samba/pdc

diff --git a/config/samba/default.printer b/config/samba/printer
similarity index 100%
rename from config/samba/default.printer
rename to config/samba/printer

diff --git a/config/samba/default.settings b/config/samba/settings
similarity index 100%
rename from config/samba/default.settings
rename to config/samba/settings

diff --git a/config/samba/default.shares b/config/samba/shares
similarity index 100%
rename from config/samba/default.shares
rename to config/samba/shares

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 0510f0f24ecd72c0f2d78fadc5ac453db0a19f75..31751ff4c8b7b0becf413ab003d429deb4ae6c10 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -128,85 +128,10 @@ if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl s
 if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");refreshpage();}
 if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");refreshpage();}
 if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'globalresetyes')
-       {
-       system("/usr/local/bin/sambactrl smbglobalreset");
-       $sambasettings{'WORKGRP'} = 'homeip.net';
-       $sambasettings{'INTERFACES'} = '';
-       $sambasettings{'SECURITY'} = 'user';
-       $sambasettings{'OSLEVEL'} = '65';
-       $sambasettings{'GREEN'} = 'on';
-       $sambasettings{'BLUE'} = 'off';
-       $sambasettings{'ORANGE'} = 'off';
-       $sambasettings{'VPN'} = 'off';
-       $sambasettings{'REMOTEANNOUNCE'} = '';
-       $sambasettings{'REMOTESYNC'} = '';
-       $sambasettings{'PASSWORDSYNC'} = 'off';
-       $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
-       $sambasettings{'GUESTACCOUNT'} = 'samba';
-       $sambasettings{'MAPTOGUEST'} = 'Bad User';
-### Samba CUPS Variablen
-       $sambasettings{'LOADPRINTERS'} = 'Yes';
-       $sambasettings{'PRINTING'} = 'cups';
-       $sambasettings{'PRINTCAPNAME'} = 'cups';
-       $sambasettings{'PRINTERNAME'} = 'Printer';
-### Values that have to be initialized
-       $sambasettings{'WIDELINKS'} = 'on';
-       $sambasettings{'UNIXEXTENSION'} = 'off';
-       $sambasettings{'ACTION'} = '';
-       $sambasettings{'LOCALMASTER'} = 'off';
-       $sambasettings{'DOMAINMASTER'} = 'off';
-       $sambasettings{'PREFERREDMASTER'} = 'off';
-       $sambasettings{'WIDELINKS'} = 'on';
-       $sambasettings{'UNIXEXTENSION'} = 'off';
-       $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
-       system("/usr/local/bin/sambactrl smbreload");
-       refreshpage();
-       }
-
 if ($sambasettings{'ACTION'} eq 'join') {
        $message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
 }
 
-############################################################################################################################
-################################################ Sicherheitsabfrage für den Reset ##########################################
-
-if ($sambasettings{'ACTION'} eq 'globalreset')
-       {
-       print <<END
-       <br />
-       <table width='95%' cellspacing='0'>
-       <tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetglobals'}</b>
-       <tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' title='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
-                                       <input type='hidden' name='ACTION' value='globalresetyes' /></form></td>
-                       <td align='left'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                       <input type='image' alt='$Lang::tr{'no'}' title='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'} 
-                                       <input type='hidden' name='ACTION' value='cancel' /></form></td>
-       </tr>
-       </table>
-END
-;
-}
-
-if ($sambasettings{'ACTION'} eq 'sharesreset')
-       {
-       print <<END
-       <br />
-       <table width='95%' cellspacing='0'>
-       <tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetshares'}</b>
-       <tr><td align='right'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' title='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
-                                       <input type='hidden' name='ACTION' value='sharesresetyes' /></form></td>
-                       <td align='left'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                       <input type='image' alt='$Lang::tr{'no'}' title='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'} 
-                                       <input type='hidden' name='ACTION' value='cancel' /></form></td>
-       </tr>
-       </table>
-END
-;
-       }
-
 ############################################################################################################################
 ########################################### Samba Benutzer oder PC l�chen #################################################
 
@@ -526,9 +451,6 @@ print <<END
 <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
                                                                                                <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
-<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                                               <input type='hidden' name='ACTION' value='globalreset' />
-                                                                               <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' /></form></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                <input type='hidden' name='ACTION' value='globalcaption' />
                                                                                <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
@@ -906,10 +828,6 @@ print <<END
                                                                                                <input type='hidden' name='ACTION' value='shareadd' />
                                                                                                <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/list-add.png' />
                                                                                                </form></td>
-               <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
-                                                                                               <input type='hidden' name='ACTION' value='sharesreset' />
-                                                                                               <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' />
-                                                                                               </form></td>
                <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
                                                                                                <input type='hidden' name='ACTION' value='sharecaption' />
                                                                                                <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' />
@@ -928,7 +846,6 @@ if ($sambasettings{'ACTION'} eq 'sharecaption')
        <tr><td align='right' width='33%'><img src='/images/list-add.png' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
        <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'edit share'}</td></tr>
        <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
-       <tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'reset shares'}</td></tr>
        <tr><td align='right' width='33%'><img src='/images/user-trash.png' /></td><td align='left'>$Lang::tr{'delete share'}</td></tr>
        </table>
 END
@@ -976,12 +893,6 @@ END
 ;
        }
 
-if ($sambasettings{'ACTION'} eq 'sharesresetyes')
-       {
-       system('/usr/local/bin/sambactrl smbsharesreset');
-       my $shares = config("${General::swroot}/samba/shares");
-       system("/usr/local/bin/sambactrl smbreload");
-       }
 if ($sambasettings{'ACTION'} eq 'smbshareadd')
        {
        $shares{'xvx'}= "$sambasettings{'SHAREOPTION'}";
@@ -1047,10 +958,6 @@ print <<END
                                                                                                <input type='hidden' name='ACTION' value='printeradd' />
                                                                                                <input type='image' alt='$Lang::tr{'add printer'}' title='$Lang::tr{'add printer'}' src='/images/list-add.png' />
                                                                                                </form></td>
-               <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
-                                                                                               <input type='hidden' name='ACTION' value='printereset' />
-                                                                                               <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' />
-                                                                                               </form></td>
                <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
                                                                                                <input type='hidden' name='ACTION' value='printercaption' />
                                                                                                <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' />

diff --git a/lfs/samba b/lfs/samba
index cd20baffc349259ba98aa1f985f99f6736dc67bf..5c527b257d40af4fbc882995191e699cbea257ea 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -101,11 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
        cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
        chown nobody:nobody -R /var/ipfire/samba/
-       cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
-       cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
-       cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
-       cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
-       cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
        cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
        rm -rf /var/lib/samba/private
        ln -s /var/ipfire/samba/private /var/lib/samba/private

diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index 138a0b84f8c80c82ad0f5c792b0edc877ee3e518..2724bfc34f031883e3b9debf62bed71f21e6b2e3 100644 (file)
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -46,16 +46,6 @@ int main(int argc, char *argv[]) {
        } else if (strcmp(argv[1], "smbsafeconfpdccups") == 0) {
                safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
 
-       } else if (strcmp(argv[1], "smbglobalreset") == 0) {
-               safe_system("/bin/cat /var/ipfire/samba/default.global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
-               safe_system("/bin/cat /var/ipfire/samba/default.settings > /var/ipfire/samba/settings");
-               safe_system("/bin/cat /var/ipfire/samba/default.global > /var/ipfire/samba/global");
-               safe_system("/bin/cat /var/ipfire/samba/default.pdc > /var/ipfire/samba/pdc");
-
-       } else if (strcmp(argv[1], "smbsharesreset") == 0) {
-               safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/default.shares > /var/ipfire/samba/smb.conf");
-               safe_system("/bin/cat /var/ipfire/samba/default.shares > /var/ipfire/samba/shares");
-
        } else if (strcmp(argv[1], "smbstop") == 0) {
                safe_system("/etc/rc.d/init.d/samba stop >/dev/null");
                safe_system("/usr/local/bin/sambactrl disable");