ports/121229: [patch] ports/security/vpnc incorrect .conf file search

[Helge Oldach]

>Number:         121229
>Category:       ports
>Synopsis:       [patch] ports/security/vpnc incorrect .conf file search
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 29 17:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 6.3-1132 i386
>Organization:
>Environment:

System: FreeBSD localhost 6.3-1132 FreeBSD 6.3-1132 #0: Fri Feb 15 19:26:49 CET 2008 toor at localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

The upgrade of ports/security/vpnc to version 0.5.1 introduced
some glitches against the documented behaviour. In particular,
the configuration files are not searched in the documented
locations: /usr/local/etc/vpnc/*.conf is not searched at all, and
/usr/local/etc/vpnc/default.conf is skipped, both in contrast to the
documentation.

>How-To-Repeat:

>Fix:

--- files/patch-config.c.orig	2008-02-27 22:52:01.000000000 +0100
+++ files/patch-config.c	2008-02-29 17:43:38.000000000 +0100
@@ -20,16 +20,17 @@
  	char *realname;
  	
 -	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
-+	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "%%PREFIX%%/etc/", name, add_dot_conf ? ".conf" : "");
++	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "%%PREFIX%%/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
  	return realname;
  }
  
-@@ -757,8 +757,7 @@
+@@ -757,8 +757,8 @@
  	}
  	
  	if (!got_conffile) {
 -		read_config_file("/etc/vpnc/default.conf", config, 1);
 -		read_config_file("/etc/vpnc.conf", config, 1);
++		read_config_file("%%PREFIX%%/etc/vpnc/default.conf", config, 1);
 +		read_config_file("%%PREFIX%%/etc/vpnc.conf", config, 1);
  	}
  	
>Release-Note:
>Audit-Trail:
>Unformatted: