If there was a group with a space, delete all the user-defined groups before hitting local_sync_accounts so pw doesn't get hung up. Ticket #6012

1 files changed, 13 insertions, 0 deletions

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index eaa7ae1..131535e 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4725,8 +4725,10 @@ function upgrade_147_to_148() {
 			$exgrps[] = $grp['name'];
 		}
 
+		$cleargroups = false;
 		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
@@ -4737,6 +4739,17 @@ function upgrade_147_to_148() {
 				}
 			}
 		}
+
+		// if there was a space in a group name, there may be multiple
+		// groups with the same name in the group file. To prevent pw 
+		// from getting into a neverending loop, delete all user-defined
+		// groups here. local_sync_accounts will run shortly after this
+		// and add them back. redmine #6012
+		if ($cleargroups) {
+			foreach ($config['system']['group'] as $grp) {
+				mwexec("/usr/sbin/pw groupdel -g {$grp['gid']}");
+			}
+		}
 	}
 }
 ?>