diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-03-29 13:21:40 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-03-29 13:21:40 -0500 |
| commit | f788b1e27563886bfee53e07f408e0ea432fa4ac (patch) | |
| tree | 749fb2837234dba04bad57f3d38923338acb0a36 /src/etc/inc/upgrade_config.inc | |
| parent | 7ec892af55d35e49e05c0030c59efd5d7b91e928 (diff) | |
| download | pfsense-f788b1e27563886bfee53e07f408e0ea432fa4ac.zip pfsense-f788b1e27563886bfee53e07f408e0ea432fa4ac.tar.gz | |
Rather than renaming groups with spaces, mark their scope as remote. Ticket #6012
Diffstat (limited to 'src/etc/inc/upgrade_config.inc')
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 2b02d80..0f81bab 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4729,14 +4729,7 @@ function upgrade_147_to_148() { foreach ($config['system']['group'] as $idx => $grp) { if (strstr($grp['name'], " ")) { $cleargroups = true; - $newgrpname = str_replace(" ", "_", $grp['name']); - // In the unlikely event that there is already a group with this name - // just replace the whole thing with a unique string - if (in_array($newgrpname, $exgrps)) { - $config['system']['group'][$idx]['name'] = uniqid(); - } else { - $config['system']['group'][$idx]['name'] = $newgrpname; - } + $config['system']['group'][$idx]['scope'] = "remote"; } } |
