Changeset 222 for branches/samba-3.3.x/source/smbd/uid.c

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

File:

• branches/samba-3.3.x/source/smbd/uid.c (modified) (3 diffs)

branches/samba-3.3.x/source/smbd/uid.c

@@ -257 +257 @@
         if((group_c = *lp_force_group(snum))) {
 
+                SMB_ASSERT(conn->force_group_gid != (gid_t)-1);
+
                 if(group_c == '+') {
 
@@ -269 +271 @@
                         for (i = 0; i < num_groups; i++) {
                                 if (group_list[i]
-                                    == conn->server_info->utok.gid) {
-                                        gid = conn->server_info->utok.gid;
+                                    == conn->force_group_gid) {
+                                        conn->server_info->utok.gid =
+                                                conn->force_group_gid;
+                                        gid = conn->force_group_gid;
                                         gid_to_sid(&conn->server_info->ptok
                                                    ->user_sids[1], gid);
@@ -277 +281 @@
                         }
                 } else {
-                        gid = conn->server_info->utok.gid;
+                        conn->server_info->utok.gid = conn->force_group_gid;
+                        gid = conn->force_group_gid;
                         gid_to_sid(&conn->server_info->ptok->user_sids[1],
                                    gid);