Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/server/editgdpuser.py

@@ -4,7 +4,7 @@
 # --- BEGIN_HEADER ---
 #
 # editgdpuser - Edit a MiG GDP user
-# Copyright (C) 2003-2022  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2024  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -146,9 +146,9 @@ def usage(name='editgdpuser.py'):
         sys.exit(1)
 
     # Remove empty value fields
-
-    for (key, val) in user_dict.items():
-        if not val:
+    # NOTE: force list copy here as we delete inline below
+    for key in list(user_dict):
+        if not user_dict[key]:
             del user_dict[key]
 
     if account_state:

mig/server/edituser.py

@@ -4,7 +4,7 @@
 # --- BEGIN_HEADER ---
 #
 # edituser - Edit a MiG user
-# Copyright (C) 2003-2022  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2024  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -168,9 +168,9 @@ def usage(name='edituser.py'):
         user_dict['role'] = role
 
     # Remove empty value fields
-
-    for (key, val) in user_dict.items():
-        if not val:
+    # NOTE: force list copy here as we delete inline below
+    for key in list(user_dict):
+        if not user_dict[key]:
             del user_dict[key]
 
     if verbose:

mig/shared/useradm.py

@@ -2211,7 +2211,9 @@ def fix_userdb_keys(
                     unlock_user_db(flock)
                 raise Exception('Failed to load user DB: %s' % err)
 
-    for (client_id, user) in user_db.items():
+    # NOTE: force list copy here as we delete inline below
+    for client_id in list(user_db):
+        user = user_db[client_id]
         fill_distinguished_name(user)
         old_id = client_id
         new_id = user['distinguished_name']