[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e2683f70da85bd099fdbdb70d47facac5246606

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e2683f70da85bd099fdbdb70d47facac5246606

[git]

[-- Attachment #1: Type: text/plain, Size: 2371 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  8e2683f70da85bd099fdbdb70d47facac5246606 (commit)
      from  463f9edeb2034b0e0a360f372b9752cc1a0540cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8e2683f70da85bd099fdbdb70d47facac5246606
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 16 12:04:29 2013 +0200

    ipsecctrl: Re-read everything when configuration is reloaded.

-----------------------------------------------------------------------

Summary of changes:
 src/misc-progs/ipsecctrl.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 633004e..365807c 100644
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -144,8 +144,8 @@ void turn_connection_on(char *name, char *type) {
                 "/usr/sbin/ipsec down %s >/dev/null", name);
         safe_system(command);
 
-	// Reload the configuration into the daemon.
-	safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
+	// Reload the configuration into the daemon (#10339).
+	ipsec_reload();
 
 	// Bring the connection up again.
 	snprintf(command, STRING_SIZE - 1,
@@ -169,7 +169,15 @@ void turn_connection_off (char *name) {
         safe_system(command);
 
 	// Reload, so the connection is dropped.
-        safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
+	ipsec_reload();
+}
+
+void ipsec_reload() {
+	/* Re-read all configuration files and secrets and
+	 * reload the daemon (#10339).
+	 */
+	safe_system("/usr/sbin/ipsec rereadall >/dev/null 2>&1");
+	safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
 }
 
 int main(int argc, char *argv[]) {
@@ -193,7 +201,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (strcmp(argv[1], "R") == 0) {
-                safe_system("/usr/sbin/ipsec reload >/dev/null 2>&1");
+		ipsec_reload();
                 exit(0);
         }
 


hooks/post-receive
--
IPFire 2.x development tree