X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fmisc-progs%2Ftripwirectrl.c;h=c67b3eeb8b6eb6d3dcf22e7f85f84e8c27fd8126;hp=f35ef77f858df6fcb8f1d07f5904ea5a98b3c051;hb=1cdddb1205ca1753bda8a5f74dfa1cafcde736bb;hpb=2ed35f39ed7394bfbc96210943b3cabd713ce463

diff --git a/src/misc-progs/tripwirectrl.c b/src/misc-progs/tripwirectrl.c
index f35ef77f8..c67b3eeb8 100644
--- a/src/misc-progs/tripwirectrl.c
+++ b/src/misc-progs/tripwirectrl.c
@@ -25,83 +25,76 @@ int main(int argc, char *argv[])
 
         if (strcmp(argv[1], "tripwirelog")==0)
         {
-        char log; 
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twprint -m r --twrfile /var/ipfire/tripwire/report/%s", argv[2]);
-            log=safe_system(command);
-            printf(command);
-            return(log);
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twprint -m r --cfgfile /var/ipfire/tripwire/tw.cfg --twrfile /var/ipfire/tripwire/report/%s", argv[2]);
+            safe_system(command);
+            return 0;
         }
 
         if (strcmp(argv[1], "generatereport")==0)
         {
-            safe_system("/usr/sbin/tripwire --check --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg");
-            printf(command);
+            safe_system("/usr/sbin/tripwire --check --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol");
             return 0;
         }
 
         if (strcmp(argv[1], "updatedatabase")==0)
         {
-        char file; 
-            file=safe_system("ls -S | tail -1");
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --update --accept-all --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg --local-passphrase %s --twrfile %s", argv[2], file);
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --update --accept-all --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol --local-passphrase %s --twrfile %s", argv[2], argv[3]);
             safe_system(command);
-            printf(command);
             return 0;
         }
 
         if (strcmp(argv[1], "keys")==0)
         {
+            printf("\nGenerating Site-Key");
             snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/site.key && /usr/sbin/twadmin --generate-keys --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s && chmod 640 /var/ipfire/tripwire/site.key", argv[2]);
             safe_system(command);
-            printf(command);
-            snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/$(HOSTNAME)-local.key && /usr/sbin/twadmin --generate-keys --local-keyfile /var/ipfire/tripwire/$(HOSTNAME)-local.key --local-passphrase %s && chmod 640 /var/ipfire/tripwire/$(HOSTNAME)-local.key", argv[3]);
+            printf("\nGenerating Local-Key");
+            snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/local.key && /usr/sbin/twadmin --generate-keys --local-keyfile /var/ipfire/tripwire/local.key --local-passphrase %s && chmod 640 /var/ipfire/tripwire/local.key", argv[3]);
             safe_system(command);
-            printf(command);
+            printf("\nGenerating Config File");
             snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/tw.cfg && /usr/sbin/twadmin --create-cfgfile --cfgfile /var/ipfire/tripwire/tw.cfg --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s /var/ipfire/tripwire/twcfg.txt && chmod 640 /var/ipfire/tripwire/tw.cfg", argv[2]);
             safe_system(command);
-            printf(command);
+            printf("\nGenerating Policy File");
             snprintf(command, BUFFER_SIZE-1, "rm -rf /var/ipfire/tripwire/tw.pol && /usr/sbin/twadmin --create-polfile --cfgfile /var/ipfire/tripwire/tw.cfg --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s /var/ipfire/tripwire/twpol.txt && chmod 640 /var/ipfire/tripwire/tw.pol", argv[2]);
             safe_system(command);
-            printf(command);
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.cfg --site-passphrase %s", argv[2]);
+            printf("\nInitialising - This may take a while depending on your Policy");
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init --cfgfile /var/ipfire/tripwire/tw.cfg --polfile /var/ipfire/tripwire/tw.pol --local-passphrase %s", argv[3]);
             safe_system(command);
-            printf(command);
             return 0;
         }
 
         if (strcmp(argv[1], "generatepolicy")==0)
         {
+            printf("\nGenerating Policy File");
             snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twadmin --generate-polfile --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s --polfile /var/ipfire/tripwire/tw.pol --cfgfile /var/ipfire/tripwire/tw.cfg /var/ipfire/tripwire/twpol.txt", argv[2]);
             safe_system(command);
-            printf(command);
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init -c /var/ipfire/tripwire/tw.cfg -p /var/ipfire/tripwire/tw.cfg --site-passphrase %s", argv[2]);
+            printf("\nInitialising - This may take a while depending on your Policy");
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init -c /var/ipfire/tripwire/tw.cfg -p /var/ipfire/tripwire/tw.cfg --local-passphrase %s", argv[3]);
             safe_system(command);
-            printf(command);
             return 0;
         }
 
         if (strcmp(argv[1], "resetpolicy")==0)
         {
+            printf("\nGenerating Policy File");
             snprintf(command, BUFFER_SIZE-1, "/usr/sbin/twadmin --generate-polfile --site-keyfile /var/ipfire/tripwire/site.key --site-passphrase %s --polfile /var/ipfire/tripwire/tw.pol --cfgfile /var/ipfire/tripwire/tw.cfg /var/ipfire/tripwire/twpol.default", argv[2]);
             safe_system(command);
-            printf(command);
-            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init -c /var/ipfire/tripwire/tw.cfg -p /var/ipfire/tripwire/tw.cfg --site-passphrase %s", argv[2]);
+            printf("\nInitialising - This may take a while depending on your Policy");
+            snprintf(command, BUFFER_SIZE-1, "/usr/sbin/tripwire --init -c /var/ipfire/tripwire/tw.cfg -p /var/ipfire/tripwire/tw.cfg --local-passphrase %s", argv[3]);
             safe_system(command);
-            printf(command);
             return 0;
         }
 
         if (strcmp(argv[1], "readconfig")==0)
         {
             safe_system("/bin/chown nobody:nobody /var/ipfire/tripwire/twcfg.txt");
-            printf(command);
             return 0;
         }
 
         if (strcmp(argv[1], "lockconfig")==0)
         {
             safe_system("/bin/chown root:root /var/ipfire/tripwire/twcfg.txt");
-            printf(command);
             return 0;
         }
+return 0;
 }
\ No newline at end of file