From 60124059ba409f7a6b94709940d59b583f9ad1cf Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Thu, 5 Apr 2007 19:04:25 +0000 Subject: [PATCH] In der Samba.cgi einige Icons ausgetauscht smbpasswd eingebunden git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@483 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/samba/private/secrets.tdb | Bin 0 -> 8192 bytes config/samba/private/smbpasswd | 1 + doc/language_issues.de | 2 + doc/language_issues.en | 4 ++ doc/language_missings | 2 + html/cgi-bin/samba.cgi | 58 ++++++++++++---------- html/html/images/Makefile.am | 82 ------------------------------- langs/de/cgi-bin/de.pl | 3 ++ langs/en/cgi-bin/en.pl | 5 +- lfs/samba | 4 ++ src/misc-progs/sambactrl.c | 11 +---- 11 files changed, 52 insertions(+), 120 deletions(-) create mode 100755 config/samba/private/secrets.tdb create mode 100755 config/samba/private/smbpasswd delete mode 100755 html/html/images/Makefile.am diff --git a/config/samba/private/secrets.tdb b/config/samba/private/secrets.tdb new file mode 100755 index 0000000000000000000000000000000000000000..5c510b2fa5b129aa8c0706034f67d0ced1fa8a73 GIT binary patch literal 8192 zc-jkbaZ*Uj%t_^9zz%XH8P%E@1|BS7rmgt~%nYMo5P%&_#H&pJVsRjL0b*Zo_8T*S zX*Jl@Imk66SU=d)Mc*^P%`?bVH^enKgpmcTgH;qr95I`{W$t3#Um1}b%SdsWQw5X} z1H?j5dsY6Mzrb!UvX$1MlJ{25czo+()CyLTtaK`YvRq_PWzwGgyXiCvM!_f;1*2dT ujDk@x3P!;w7zLwX6pVsVFbYP&C>RB!U=)mkQ7{Td!6+C7P!J=-zyJVr!E>Vk literal 0 Hc-jL100001 diff --git a/config/samba/private/smbpasswd b/config/samba/private/smbpasswd new file mode 100755 index 0000000000..03dcdee866 --- /dev/null +++ b/config/samba/private/smbpasswd @@ -0,0 +1 @@ +samba:1000:DF7D4C80BE72A070AAD3B435B51404EE:B3A3496D3F61D8CDA3B865A2B4B29A37:[DU ]:LCT-46151C53: diff --git a/doc/language_issues.de b/doc/language_issues.de index b251e63150..3fd850fc06 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -235,6 +235,7 @@ WARNING: translation string unused: sectors read from disk per second WARNING: translation string unused: sectors written to disk per second WARNING: translation string unused: select media WARNING: translation string unused: shared memory +WARNING: translation string unused: smbreload WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -315,6 +316,7 @@ WARNING: untranslated string: selecttraffic WARNING: untranslated string: settingsc WARNING: untranslated string: show areas WARNING: untranslated string: show lines +WARNING: untranslated string: smbrestart WARNING: untranslated string: sstraffic WARNING: untranslated string: trafficblue WARNING: untranslated string: trafficdate diff --git a/doc/language_issues.en b/doc/language_issues.en index 5588290c14..aeec2e896f 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -244,6 +244,7 @@ WARNING: translation string unused: sectors read from disk per second WARNING: translation string unused: sectors written to disk per second WARNING: translation string unused: shaping add options WARNING: translation string unused: shared memory +WARNING: translation string unused: smbreload WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: ssnetwork status @@ -304,6 +305,8 @@ WARNING: untranslated string: Number of IPs for the pie chart WARNING: untranslated string: Number of Ports for the pie chart WARNING: untranslated string: alt proxy WARNING: untranslated string: down +WARNING: untranslated string: firewall logs ip +WARNING: untranslated string: firewall logs port WARNING: untranslated string: help WARNING: untranslated string: openvpn log WARNING: untranslated string: otherip @@ -313,6 +316,7 @@ WARNING: untranslated string: pc add WARNING: untranslated string: red WARNING: untranslated string: remove x509 WARNING: untranslated string: settingsc +WARNING: untranslated string: smbrestart WARNING: untranslated string: up WARNING: untranslated string: urlfilter log WARNING: untranslated string: user log diff --git a/doc/language_missings b/doc/language_missings index b2126a5254..1c8584ce78 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -19,6 +19,8 @@ < dns server < download < err bk 10 password +< firewall logs ip +< firewall logs port < or < password crypting key < proxy no proxy extend diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index d3e5b605d8..0b29bbca64 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -144,6 +144,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; + system("/usr/local/bin/sambactrl smbreload"); } # smbsafeconf is directly called by the if clause @@ -164,6 +165,7 @@ system('/usr/local/bin/sambactrl smbsharesreset'); @shareline = split( /\:/, $shareentry ); push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); } + system("/usr/local/bin/sambactrl smbreload"); } ############################################################################################################################ @@ -240,6 +242,7 @@ system("/usr/local/bin/sambactrl smbsafeconf"); @shareline = split( /\:/, $shareentry ); push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); } +system("/usr/local/bin/sambactrl smbreload"); } ############################################################################################################################ @@ -304,6 +307,7 @@ system("/usr/local/bin/sambactrl smbsafeconf"); @shareline = split( /\:/, $shareentry ); push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); } +system("/usr/local/bin/sambactrl smbreload"); } ############################################################################################################################ ################################################## Sambashare �dern ####################################################### @@ -362,6 +366,7 @@ system("/usr/local/bin/sambactrl smbsafeconf"); @shareline = split( /\:/, $shareentry ); push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); } +system("/usr/local/bin/sambactrl smbreload"); } ############################################################################################################################ @@ -453,6 +458,7 @@ END { system('/usr/local/bin/sambactrl smbsafeconf'); } +system("/usr/local/bin/sambactrl smbreload"); } &General::readhash("${General::swroot}/samba/settings", \%sambasettings); @@ -529,14 +535,14 @@ foreach $key (sort keys %servicenames) } print <
-
- - - -
- + + + + + +

