Updated Kernel (2.6.32.22).

[people/pmueller/ipfire-2.x.git] / src / misc-progs / sambactrl.c

diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index a6e1f7c2d4a5a6d8c0adb53289ea559ba99fa982..f81b295cc27553d7f249a7b5c54b6a252cd42345 100644 (file)
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -22,55 +22,47 @@ if (argc==1)
 fprintf (stderr, "Missing smbctrl command!\n");
 return 1;
 }
-
-if (strcmp(argv[1], "smbuserdisable")==0)
+else if (strcmp(argv[1], "smbuserdisable")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s", argv[2]);
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s >/dev/null", argv[2]);
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "smbuserenable")==0)
+else if (strcmp(argv[1], "smbuserenable")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s", argv[2]);
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s >/dev/null", argv[2]);
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "smbuserdelete")==0)
+else if (strcmp(argv[1], "smbuserdelete")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s", argv[2]);
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s >/dev/null", argv[2]);
 safe_system(command);
-snprintf(command, BUFFER_SIZE-1, "/usr/sbin/userdel %s", argv[2]);
+snprintf(command, BUFFER_SIZE-1, "/usr/sbin/userdel %s >/dev/null", argv[2]);
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "smbsafeconf")==0)
+else if (strcmp(argv[1], "smbsafeconf")==0)
 {
 safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
 return 0;
 }
-
-if (strcmp(argv[1], "smbsafeconfcups")==0)
+else if (strcmp(argv[1], "smbsafeconfcups")==0)
 {
 safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf");
 return 0;
 }
-
-if (strcmp(argv[1], "smbsafeconfpdc")==0)
+else if (strcmp(argv[1], "smbsafeconfpdc")==0)
 {
 safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
 return 0;
 }
-
-if (strcmp(argv[1], "smbsafeconfpdccups")==0)
+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");
 return 0;
 }
-
-if (strcmp(argv[1], "smbglobalreset")==0)
+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");
@@ -78,118 +70,105 @@ safe_system("/bin/cat /var/ipfire/samba/default.global > /var/ipfire/samba/globa
 safe_system("/bin/cat /var/ipfire/samba/default.pdc > /var/ipfire/samba/pdc");
 return 0;
 }
-
-if (strcmp(argv[1], "smbsharesreset")==0)
+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");
 return 0;
 }
-
-if (strcmp(argv[1], "smbprinterreset")==0)
+else if (strcmp(argv[1], "smbprinterreset")==0)
 {
 safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/default.printer > /var/ipfire/samba/smb.conf");
 safe_system("/bin/cat /var/ipfire/samba/default.printer > /var/ipfire/samba/printer");
 return 0;
 }
-
-if (strcmp(argv[1], "smbstop")==0)
+else if (strcmp(argv[1], "smbstop")==0)
 {
-safe_system("/etc/rc.d/init.d/samba stop");
+safe_system("/etc/rc.d/init.d/samba stop >/dev/null");
+safe_system("/usr/local/bin/sambactrl disable");
 return 0;
 }
-
-if (strcmp(argv[1], "smbstart")==0)
+else if (strcmp(argv[1], "smbstart")==0)
 {
-safe_system("/etc/rc.d/init.d/samba start");
+safe_system("/etc/rc.d/init.d/samba start >/dev/null");
+safe_system("/usr/local/bin/sambactrl enable");
 return 0;
 }
-
-if (strcmp(argv[1], "smbrestart")==0)
+else if (strcmp(argv[1], "smbrestart")==0)
 {
-safe_system("/etc/rc.d/init.d/samba restart");
+safe_system("/etc/rc.d/init.d/samba restart >/dev/null");
 return 0;
 }
-
-if (strcmp(argv[1], "smbreload")==0)
+else if (strcmp(argv[1], "smbreload")==0)
 {
-safe_system("/etc/rc.d/init.d/samba reload");
+safe_system("/etc/rc.d/init.d/samba reload >/dev/null");
 return 0;
 }
