[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d0fcb09edd3929dda72d23afd3a8d16f7713794

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d0fcb09edd3929dda72d23afd3a8d16f7713794

[git]

[-- Attachment #1: Type: text/plain, Size: 1820 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  1d0fcb09edd3929dda72d23afd3a8d16f7713794 (commit)
      from  36e1dc20f4d763b8069a4c973ef8ff792786229e (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 1d0fcb09edd3929dda72d23afd3a8d16f7713794
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Fri Dec 7 17:00:46 2012 +0100

    OpenVPN ccd: fix creation of ccd directory via ovpn-ccd-convert script
    
    Fixes #10263.

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

Summary of changes:
 src/scripts/ovpn-ccd-convert | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index 86b7c94..c54e256 100644
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -1,13 +1,15 @@
 #!/usr/bin/perl
-
+# Converter script for old openvpn clients
 my %net=();
 my %ovpnconfig=();
 my @serverconf=();
 my $greennet;
 my $greensubnet;
 my $running='off';
-require '/var/ipfire/general-functions.pl';
 
+require '/var/ipfire/general-functions.pl';
+unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); }
+system ("chown nobody.nobody ${General::swroot}/ovpn/ccd");
 if ( -e "/var/run/openvpn.pid"){
 	$running='on';
 	system('/usr/local/bin/openvpnctrl', '-k');


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