Changeset 740 for vendor/current/source4/ntvfs/unixuid

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/ntvfs/unixuid

Files:

• config.m4 (deleted)
• config.mk (deleted)
• vfs_unixuid.c (modified) (8 diffs)
• wscript_build (added)

vendor/current/source4/ntvfs/unixuid/vfs_unixuid.c

@@ -30 +30 @@
 #include <tevent.h>
 
+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
+
+
 struct unixuid_private {
         struct wbc_context *wbc_ctx;
@@ -41 +51 @@
         uid_t uid;
         gid_t gid;
-        uint_t ngroups;
+        unsigned int ngroups;
         gid_t *groups;
 };
@@ -163 +173 @@
         int i;
         NTSTATUS status;
-        struct id_mapping *ids;
+        struct id_map *ids;
         struct composite_context *ctx;
         *sec = talloc(req, struct unix_sec_ctx);
@@ -172 +182 @@
         }
 
-        ids = talloc_array(req, struct id_mapping, token->num_sids);
+        ids = talloc_array(req, struct id_map, token->num_sids);
         NT_STATUS_HAVE_NO_MEMORY(ids);
-
-        ids[0].unixid = NULL;
-        ids[0].sid = token->user_sid;
-        ids[0].status = NT_STATUS_NONE_MAPPED;
-
-        ids[1].unixid = NULL;
-        ids[1].sid = token->group_sid;
-        ids[1].status = NT_STATUS_NONE_MAPPED;
 
         (*sec)->ngroups = token->num_sids - 2;
@@ -187 +189 @@
         NT_STATUS_HAVE_NO_MEMORY((*sec)->groups);
 
-        for (i=0;i<(*sec)->ngroups;i++) {
-                ids[i+2].unixid = NULL;
-                ids[i+2].sid = token->sids[i+2];
-                ids[i+2].status = NT_STATUS_NONE_MAPPED;
+        for (i=0;i<token->num_sids;i++) {
+                ZERO_STRUCT(ids[i].xid);
+                ids[i].sid = &token->sids[i];
+                ids[i].status = ID_UNKNOWN;
         }
 
@@ -199 +201 @@
         NT_STATUS_NOT_OK_RETURN(status);
 
-        if (ids[0].unixid->type == ID_TYPE_BOTH ||
-            ids[0].unixid->type == ID_TYPE_UID) {
-                (*sec)->uid = ids[0].unixid->id;
+        if (ids[0].xid.type == ID_TYPE_BOTH ||
+            ids[0].xid.type == ID_TYPE_UID) {
+                (*sec)->uid = ids[0].xid.id;
         } else {
                 return NT_STATUS_INVALID_SID;
         }
 
-        if (ids[1].unixid->type == ID_TYPE_BOTH ||
-            ids[1].unixid->type == ID_TYPE_GID) {
-                (*sec)->gid = ids[1].unixid->id;
+        if (ids[1].xid.type == ID_TYPE_BOTH ||
+            ids[1].xid.type == ID_TYPE_GID) {
+                (*sec)->gid = ids[1].xid.id;
         } else {
                 return NT_STATUS_INVALID_SID;
@@ -214 +216 @@
 
         for (i=0;i<(*sec)->ngroups;i++) {
-                if (ids[i+2].unixid->type == ID_TYPE_BOTH ||
-                    ids[i+2].unixid->type == ID_TYPE_GID) {
-                        (*sec)->groups[i] = ids[i+2].unixid->id;
+                if (ids[i+2].xid.type == ID_TYPE_BOTH ||
+                    ids[i+2].xid.type == ID_TYPE_GID) {
+                        (*sec)->groups[i] = ids[i+2].xid.id;
                 } else {
                         return NT_STATUS_INVALID_SID;
@@ -236 +238 @@
         NTSTATUS status;
 
-        if (req->session_info == NULL) {
+        /* If we are asked to set up, but have not had a successful
+         * session setup or tree connect, then these may not be filled
+         * in.  ACCESS_DENIED is the right error code here */
+        if (req->session_info == NULL || priv == NULL) {
                 return NT_STATUS_ACCESS_DENIED;
         }