Changeset 745 for trunk/server/source3/registry/reg_dispatcher.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/registry/reg_dispatcher.c (modified) (4 diffs)

trunk/server/source3/registry/reg_dispatcher.c

@@ -25 +25 @@
 
 #include "includes.h"
+#include "registry.h"
+#include "reg_dispatcher.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
@@ -35 +38 @@
 ********************************************************************/
 
-static WERROR construct_registry_sd(TALLOC_CTX *ctx, SEC_DESC **psd)
-{
-        SEC_ACE ace[3];
+static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor **psd)
+{
+        struct security_ace ace[3];
         size_t i = 0;
-        SEC_DESC *sd;
-        SEC_ACL *theacl;
+        struct security_descriptor *sd;
+        struct security_acl *theacl;
         size_t sd_size;
 
@@ -65 +68 @@
         }
 
-        sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+        sd = make_sec_desc(ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                            &global_sid_Builtin_Administrators,
                            &global_sid_System, NULL, theacl,
@@ -160 +163 @@
 bool regkey_access_check(struct registry_key_handle *key, uint32 requested,
                          uint32 *granted,
-                         const struct nt_user_token *token )
-{
-        SEC_DESC *sec_desc;
+                         const struct security_token *token )
+{
+        struct security_descriptor *sec_desc;
         NTSTATUS status;
         WERROR err;
+
+        /* root free-pass, like we have on all other pipes like samr, lsa, etc. */
+        if (geteuid() == sec_initial_uid()) {
+                *granted = REG_KEY_ALL;
+                return true;
+        }
 
         /* use the default security check if the backend has not defined its