-
-if (strcmp(argv[1], "smbstatus")==0)
+else if (strcmp(argv[1], "smbstatus")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus");
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus 2>/dev/null");
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "smbuseradd")==0)
+else if (strcmp(argv[1], "smbuseradd")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser");
+snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser >/dev/null");
+safe_system(command);
+snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -s %s %s >/dev/null", argv[4], argv[5], argv[2]);
 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]);
+snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
 safe_system(command);
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s", argv[3], argv[3], argv[2]);
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "smbpcadd")==0)
+else if (strcmp(argv[1], "smbpcadd")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks");
+snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks >/dev/null");
 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]);
+snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s >/dev/null", argv[3], argv[4], argv[2]);
 safe_system(command);
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s", argv[2]);
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s >/dev/null", argv[2]);
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "smbchangepw")==0)
+else if (strcmp(argv[1], "smbchangepw")==0)
 {
-snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s", argv[3], argv[3], argv[2]);
+snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);
+safe_system(command);
+snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]);
 safe_system(command);
 return 0;
 }
-
-if (strcmp(argv[1], "readsmbpasswd")==0)
+else if (strcmp(argv[1], "readsmbpasswd")==0)
 {
-safe_system("/bin/chown root:nobody /var/ipfire/samba/private");
-safe_system("/bin/chown root:nobody /var/ipfire/samba/private/smbpasswd");
-safe_system("/bin/chmod 640 /var/ipfire/samba/private/smbpasswd");
-safe_system("/bin/chmod 650 /var/ipfire/samba/private");
+safe_system("/bin/chown root:nobody /var/ipfire/samba/private >/dev/null");
+safe_system("/bin/chown root:nobody /var/ipfire/samba/private/smbpasswd >/dev/null");
+safe_system("/bin/chmod 640 /var/ipfire/samba/private/smbpasswd >/dev/null");
+safe_system("/bin/chmod 650 /var/ipfire/samba/private >/dev/null");
 return 0;
 }
-
-if (strcmp(argv[1], "locksmbpasswd")==0)
+else if (strcmp(argv[1], "locksmbpasswd")==0)
 {
-safe_system("/bin/chown root:root /var/ipfire/samba/private");
-safe_system("/bin/chown root:root /var/ipfire/samba/private/smbpasswd");
-safe_system("/bin/chmod 600 /var/ipfire/samba/private/smbpasswd");
-safe_system("/bin/chmod 600 /var/ipfire/samba/private");
+safe_system("/bin/chown root:root /var/ipfire/samba/private >/dev/null");
+safe_system("/bin/chown root:root /var/ipfire/samba/private/smbpasswd >/dev/null");
+safe_system("/bin/chmod 600 /var/ipfire/samba/private/smbpasswd >/dev/null");
+safe_system("/bin/chmod 600 /var/ipfire/samba/private >/dev/null");
 return 0;
 }
-if (strcmp(argv[1], "enable")==0)
+else if (strcmp(argv[1], "enable")==0)
 {
 safe_system("touch /var/ipfire/samba/enable");
-safe_system("/etc/rc.d/init.d/samba start");
-safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc2.d/S50samba");
-safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc2.d/K50samba");
-safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S50samba");
-safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/K50samba");
+safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S45samba");
+safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc0.d/K48samba");
+safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc6.d/K48samba");
 return 0;
 }
-
-if (strcmp(argv[1], "disable")==0)
+else if (strcmp(argv[1], "disable")==0)
 {
 safe_system("unlink /var/ipfire/samba/enable");
-safe_system("/etc/rc.d/init.d/samba stop");
-safe_system("unlink /etc/rc.d/rc2.d/S50samba");
-safe_system("unlink /etc/rc.d/rc2.d/K50samba");
-safe_system("unlink /etc/rc.d/rc3.d/S50samba");
-safe_system("unlink /etc/rc.d/rc3.d/K50samba");
+safe_system("rm -rf /etc/rc.d/rc*.d/*samba");
 return 0;
 }
 return 0;
-}
\ No newline at end of file
+}