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, master has been updated via ba149d470bcc8056f4e55ddeef7aa90eb1f54313 (commit) from 0f72e41927ebe5efe9cc6ef223caa88c1accf3f0 (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 ba149d470bcc8056f4e55ddeef7aa90eb1f54313 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 29 14:24:47 2010 +0200

Fix ipsectrl I and ipsectrl R terminate vpn-watch.

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

Summary of changes: src/misc-progs/ipsecctrl.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-)

Difference in files: diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index aa0f41c..16fc86b 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -172,6 +172,17 @@ int main(int argc, char *argv[]) {

FILE *file = NULL;

+ + if (strcmp(argv[1], "I") == 0) { + safe_system("/usr/sbin/ipsec whack --status"); + exit(0); + } + + if (strcmp(argv[1], "R") == 0) { + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); + exit(0); + } + /* Get vpnwatch pid */

if ( (argc == 2) && (file = fopen("/var/run/vpn-watch.pid", "r"))) { @@ -197,16 +208,6 @@ int main(int argc, char *argv[]) { exit(0); }

- if (strcmp(argv[1], "R") == 0) { - safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); - exit(0); - } - - if (strcmp(argv[1], "I") == 0) { - safe_system("/usr/sbin/ipsec whack --status"); - exit(0); - } - }

/* clear iptables vpn rules */

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