Back-out the share acl fix. Not needed (Gerald has been telling porkies

again :-) :-).
Jeremy.

diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index f1dabd64a90ed0408520834e811964e452b8aef8..2ae4a738740344c421df680659a72d85749ec7dc 100644 (file)
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -310,7 +310,6 @@ BOOL share_access_check(connection_struct *conn, int snum, uint16 vuid, uint32 d
        NT_USER_TOKEN *token = NULL;
        user_struct *vuser = get_valid_user_struct(vuid);
        BOOL ret = True;
-       BOOL is_root = False;
 
        mem_ctx = talloc_init();
        if (mem_ctx == NULL)
@@ -321,24 +320,12 @@ BOOL share_access_check(connection_struct *conn, int snum, uint16 vuid, uint32 d
        if (!psd)
                goto out;
 
-       if (vuser) {
+       if (vuser)
                token = vuser->nt_user_token;
-               if (vuser->uid == (uid_t)0)
-                       is_root = True;
-       } else {
+       else
                token = conn->nt_user_token;
-               if (conn->uid == (uid_t)0)
-                       is_root = True;
-       }
 
-       /*
-        * Root gets a free pass.
-        */
-
-       if (is_root)
-               ret = True;
-       else
-               ret = se_access_check(psd, token, desired_access, &granted, &status);
+       ret = se_access_check(psd, token, desired_access, &granted, &status);
 
   out: