Samba-Update von Maniac...

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

diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index 4f3f248bd77b1ab24bb71d2e2919519fb39631d4..568af05e36a4f7e175aa9b8b781fce2a0003deb4 100644 (file)
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -1,11 +1,17 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
 #include "setuid.h"
 
-int main(int argc, char**argv)
+#define BUFFER_SIZE 1024
+
+char command[BUFFER_SIZE]; 
+
+int main(int argc, char *argv[])
 {
-       char commandstring[256];
 
         if (!(initsetuid()))
                 exit(1);
@@ -17,77 +23,88 @@ int main(int argc, char**argv)
             return 1;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbuserdisable")==0)
+        if (strcmp(argv[1], "smbuserdisable")==0)
         {
-            snprintf(commandstring,STRING_SIZE-1,"/usr/bin/smbpasswd -d %s",argv[2]);
-            safe_system(commandstring);
+            snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -d %s", argv[2]);
+            safe_system(command);
+            printf(command);
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbuserenable")==0)
+        if (strcmp(argv[1], "smbuserenable")==0)
         {
-            snprintf(commandstring,STRING_SIZE-1,"/usr/bin/smbpasswd -e %s",argv[2]);
-            safe_system(commandstring);
+            snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -e %s", argv[2]);
+            safe_system(command);
+            printf(command);
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbuserdelete")==0)
+        if (strcmp(argv[1], "smbuserdelete")==0)
         {
-            snprintf(commandstring,STRING_SIZE-1,"/usr/bin/smbpasswd -x %s",argv[2]);
-            safe_system(commandstring);
+            snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -x %s", argv[2]);
+            safe_system(command);
+            printf(command);
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/userdel %s", argv[2]);
+            safe_system(command);
+            printf(command);
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbsafeconf")==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 (argc==2 && strcmp(argv[1], "smbglobalreset")==0)
+        if (strcmp(argv[1], "smbglobalreset")==0)
         {
-            safe_system("/bin/cat /var/ipfire/samba/global.default /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf");
+            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");
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbsharesreset")==0)
+        if (strcmp(argv[1], "smbsharesreset")==0)
         {
-            safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares.default > /var/ipfire/samba/smb.conf");
+            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 (argc==2 && strcmp(argv[1], "smbrestart")==0)
+        if (strcmp(argv[1], "smbrestart")==0)
         {
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbstop")==0)
+        if (strcmp(argv[1], "smbstop")==0)
         {
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbstart")==0)
+        if (strcmp(argv[1], "smbstart")==0)
         {
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "smbuseradd")==0)
+        if (strcmp(argv[1], "smbuseradd")==0)
         {
-            snprintf(commandstring,STRING_SIZE-1,"/usr/sbin/useradd -c 'Samba User' -d /opt/samba -g 2110 -p %s -s /bin/false %s",argv[3],argv[2]);
-            safe_system(commandstring);
-            snprintf(commandstring,STRING_SIZE-1,"/bin/printf '%s\n%s\n' | /usr/local/bin/smbpasswd -as %s",argv[3],argv[3],argv[2]);
-            safe_system(commandstring);
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -d /opt/samba -g 2110 -p %s -s /bin/false %s", argv[3], 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 (argc==2 && strcmp(argv[1], "smbchangepw")==0)
+        if (strcmp(argv[1], "smbchangepw")==0)
         {
-            snprintf(commandstring,STRING_SIZE-1,"/bin/printf '%s\n%s\n' | /usr/local/bin/smbpasswd -as %s",argv[3],argv[3],argv[2]);
-            safe_system(commandstring);
+            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 (argc==2 && strcmp(argv[1], "readsmbpasswd")==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");
@@ -96,7 +113,7 @@ int main(int argc, char**argv)
             return 0;
         }
 
-        if (argc==2 && strcmp(argv[1], "locksmbpasswd")==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");
@@ -104,4 +121,12 @@ int main(int argc, char**argv)
             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;
+        }
 }