Changeset 149 for trunk/samba/source/auth

Timestamp:

Aug 20, 2008, 9:10:33 AM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to v3.2.2

File:

• trunk/samba/source/auth/auth_util.c (modified) (3 diffs)

trunk/samba/source/auth/auth_util.c

@@ -26 +26 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
+
+/****************************************************************************
+ Ensure primary group SID is always at position 0 in a 
+ auth_serversupplied_info struct.
+****************************************************************************/
+
+static void sort_sid_array_for_smbd(auth_serversupplied_info *result,
+                                const DOM_SID *pgroup_sid)
+{
+        unsigned int i;
+
+        if (!result->sids) {
+                return;
+        }
+
+        if (sid_compare(&result->sids[0], pgroup_sid)==0) {
+                return;
+        }
+
+        for (i = 1; i < result->num_sids; i++) {
+                if (sid_compare(pgroup_sid,
+                                &result->sids[i]) == 0) {
+                        sid_copy(&result->sids[i], &result->sids[0]);
+                        sid_copy(&result->sids[0], pgroup_sid);
+                        return;
+                }
+        }
+}
 
 /****************************************************************************
@@ -1680 +1708 @@
         }
 
+        /* Ensure the primary group sid is at position 0. */
+        sort_sid_array_for_smbd(result, &group_sid);
+
         result->login_server = talloc_strdup(result,
                                              info3->base.logon_server.string);
@@ -1915 +1946 @@
                 memcpy(&result->sids[i], &info->sids[i+2].sid, sizeof(result->sids[i]));
         }
+
+        /* Ensure the primary group sid is at position 0. */
+        sort_sid_array_for_smbd(result, &group_sid);
 
         /* ensure we are never given NULL session keys */