From fa7be6597cdea9f028ca09c875eec3ecd193953a Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sat, 31 Mar 2007 13:26:25 +0000 Subject: [PATCH] =?utf8?q?Samba=20Status=20und=20Logauswertung=20fertigges?= =?utf8?q?telllt=20ausserdem=20eine=20Menge=20Codefixes=20einige=20Icons?= =?utf8?q?=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@474 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- html/cgi-bin/samba.cgi | 318 +++++++++++++++++------- html/cgi-bin/upnp.cgi | 5 +- html/html/images/dialog-error.png | Bin 0 -> 653 bytes html/html/images/edit-redo.png | Bin 0 -> 591 bytes html/html/images/network-error.png | Bin 0 -> 646 bytes html/html/images/user-multiple.png | Bin 0 -> 894 bytes html/html/images/user-option-add.png | Bin 0 -> 777 bytes html/html/images/user-option-remove.png | Bin 0 -> 726 bytes lfs/linux-igd | 2 +- src/misc-progs/sambactrl.c | 4 +- 10 files changed, 229 insertions(+), 100 deletions(-) create mode 100755 html/html/images/dialog-error.png create mode 100755 html/html/images/edit-redo.png create mode 100755 html/html/images/network-error.png create mode 100755 html/html/images/user-multiple.png create mode 100755 html/html/images/user-option-add.png create mode 100755 html/html/images/user-option-remove.png diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index af8152a0f7..e45ca26fd0 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -22,6 +22,8 @@ my %netsettings = (); my %ovpnsettings = (); my $message = ""; my $errormessage = ""; +my @Logs = qx(ls /var/log/samba/); +my $Log ='kein Log ausgewählt'; my $defaultoption= "[Share]\npath = /var/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba"; my $userentry = ""; my @user = (); @@ -53,6 +55,7 @@ my @shareline = (); my $sharefile = "/var/ipfire/samba/shares"; my $EOF = qx(cat $sharefile | wc -l); my $Status = qx(/usr/local/bin/sambactrl smbstatus); +$Status=~s/\n/
/g; @shares = `grep -n '^\\[' $sharefile`; foreach $shareentry (@shares) @@ -65,8 +68,8 @@ foreach $shareentry (@shares) #################################### Initialisierung von Samba Variablen fr global Settings ############################### $sambasettings{'WORKGRP'} = 'homeip.net'; -$sambasettings{'NETBIOSNAME'} = 'IPFIRE'; -$sambasettings{'SRVSTRING'} = 'Samba Server running on IPFire 2.0'; +$sambasettings{'NETBIOSNAME'} = 'IPFire'; +$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '65'; @@ -74,14 +77,17 @@ $sambasettings{'GREEN'} = 'on'; $sambasettings{'BLUE'} = 'off'; $sambasettings{'ORANGE'} = 'off'; $sambasettings{'VPN'} = 'off'; -$sambasettings{'WINSSRV'} = "$netsettings{'GREEN_NETADDRESS'}"; -$sambasettings{'WINSSUPPORT'} = 'off'; +$sambasettings{'WINSSRV'} = ''; +$sambasettings{'WINSSUPPORT'} = 'on'; +$sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = ''; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Never'; +$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:10 winbind:2'; ### Values that have to be initialized -$cgisettings{'ACTION'} = ''; +$sambasettings{'ACTION'} = ''; +$sambasettings{'LOGLINES'} = '15'; ################################################## Samba PDC Variablen ##################################################### @@ -100,7 +106,7 @@ my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; &Header::openbigbox('100%', 'left', '', $errormessage); ############################################################################################################################ -############################################# Samba Rootskript aufrufe fr SU-Actions ###################################### +############################################# Samba Rootskript aufrufe fr SU-Actions ####################################### if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");} if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");} @@ -111,11 +117,38 @@ if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl s if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");} if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");} if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");} -if ($sambasettings{'ACTION'} eq 'globalreset'){system("/usr/local/bin/sambactrl smbglobalreset");} +if ($sambasettings{'ACTION'} eq 'globalresetyes') + { + system("/usr/local/bin/sambactrl smbglobalreset"); + $sambasettings{'WORKGRP'} = 'homeip.net'; + $sambasettings{'NETBIOSNAME'} = 'IPFire'; + $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0'; + $sambasettings{'INTERFACES'} = ''; + $sambasettings{'SECURITY'} = 'share'; + $sambasettings{'OSLEVEL'} = '65'; + $sambasettings{'GREEN'} = 'on'; + $sambasettings{'BLUE'} = 'off'; + $sambasettings{'ORANGE'} = 'off'; + $sambasettings{'VPN'} = 'off'; + $sambasettings{'WINSSRV'} = ''; + $sambasettings{'WINSSUPPORT'} = 'on'; + $sambasettings{'REMOTEANNOUNCE'} = ''; + $sambasettings{'PASSWORDSYNC'} = 'off'; + $sambasettings{'OTHERINTERFACES'} = ''; + $sambasettings{'GUESTACCOUNT'} = 'samba'; + $sambasettings{'MAPTOGUEST'} = 'Never'; + $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:10 winbind:2'; +### Values that have to be initialized + $sambasettings{'ACTION'} = ''; + $sambasettings{'LOCALMASTER'} = 'off'; + $sambasettings{'DOMAINMASTER'} = 'off'; + $sambasettings{'PREFERREDMASTER'} = 'off'; + $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; + } # smbsafeconf is directly called by the if clause -if ($sambasettings{'ACTION'} eq 'sharesreset') +if ($sambasettings{'ACTION'} eq 'sharesresetyes') { system('/usr/local/bin/sambactrl smbsharesreset'); @Zeilen = (); @@ -134,17 +167,49 @@ system('/usr/local/bin/sambactrl smbsharesreset'); } ############################################################################################################################ -########################################### Samba Benutzer oder PC l�chen ################################################# +################################################ Sicherheitsabfrage für den Reset ########################################## -if ($sambasettings{'ACTION'} eq 'userdelete' && $sambasettings{'NAME'} =~ /\$/) -{ -system("/usr/local/bin/sambactrl smbpcdelete $sambasettings{'NAME'}"); -} -elsif ($sambasettings{'ACTION'} eq 'userdelete') -{ -system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}"); +if ($sambasettings{'ACTION'} eq 'globalreset') + { + print < +
+ Globals zurück setzen? +
+ Yes +
+
+ No +
+ + +END +; } +if ($sambasettings{'ACTION'} eq 'sharesreset') + { + print < +
+ Shares zurück setzen? +
+ Yes +
+
+ No +
+ + +END +; + } + +############################################################################################################################ +########################################### Samba Benutzer oder PC l�chen ################################################# + +if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");} + ############################################################################################################################ ############################################## Samba Share neu anlegen ##################################################### @@ -317,11 +382,10 @@ if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .= " &General::writehash("${General::swroot}/samba/settings", \%sambasettings); if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";} -if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasettings{'WINSSUPPORT'} = "true";} else { $sambasettings{'WINSSUPPORT'} = "false";} +if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasettings{'WINSSUPPORT'} = "true";$sambasettings{'WINSSRV'} = "";} else { $sambasettings{'WINSSUPPORT'} = "false";} if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";} if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";} if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} -if ($sambasettings{'MAPTOGUEST'} eq 'on'){ $sambasettings{'MAPTOGUEST'} = "true";} else { $sambasettings{'MAPTOGUEST'} = "false";} ############################################################################################################################ ############################################# Schreiben der Samba globals ################################################## @@ -355,13 +419,16 @@ null passwords = yes bind interfaces only = true interfaces = $sambasettings{'INTERFACES'} socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE +remote announce = $sambasettings{'REMOTEANNOUNCE'} username level = 1 wins support = $sambasettings{'WINSSUPPORT'} +wins server = $sambasettings{'WINSSRV'} log file = /var/log/samba/samba-log.%m lock directory = /var/lock/samba pid directory = /var/run/ +log level = $sambasettings{'LOGLEVEL'} preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} @@ -388,6 +455,7 @@ END } } &General::readhash("${General::swroot}/samba/settings", \%sambasettings); + if ($errormessage) { &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); @@ -454,7 +522,7 @@ END my $key = ''; foreach $key (sort keys %servicenames) { - print "$key"; + print "$key"; my $shortname = $servicenames{$key}; my $status = &isrunning($shortname); print "$status"; @@ -468,8 +536,8 @@ END } print <
-
+
+ @@ -481,13 +549,14 @@ print <
Basisoptionen -Workgroup: -NetBIOS-Name: -Server-String: -Interfaces:on / +Workgroup: +NetBIOS-Name: +Server-String: +Log Level: +Interfaces:on / off | OpenVpn - $ovpnsettings{'DDEVICE'} -on / +on / off | $Lang::tr{'green'} - $netsettings{'GREEN_DEV'} END @@ -496,7 +565,7 @@ END if (&Header::blue_used()) { print <on / + on / off | $Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'} END @@ -506,7 +575,7 @@ END if (&Header::orange_used()) { print <on / + on / off | $Lang::tr{'dmz'} - $netsettings{'ORANGE_DEV'} END @@ -514,40 +583,44 @@ END } print <weitere +weitere
Sicherheitsoptionen -Security: -Map to guest: -Unix Passwort Sync:on / +Unix Passwort Sync:on / off -
+
Netzwerkoptionen -OS Level: -WINS-Server: +OS Level: +Remote Announce: +END +; +if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"WINS-Server:";} + print <WINS-Support:on / + off END ; if ($sambasettings{'SECURITY'} eq 'user') { print <WINS-Support:on / - off -Local Master:on / +Local Master:on / off -Domain Master:on / +Domain Master:on / off -Preferred Master:on / +Preferred Master:on / off END ; @@ -567,7 +640,7 @@ END print < - + @@ -586,9 +659,9 @@ if ($sambasettings{'ACTION'} eq 'globalcaption') print < - - - + + +



Legende:
Einstellungen speichern
Auf default zurueck setzen
Legende:
Einstellungen speichern
Auf default zurueck setzen
END ; @@ -615,7 +688,7 @@ if ($sambasettings{'SECURITY'} eq 'user')
Benutzerverwaltung - NamePasswort + NamePasswort END ; @@ -625,10 +698,10 @@ END } else { - print "Typ"; + print "Typ"; } - print "StatusOptionen"; + print "StatusOptionen"; system('/usr/local/bin/sambactrl readsmbpasswd'); open(FILE, "; @@ -637,29 +710,29 @@ END foreach $userentry (sort @user) { @userline = split( /\:/, $userentry ); - print "$userline[0]"; + print "$userline[0]"; if ($userline[4] =~ /N/) { - print "nicht gesetzt"; + print "nicht gesetzt"; } else { - print "gesetzt"; + print "gesetzt"; } if ($sambasettings{'DOMAINMASTER'} eq 'off') { - print ""; + print ""; } else { if ($userline[0] =~ /\$/) { - print "PC"; + print "PC"; } else { - print "User"; + print "User"; } } @@ -667,7 +740,7 @@ END { print < -
+ @@ -679,7 +752,7 @@ END { print < - + @@ -695,7 +768,7 @@ END else { print < + @@ -704,14 +777,28 @@ END ; } - print < - - - - + if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/) + { + print <
+ + + +
+END +; + } + else + { + print <
+ + + +
END ; + } } print < @@ -719,7 +806,7 @@ END
-
+ END ; @@ -728,7 +815,7 @@ END print <
-
+ END ; } @@ -745,15 +832,16 @@ END { print < -
- Legende: - Benutzer neu anlegen - Client Account neu anlegen - Benutzer aktivieren - Benutzer deaktivieren - Einstellungen speichern - Passwort wechseln - Benutzer loeschen +
+ Legende: + Benutzer neu anlegen + Client Account neu anlegen + Benutzer loeschen + Client Account loeschen + Benutzer aktivieren + Benutzer deaktivieren + Passwort wechseln + Einstellungen speichern END ; @@ -769,8 +857,8 @@ END - - + +

Passwort wechseln
Benutzername
Passwort
Benutzername
Passwort
@@ -793,10 +881,10 @@ END - - - - + + + +

Benutzer neu anlegen
Benutzername
Passwort
Unix Gruppe
Unix Shell
Benutzername
Passwort
Unix Gruppe
Unix Shell
@@ -816,9 +904,9 @@ END - - - + + +

Client Account neu anlegen
Clientname
Unix Gruppe
Unix Shell
Clientname
Unix Gruppe
Unix Shell
@@ -832,7 +920,7 @@ END ############################################################################################################################ ############################################### Verwalten von Freigaben #################################################### - + &Header::openbox('100%', 'center', 'Shares'); print <
Shareverwaltung -Names des SharesOptionen +Names des SharesOptionen END ; @@ -886,13 +974,13 @@ if ($sambasettings{'ACTION'} eq 'sharecaption') { print < -
- Legende: - Share neu anlegen - Share bearbeiten - Einstellungen speichern - Shares zurueck setzen - Share loeschen +
+ Legende: + Share neu anlegen + Share bearbeiten + Einstellungen speichern + Shares zurueck setzen + Share loeschen END ; @@ -949,13 +1037,14 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op Anzeige der Optionen fuer Shares
-
+
+ +

-
END ; @@ -1030,10 +1119,47 @@ END print < - + - + +


Samba Status
$Status
$Status
+END +; +&Header::closebox(); + +############################################################################################################################ +############################################### Anzeige des Sambastatus #################################################### + + +if ($sambasettings{'ACTION'} eq 'showlog') +{ +$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'}); +$Log=~s/\n/
/g; +} + +&Header::openbox('100%', 'center', 'Logs'); + +print < +
+ + + + + + + + + +

Loganzeige

anzeige der letzen x Zeilen

$Log

$sambasettings{'LOG'}
+
END ; @@ -1042,7 +1168,7 @@ END &Header::closepage(); ############################################################################################################################ -############################################ Subfunktion fr Sambadienste ################################################## +############################################ Subfunktion fr Sambadienste ################################################### sub isrunning { diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi index 3d8495501c..d2faaa160f 100644 --- a/html/cgi-bin/upnp.cgi +++ b/html/cgi-bin/upnp.cgi @@ -156,7 +156,8 @@ print <Description Document: Upnp Device Name:

- + +
@@ -173,7 +174,7 @@ END sub isrunning { my $cmd = $_[0]; - my $status = "$Lang::tr{'stopped'}"; + my $status = "$Lang::tr{'stopped'}"; my $pid = ''; my $testcmd = ''; my $exename; diff --git a/html/html/images/dialog-error.png b/html/html/images/dialog-error.png new file mode 100755 index 0000000000000000000000000000000000000000..3bbbb4a0d3dc2f6bfb653bd25e80169e96c6c833 GIT binary patch literal 653 zc-jGt0&@L{P)&6kU&^O z2QZQrnrLJAuq31{O{kZd49Zz&wx!#=YkfunsI` zVC#CnxgmZ#911N=CX)oiVSEDvs4AVaGtSFpiiHBzW;2_C#oquqcsHF)z8smE;c|N$ z=kydD2USH3SVMR5Pfb$Y-Q`oUxSD}i0KTsCbTaw+UMxm?a}#YeKm=7mML`5$&hffQ81ak$9mc{~;YnD+zeVE8^iK72$)87qJ1PqlB~L8>(Z z4<7-f{lK`@KZuGO*xyP-QSD%Q0s!L{aFzDI0Py-$1pq%#>eSCB6oab6myr>-LBzdL zH#|30MBN~@*#an8!20>g3C13}BL5=pI*KP&!5SQ-U8@1CTfox(-X4K?+$GC(kvBT+ zPD4;*@JAw)4i5pAtPE_`TCHrQkf&$rsSCO0ig&9h7(-7qM&sasdb^#?z?KhS8CITG zDzmoF7ad3>a2gHdqJ8xf6)<*)-uMKKa+$*M@oEO%+`3G5U*E!$(NO}njp^-0MR1x; nI`ukVkB+*|i??p$|E%**!bfHvxmb3000000NkvXXu0mjfWCIe6 literal 0 Hc-jL100001 diff --git a/html/html/images/edit-redo.png b/html/html/images/edit-redo.png new file mode 100755 index 0000000000000000000000000000000000000000..c3b0df03964aed629787aa2e00d5c1deb0ce3628 GIT binary patch literal 591 zc-jF^09!@1|a7y6KHYMyRt(@|#< z{cBq{wZeZJJbqvRywOcgMZ;bX8R({V0eC(qv{bfm zby!V}<`4o^j$zq9DScbv%ILiw6A^$HfESPQ`SbEnPO8~uyxOOpbRU~FfUe28J$qL8 z@C5Mk;kD~GW0^Bpm31snBktM&3_1-q+s@zOgv6zhyDTl6DE{o}owMVUv2>RDuXiL` z4H7gMZdG_i0!QlYIz4!@dkqC(K-FfCk4>lJ)_b!1Rd%EVnj)wji8Jm)7Zot;7MWwG z*gs|t5o;aT9wf2Ok6$@g1dX*be!bT##gp?c3Eq+E#Mh2RWxi- zG;9IzHaQf6fo=!vH>>VST}Z(FqG7KdPT<2cMZ+#dZlbEl2Y?p^`wGFq1RKr0vRaV6 z7^XIV*yPVOq9g;1-Im=i2krW;ncR=mZuykZ)veF3J9a;RB)EwqzyeSOHl8Hi?*hE} dMW^#GgWuOnx&>a(HQoRK002ovPDHLkV1oBE0Zsq_ literal 0 Hc-jL100001 diff --git a/html/html/images/network-error.png b/html/html/images/network-error.png new file mode 100755 index 0000000000000000000000000000000000000000..3f18ed0f7b27753d31e8b32d3260ff67ca19dec7 GIT binary patch literal 646 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 KelF{r5}E+big$tl literal 0 Hc-jL100001 diff --git a/html/html/images/user-option-remove.png b/html/html/images/user-option-remove.png new file mode 100755 index 0000000000000000000000000000000000000000..1304c032d7d0420d6b6a6572b10d01925bf613b8 GIT binary patch literal 726 zc-rd>@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl;=8&~`zjDUQ}64!{5 z;QX|b^2DN42FH~Aq*MjZ+{EHdOE9HE9^Rg21vXfhvURbvGu1fUs3AIj{MRf{+ zQ**Q8-(8>b_d!ceW_;VSi#0{w1=CL6Un_WPrNF#4OW&H^1zDbFG?f$rr(9Vk;$OQ* z&bQC0c>Cog0v8qv=p?USxa)RFVTMO^+0>2Ky%HP$o_CfHm^8c1xxOUq@AYIkpKjII z)o(8~ctn-tXZk)|C)nMTQC`#7w)EoPdv%`iHLj&Qgp{l= zr+q)}7D~&^`*U1H-haZ9*|mFlSmk`WW;R;Xc1)A==_#CcvZOG}r+RlvYI;^i;_`iW zUu+SIZ9kY(-JhSEkxr8{r6Uz?x!;+?$mLM; zPKDE2m`znpO)b8IVSn|mM)6HtcF#llIU=VT?2ycK3oDYEb?6v}^U){4F@IDAx82b2 z+PvvlRM!EPM@%e-w|-?wNpezTninXuEl9?3B45<6yaYx!b=Io_Un`8$^vv8k82SZ@ znZ%{7yH{w39GExP_2z}>UUN%9r3nX5tdP!l^*rO?3664hb!CBqrkMc(o59o7&t;ucLK6TLBVoM& literal 0 Hc-jL100001 diff --git a/lfs/linux-igd b/lfs/linux-igd index ff5dbce425..c28b5a5d6a 100644 --- a/lfs/linux-igd +++ b/lfs/linux-igd @@ -74,6 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKETUNING) #HAVE_LIBIPTC=1 cd $(DIR_APP) && make install - cp -vf $(DIR_SRC)/config/upnp/* /etc/linuigd/ + cp -vf $(DIR_SRC)/config/upnp/* /etc/linuxigd/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 463f915ca6..d6964b58fb 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -63,6 +63,7 @@ int main(int argc, char *argv[]) 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"); return 0; } @@ -85,6 +86,8 @@ int main(int argc, char *argv[]) if (strcmp(argv[1], "smbstart")==0) { + snprintf(command, BUFFER_SIZE-1, "smbd -D && nmbd -D && winbindd -D",); + safe_system(command); return 0; } @@ -92,7 +95,6 @@ int main(int argc, char *argv[]) { snprintf(command, BUFFER_SIZE-1, "/usr/sbin/smbstatus"); safe_system(command); - printf(command); return 0; } -- 2.39.2