From 8fefb9dd2202f4b13b4e97cb4926736158bcb0ca Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 1 Sep 2010 17:01:17 -0400
Subject: [PATCH] Upgrade code to merge user certificates with normal
 certificates.

---
 etc/inc/upgrade_config.inc | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index b4a4507538..d17fc1d9e3 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2167,4 +2167,29 @@ function upgrade_067_to_068() {
 	}
 }
 
+function upgrade_067_to_068() {
+	global $config;
+	if (!is_array($config['system']['user']))
+		return;
+	foreach ($config['system']['user'] as & $user) {
+		if (!is_array($user['cert']))
+			continue;
+		$rids = array();
+		foreach ($user['cert'] as $id => $cert) {
+			if (!isset($cert['name']))
+				continue;
+			$tcert = $cert;
+			// Make sure each cert gets a refid
+			if (!isset($tcert['refid']))
+				$tcert['refid'] = uniqid();
+			// Keep the cert references for this user
+			$rids[] = $tcert['refid'];
+			$config['cert'][] = $tcert;
+		}
+		// Replace user certs with cert references instead.
+		if (count($rids) > 0)
+			$user['cert'] = $rids;
+	}
+}
+
 ?>