+
@@ -636,13 +642,13 @@ print < + +

-
-
END ; @@ -653,7 +659,7 @@ if ($sambasettings{'ACTION'} eq 'globalcaption') - +

$Lang::tr{'caption'}
$Lang::tr{'save settings'}
$Lang::tr{'save settings'}
$Lang::tr{'restore settings'}
END @@ -815,7 +821,7 @@ END print <
-
+ END @@ -834,7 +840,7 @@ END $Lang::tr{'activate user'} $Lang::tr{'deactivate user'} $Lang::tr{'change passwords'} - $Lang::tr{'save config'} + $Lang::tr{'save config'} END ; @@ -853,7 +859,7 @@ END $Lang::tr{'username'} $Lang::tr{'password'} - + END @@ -879,7 +885,7 @@ END $Lang::tr{'unix group'} $Lang::tr{'unix shell'} - + END @@ -901,7 +907,7 @@ END $Lang::tr{'unix group'} $Lang::tr{'unix shell'} - + END @@ -937,7 +943,7 @@ foreach $shareentry (sort @Shares)
- +
END ; @@ -949,7 +955,7 @@ print <
- +
@@ -957,7 +963,7 @@ print < - + END @@ -969,11 +975,11 @@ if ($sambasettings{'ACTION'} eq 'sharecaption') - + - + - +

Legende:
$Lang::tr{'add share'}
$Lang::tr{'add share'}
$Lang::tr{'edit share'}
$Lang::tr{'save config'}
$Lang::tr{'save config'}
$Lang::tr{'reset shares'}
$Lang::tr{'delete share'}
$Lang::tr{'delete share'}
END ; @@ -989,14 +995,14 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio $Lang::tr{'show share options'}
- +
+

-
END ; @@ -1030,13 +1036,13 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op $Lang::tr{'show share options'}
-
+

