From 9b49646252fb3b91c9bbea6182d33846c6f49988 Mon Sep 17 00:00:00 2001
From: jim-p <jim@pingle.org>
Date: Mon, 26 Apr 2010 17:01:49 -0400
Subject: Lookup user cert before trying to use it.

---
 config/openvpn-client-export/openvpn-client-export.inc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config/openvpn-client-export/openvpn-client-export.inc')

diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index 58fea40e..6db3651f 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -121,6 +121,14 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoke
 		}
 	}
 
+	// lookup user certificate info
+	if ($settings['mode'] != "server_user") {
+		$cert =& $user['cert'][$crtid];
+		if (!$cert)
+			return false;
+	} else
+		$nokeys = true;
+
 	// determine basic variables
 	if ($useaddr == "serveraddr") {
 		$interface = $settings['interface'];
-- 
cgit v1.2.3