diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-08-24 19:29:24 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-08-24 19:29:24 -0400 |
| commit | 9d3dab70dbe1417a56eef28798883b0e7c6ed279 (patch) | |
| tree | 4d25fd3e455e9a5fd34c285bac40885e6c4b7ac6 /etc/inc | |
| parent | 44c10295114daaf8d65a0502f01f1d27131f1623 (diff) | |
| download | pfsense-9d3dab70dbe1417a56eef28798883b0e7c6ed279.zip pfsense-9d3dab70dbe1417a56eef28798883b0e7c6ed279.tar.gz | |
Oops, part of the git merge sneaked in here. Remove
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 161133b..e8848c8 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1740,11 +1740,6 @@ function upgrade_058_to_059() { function upgrade_059_to_060() { global $config; -<<<<<<< HEAD:etc/inc/upgrade_config.inc - /* Insert upgrade code here */ -} - -======= if (is_array($config['system']['ca'])) { @@ -1761,9 +1756,8 @@ function upgrade_059_to_060() { } /* Locate issuer for all certificates */ - if (is_array($config['system']['cert'])) - foreach ($config['system']['cert'] as & $cert) - { + if (is_array($config['system']['cert'])) { + foreach ($config['system']['cert'] as & $cert) { $subject = cert_get_subject($cert['crt']); $issuer = cert_get_issuer($cert['crt']); if($issuer <> $subject) { @@ -1772,8 +1766,8 @@ function upgrade_059_to_060() { $cert['caref'] = $issuer_crt['refid']; } } - + } } } -?> +?>
\ No newline at end of file |