- +
END @@ -1146,7 +1152,7 @@ foreach my $log (@Logs) {chomp $log;print"";} print <$Lang::tr{'show last x lines'} - +
$Log
diff --git a/html/html/images/Makefile.am b/html/html/images/Makefile.am deleted file mode 100755 index 4fb6083ff9..0000000000 --- a/html/html/images/Makefile.am +++ /dev/null @@ -1,82 +0,0 @@ - -size = 16x16 -context = actions - -iconsdir = $(themedir)/$(size)/$(context) - -icons_DATA = \ - address-book-new.png \ - appointment-new.png \ - bookmark-new.png \ - contact-new.png \ - document-new.png \ - document-open.png \ - document-print.png \ - document-print-preview.png \ - document-properties.png \ - document-save.png \ - document-save-as.png \ - edit-clear.png \ - edit-copy.png \ - edit-cut.png \ - edit-delete.png \ - edit-find.png \ - edit-find-replace.png \ - edit-paste.png \ - edit-redo.png \ - edit-select-all.png \ - edit-undo.png \ - folder-new.png \ - format-indent-less.png \ - format-indent-more.png \ - format-justify-center.png \ - format-justify-fill.png \ - format-justify-left.png \ - format-justify-right.png \ - format-text-bold.png \ - format-text-italic.png \ - format-text-strikethrough.png \ - format-text-underline.png \ - go-bottom.png \ - go-down.png \ - go-first.png \ - go-home.png \ - go-jump.png \ - go-last.png \ - go-next.png \ - go-previous.png \ - go-top.png \ - go-up.png \ - list-add.png \ - list-remove.png \ - mail-forward.png \ - mail-message-new.png \ - mail-mark-junk.png \ - mail-mark-not-junk.png \ - mail-reply-all.png \ - mail-reply-sender.png \ - mail-send-receive.png \ - media-eject.png \ - media-playback-pause.png \ - media-playback-start.png \ - media-playback-stop.png \ - media-record.png \ - media-seek-backward.png \ - media-seek-forward.png \ - media-skip-backward.png \ - media-skip-forward.png \ - process-stop.png \ - system-lock-screen.png \ - system-log-out.png \ - system-search.png \ - system-shutdown.png \ - tab-new.png \ - view-fullscreen.png \ - view-refresh.png \ - window-new.png - -EXTRA_DIST = \ - $(icons_DATA) - -install-data-local: install-iconsDATA - (cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f317a482a4..6df4a9d766 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1192,6 +1192,9 @@ 'shutting down' => 'Fahre herunter', 'shutting down ipfire' => 'Fahre IPFire herunter', 'size' => 'Größe', +'smbreload' => 'Samba Dienste durchstarten', +'smbstart' => 'Samba Dienste starten', +'smbstop' => 'Samba Dienste beenden', 'snort hits' => 'Gesamtanzahl der aktivierten Intrusion-Regeln für', 'sort ascending' => 'Sortiere aufsteigend', 'sort descending' => 'Sortiere absteigend', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 093c455f17..6dbd276e17 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -637,8 +637,6 @@ 'firewall log' => 'Firewall log', 'firewall log viewer' => 'Firewall Log Viewer', 'firewall logs' => 'Firewall Logs', -'firewall logs ip' => 'Firewall Log Graphs (IP)', -'firewall logs port' => 'Firewall Log Graphs (Port)', 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', 'fixed ip lease added' => 'Fixed IP lease added', @@ -1207,6 +1205,9 @@ 'shutting down' => 'Shutting down', 'shutting down ipfire' => 'Shutting down IPFire', 'size' => 'Size', +'smbreload' => 'Samba Dienste durchstarten', +'smbstart' => 'Samba Dienste starten', +'smbstop' => 'Samba Dienste beenden', 'snort hits' => 'Total of number of Intrusion rules activated for', 'sort ascending' => 'Sort Ascending', 'sort descending' => 'Sort Descending', diff --git a/lfs/samba b/lfs/samba index f3e99223b7..7ad3e0acbf 100644 --- a/lfs/samba +++ b/lfs/samba @@ -107,5 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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 + useradd -c 'Samba User' -s /bin/false + groupadd sambauser + groupadd sambawks @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index c598cb0e3d..6dd65bc9c2 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -77,34 +77,30 @@ int main(int argc, char *argv[]) if (strcmp(argv[1], "smbstop")==0) { safe_system("/etc/rc.d/init.d/samba stop"); - printf(command); return 0; } if (strcmp(argv[1], "smbstart")==0) { safe_system("/etc/rc.d/init.d/samba start"); - printf(command); return 0; } if (strcmp(argv[1], "smbrestart")==0) { safe_system("/etc/rc.d/init.d/samba restart"); - printf(command); return 0; } if (strcmp(argv[1], "smbreload")==0) { safe_system("/etc/rc.d/init.d/samba reload"); - printf(command); return 0; } if (strcmp(argv[1], "smbstatus")==0) { - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/smbstatus"); + snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus"); safe_system(command); return 0; } @@ -115,10 +111,8 @@ int main(int argc, char *argv[]) safe_system(command); snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -p %s -s %s %s", argv[4], argv[3], argv[5], argv[2]); safe_system(command); - printf(command); snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s", argv[3], argv[3], argv[2]); safe_system(command); - printf(command); return 0; } @@ -128,10 +122,8 @@ int main(int argc, char *argv[]) safe_system(command); snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s", argv[3], argv[4], argv[2]); safe_system(command); - printf(command); snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s", argv[2]); safe_system(command); - printf(command); return 0; } @@ -139,7 +131,6 @@ int main(int argc, char *argv[]) { snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s", argv[3], argv[3], argv[2]); safe_system(command); - printf(command); return 0; } -- 2.39.2