From d6e01cdb3dfe66ee4e52364d73dbb856f6f15ee9 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 28 Apr 2008 03:01:11 +0000
Subject: move variable assignment more near to the code it is used in

---
 etc/inc/openvpn.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'etc/inc/openvpn.inc')

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 70291e2..c1366ad 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -509,8 +509,6 @@ EOD;
 		$openvpn_conf .= "route $ip $mask\n";
 	}
 
-		$caname = $settings['cipherpki'];
-
         // Write the settings for the keys
         // Set the keys up
         $base_file = $g['varetc_path'] . "/openvpn/certificates/";
@@ -518,6 +516,7 @@ EOD;
         if ($settings['auth_method'] == 'shared_key')
                 $keys[] = array('field' => 'shared.key', 'ext'  => 'secret', 'directive' => 'secret');
         else {
+				$caname = $settings['cipherpki'];
                 $keys[] = array('field' => 'ca.crt', 'directive' => 'ca');
                 $keys[] = array('field' => "{$caname}.crt", 'directive' => 'cert');
                 $keys[] = array('field' => "{$caname}.key", 'directive' => 'key');
-- 
cgit v1.1