Remove output of "ipsecctrl R".

:

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 0294b1cc3493b32bc784cab48bf620340f06209b..6af5ed451cf9cc9c53f7fd0676829cbbbc73ff5a 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -582,7 +582,7 @@ END
     $cahash{$key}[1] = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem"));
     &General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash);
 
     $cahash{$key}[1] = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem"));
     &General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash);
 

-    my $temp = `/usr/local/bin/ipsecctrl R`;
+    system('/usr/local/bin/ipsecctrl', 'R');

     sleep $sleepDelay;
 
     UPLOADCA_ERROR:
     sleep $sleepDelay;
 
     UPLOADCA_ERROR:

diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index aa6b8a422e211273b096908ee99afa4b63eac82a..aa0f41c4d756edb56232c7ccaf99d66c7f7fc317 100644 (file)
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -198,7 +198,7 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (strcmp(argv[1], "R") == 0) {
                 }
 
                 if (strcmp(argv[1], "R") == 0) {

-                        safe_system("/usr/sbin/ipsec whack --rereadall");
+                        safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");

                         exit(0);
                 }
 
                         exit(0);
                 }