X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c592128fda794f2679a117a881c2f7d86ae091e0..997887766267651908396c7906c7a0cd6e38f796:/tools/sync-users/sync-users.go

diff --git a/tools/sync-users/sync-users.go b/tools/sync-users/sync-users.go
index 45b6e96b87..626d9d0422 100644
--- a/tools/sync-users/sync-users.go
+++ b/tools/sync-users/sync-users.go
@@ -249,8 +249,10 @@ func doMain(cfg *ConfigParams) error {
 			return err
 		}
 		if uID == "" {
-			emptyUserIDs = append(emptyUserIDs, u.UUID)
-			log.Printf("Empty %s found in user %s - ignoring", cfg.UserID, u.UUID)
+			if u.UUID != cfg.AnonUserUUID && u.UUID != cfg.SysUserUUID {
+				emptyUserIDs = append(emptyUserIDs, u.UUID)
+				log.Printf("Empty %s found in user %s - ignoring", cfg.UserID, u.UUID)
+			}
 			continue
 		}
 		if cfg.CaseInsensitive {
@@ -372,7 +374,7 @@ type userRecord struct {
 
 func needsUpdating(user arvados.User, record userRecord) bool {
 	userData := userRecord{"", user.FirstName, user.LastName, user.IsActive, user.IsAdmin}
-	recordData := userRecord{"", record.FirstName, record.LastName, record.Active, record.Admin}
+	recordData := userRecord{"", record.FirstName, record.LastName, record.Active, record.Active && record.Admin}
 	return userData != recordData
 }
 
@@ -444,7 +446,6 @@ func ProcessRecord(cfg *ConfigParams, record userRecord, userIDToUUID map[string
 			}
 		}
 	}
-	allUsers[record.UserID] = user
 	if createRequired {
 		log.Printf("Created user %q", record.UserID)
 	}