Author: Antonio Borneo
Date: Sun Dec 1 13:23:32 2013
New Revision: 535
Log:
make pidfile writing work again
Patch present in openSUSE package.
/var/run can be cleared on every boot (tmpfs) and thus folder
/var/run/vpnc would not exist.
Just use /var/run/vpnc.pid instead of /var/run/vpnc/pid, vpnc
needs to run as root anyway, so this should be fine.
vpnc-script is still using /var/run/vpnc for other stuff (resolv.conf
backup etc) but creates the directory on demand, so no harm is done
there.
This patch fix the case of vpnc run without executing the default
vpnc-script
Author: Stefan Seyfried <seife+obs@b1-systems.com>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Modified:
branches/vpnc-nortel/config.c
branches/vpnc-nortel/vpnc-disconnect
trunk/config.c
trunk/vpnc-disconnect
Modified: branches/vpnc-nortel/config.c
==============================================================================
--- branches/vpnc-nortel/config.c (original)
+++ branches/vpnc-nortel/config.c Sun Dec 1 13:23:32 2013
@@ -198,7 +198,7 @@
static const char *config_def_pid_file(void)
{
- return "/var/run/vpnc/pid";
+ return "/var/run/vpnc.pid";
}
static const char *config_def_vendor(void)
Modified: branches/vpnc-nortel/vpnc-disconnect
==============================================================================
--- branches/vpnc-nortel/vpnc-disconnect (original)
+++ branches/vpnc-nortel/vpnc-disconnect Sun Dec 1 13:23:32 2013
@@ -1,6 +1,6 @@
#!/bin/sh
-pid=/var/run/vpnc/pid
+pid=/var/run/vpnc.pid
if [ $# -ne 0 ]; then
echo "Usage: $0" 1>&2
Modified: trunk/config.c
==============================================================================
--- trunk/config.c (original)
+++ trunk/config.c Sun Dec 1 13:23:32 2013
@@ -192,7 +192,7 @@
static const char *config_def_pid_file(void)
{
- return "/var/run/vpnc/pid";
+ return "/var/run/vpnc.pid";
}
static const char *config_def_vendor(void)
Modified: trunk/vpnc-disconnect
==============================================================================
--- trunk/vpnc-disconnect (original)
+++ trunk/vpnc-disconnect Sun Dec 1 13:23:32 2013
@@ -1,6 +1,6 @@
#!/bin/sh
-pid=/var/run/vpnc/pid
+pid=/var/run/vpnc.pid
if [ $# -ne 0 ]; then
echo "Usage: $0" 1>&2
_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/
Date: Sun Dec 1 13:23:32 2013
New Revision: 535
Log:
make pidfile writing work again
Patch present in openSUSE package.
/var/run can be cleared on every boot (tmpfs) and thus folder
/var/run/vpnc would not exist.
Just use /var/run/vpnc.pid instead of /var/run/vpnc/pid, vpnc
needs to run as root anyway, so this should be fine.
vpnc-script is still using /var/run/vpnc for other stuff (resolv.conf
backup etc) but creates the directory on demand, so no harm is done
there.
This patch fix the case of vpnc run without executing the default
vpnc-script
Author: Stefan Seyfried <seife+obs@b1-systems.com>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Modified:
branches/vpnc-nortel/config.c
branches/vpnc-nortel/vpnc-disconnect
trunk/config.c
trunk/vpnc-disconnect
Modified: branches/vpnc-nortel/config.c
==============================================================================
--- branches/vpnc-nortel/config.c (original)
+++ branches/vpnc-nortel/config.c Sun Dec 1 13:23:32 2013
@@ -198,7 +198,7 @@
static const char *config_def_pid_file(void)
{
- return "/var/run/vpnc/pid";
+ return "/var/run/vpnc.pid";
}
static const char *config_def_vendor(void)
Modified: branches/vpnc-nortel/vpnc-disconnect
==============================================================================
--- branches/vpnc-nortel/vpnc-disconnect (original)
+++ branches/vpnc-nortel/vpnc-disconnect Sun Dec 1 13:23:32 2013
@@ -1,6 +1,6 @@
#!/bin/sh
-pid=/var/run/vpnc/pid
+pid=/var/run/vpnc.pid
if [ $# -ne 0 ]; then
echo "Usage: $0" 1>&2
Modified: trunk/config.c
==============================================================================
--- trunk/config.c (original)
+++ trunk/config.c Sun Dec 1 13:23:32 2013
@@ -192,7 +192,7 @@
static const char *config_def_pid_file(void)
{
- return "/var/run/vpnc/pid";
+ return "/var/run/vpnc.pid";
}
static const char *config_def_vendor(void)
Modified: trunk/vpnc-disconnect
==============================================================================
--- trunk/vpnc-disconnect (original)
+++ trunk/vpnc-disconnect Sun Dec 1 13:23:32 2013
@@ -1,6 +1,6 @@
#!/bin/sh
-pid=/var/run/vpnc/pid
+pid=/var/run/vpnc.pid
if [ $# -ne 0 ]; then
echo "Usage: $0" 1>&2
_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/