Mac installer: When checking for duplicate group membership entries, …

…count only whole words svn path=/trunk/boinc/; revision=25506
MrBrain295 · Mar 29, 2012 · 9268bde · 9268bde
1 parent fb20906
commit 9268bde
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/checkin_notes b/checkin_notes
@@ -3129,3 +3129,11 @@ David  27 Mar 2012
         vda.cpp
         vdad.cpp
         sched_vda.cpp
+
+Charlie 29 Mar 2012
+    - Mac installer: When checking for duplicate group membership entries, 
+        count only whole words (preceded and followed by white space) so
+        that if we have both 'jon' and 'jones' we don't count 'jon' twice.
+
+    mac_installer/
+        PostInstall.cpp
diff --git a/mac_installer/PostInstall.cpp b/mac_installer/PostInstall.cpp
@@ -1071,7 +1071,7 @@ int CountGroupMembershipEntries(const char *userName, const char *groupName) {
     int                 count = 0;
     char                cmd[512], buf[2048];
     FILE                *f;
-    char                *p;
+    char                *p, *q;
 
     // getgrnam(groupName)->gr_mem[] only returns one entry, so we must use dscl
     sprintf(cmd, "dscl . -read /Groups/%s GroupMembership", groupName);
@@ -1085,9 +1085,13 @@ int CountGroupMembershipEntries(const char *userName, const char *groupName) {
         while (p) {
             p = strstr(p, userName);
             if (p) {
-                ++ count;
+                q = p-1;
                 p += strlen(userName);
-
+                // Count only whole words (preceded and followed by white space) so 
+                // that if we have both 'jon' and 'jones' we don't count 'jon' twice
+                if (isspace(*q) && isspace(*p)) {
+                    ++ count;
+               }
             }
         }
     }