X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fmisc-progs%2Fsambactrl.c;h=45c166d4616a9e1757bec887ab30e14507b622fc;hp=c598cb0e3dbff4142279d8cd5b921a7b34ead0f7;hb=0ffbb688d3bf4a0890800b1ae35fb73bf60d1804;hpb=c9e1c143a246343e516be32e43d06f35c99fd9d8

diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index c598cb0e3d..45c166d461 100644
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -10,162 +10,136 @@
 
 char command[BUFFER_SIZE]; 
 
-int main(int argc, char *argv[])
-{
-
-        if (!(initsetuid()))
-                exit(1);
-
-        // Check what command is asked
-        if (argc==1)
-        {
-            fprintf (stderr, "Missing smbctrl command!\n");
-            return 1;
-        }
-
-        if (strcmp(argv[1], "smbuserdisable")==0)
-        {
-            snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s", argv[2]);
-            safe_system(command);
-            return 0;
-        }
-
-        if (strcmp(argv[1], "smbuserenable")==0)
-        {
-            snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s", argv[2]);
-            safe_system(command);
-            return 0;
-        }
-
-        if (strcmp(argv[1], "smbuserdelete")==0)
-        {
-            snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s", argv[2]);
-            safe_system(command);
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/userdel %s", argv[2]);
-            safe_system(command);
-            return 0;
-        }
-
-        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], "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], "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");
-            return 0;
-        }
-
-        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], "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");
-            safe_system(command);
-            return 0;
-        }
-
-        if (strcmp(argv[1], "smbuseradd")==0)
-        {
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser");
-            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;
-        }
-
-        if (strcmp(argv[1], "smbpcadd")==0)
-        {
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks");
-            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;
-        }
-
-        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]);
-            safe_system(command);
-            printf(command);
-            return 0;
-        }
-
-        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");
-            return 0;
-        }
-
-        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");
-            return 0;
-        }
-
-        if (strcmp(argv[1], "smbechotest")==0)
-        {
-            sprintf(command, BUFFER_SIZE-1, "/usr/bin/printf %s %s", argv[2], argv[3]);
-            printf(command);
-            safe_system(command);
-            return 0;
-        }
+int main(int argc, char *argv[]) {
+	if (!(initsetuid()))
+		exit(1);
+
+	// Check what command is asked
+	if (argc == 1) {
+		fprintf (stderr, "Missing smbctrl command!\n");
+		return 1;
+
+	} else if (strcmp(argv[1], "smbuserdisable") == 0) {
+		snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s >/dev/null", argv[2]);
+		safe_system(command);
+
+	} else if (strcmp(argv[1], "smbuserenable") == 0) {
+		snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s >/dev/null", argv[2]);
+		safe_system(command);
+
+	} else if (strcmp(argv[1], "smbuserdelete") == 0) {
+		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 >/dev/null", argv[2]);
+		safe_system(command);
+
+	} else if (strcmp(argv[1], "smbsafeconf") == 0) {
+		safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
+
+	} 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");
+
+	} 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");
+
+	} 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], "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");
+
+	} 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");
+
+	} else if (strcmp(argv[1], "smbstart") == 0) {
+		safe_system("/etc/rc.d/init.d/samba start >/dev/null");
+		safe_system("/usr/local/bin/sambactrl enable");
+
+	} else if (strcmp(argv[1], "smbrestart") == 0) {
+		safe_system("/etc/rc.d/init.d/samba restart >/dev/null");
+
+	} else if (strcmp(argv[1], "smbreload") == 0) {
+		safe_system("/etc/rc.d/init.d/samba reload >/dev/null");
+
+	} else if (strcmp(argv[1], "smbstatus") == 0) {
+		snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbstatus 2>/dev/null");
+		safe_system(command);
+
+	} else if (strcmp(argv[1], "smbuseradd") == 0) {
+		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, "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);
+
+	} else if (strcmp(argv[1], "smbpcadd") == 0) {
+		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 >/dev/null", argv[3], argv[4], argv[2]);
+		safe_system(command);
+
+		snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s >/dev/null", argv[2]);
+		safe_system(command);
+
+	} else if (strcmp(argv[1], "smbchangepw") == 0) {
+		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);
+
+	} else if (strcmp(argv[1], "readsmbpasswd") == 0) {
+		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");
+
+	} else if (strcmp(argv[1], "locksmbpasswd") == 0) {
+		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");
+
+	} else if (strcmp(argv[1], "enable") == 0) {
+		safe_system("touch /var/ipfire/samba/enable");
+		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");
+
+	} else if (strcmp(argv[1], "disable") == 0) {
+		safe_system("unlink /var/ipfire/samba/enable");
+		safe_system("rm -rf /etc/rc.d/rc*.d/*samba");
+
+	} else if (strcmp(argv[1], "join") == 0) {
+		if (argc == 4) {
+			snprintf(command, BUFFER_SIZE - 1, "/usr/bin/net join -U \"%s%%%s\"",
+				argv[2], argv[3]);
+			return safe_system(command);
+		} else {
+			fprintf(stderr, "Wrong number of arguments. Need username and password.\n");
+			return 1;
+		}
+	}
+
+	return 0;
 }