Changeset 745 for trunk/server/source4/rpc_server/winreg

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)
• source4/rpc_server/winreg/rpc_winreg.c (modified) (20 diffs)

trunk/server/source4/rpc_server/winreg/rpc_winreg.c

@@ -26 +26 @@
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/security.h"
+#include "libcli/security/session.h"
 
 enum handle_types { HTYPE_REGVAL, HTYPE_REGKEY };
@@ -37 +37 @@
 
         err = reg_open_samba(dce_call->context,
-                             &ctx, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, dce_call->conn->auth_state.session_info,
+                             &ctx, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx,
+                             dce_call->conn->auth_state.session_info,
                              NULL);
 
@@ -61 +62 @@
 
         h = dcesrv_handle_new(dce_call->context, HTYPE_REGKEY);
+        W_ERROR_HAVE_NO_MEMORY(h);
 
         result = reg_get_predefined_key(ctx, hkey,
@@ -98 +100 @@
         DCESRV_PULL_HANDLE_FAULT(h, r->in.handle, HTYPE_REGKEY);
 
-        talloc_free(h);
+        talloc_unlink(dce_call->context, h);
 
         ZERO_STRUCTP(r->out.handle);
@@ -122 +124 @@
         newh = dcesrv_handle_new(dce_call->context, HTYPE_REGKEY);
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
         case SECURITY_ADMINISTRATOR:
+                /* we support only non volatile keys */
+                if (r->in.options != REG_OPTION_NON_VOLATILE) {
+                        return WERR_NOT_SUPPORTED;
+                }
+
                 /* the security descriptor is optional */
                 if (r->in.secdesc != NULL) {
@@ -135 +142 @@
                                 return WERR_INVALID_PARAM;
                         }
-                        ndr_err = ndr_pull_struct_blob_all(&sdblob, mem_ctx, NULL, &sd,
+                        ndr_err = ndr_pull_struct_blob_all(&sdblob, mem_ctx, &sd,
                                                            (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
                         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -144 +151 @@
                 result = reg_key_add_name(newh, key, r->in.name.name, NULL,
                         r->in.secdesc?&sd:NULL, (struct registry_key **)&newh->data);
+
+                r->out.action_taken = talloc(mem_ctx, enum winreg_CreateAction);
+                if (r->out.action_taken == NULL) {
+                        talloc_free(newh);
+                        return WERR_NOMEM;
+                }
+                *r->out.action_taken = REG_ACTION_NONE;
+
                 if (W_ERROR_IS_OK(result)) {
                         r->out.new_handle = &newh->wire_handle;
+                        *r->out.action_taken = REG_CREATED_NEW_KEY;
                 } else {
                         talloc_free(newh);
                 }
-                
+
                 return result;
         default:
@@ -166 +182 @@
         struct dcesrv_handle *h;
         struct registry_key *key;
-
-        DCESRV_PULL_HANDLE_FAULT(h, r->in.handle, HTYPE_REGKEY);
-        key = h->data;
-
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        WERROR result;
+
+        DCESRV_PULL_HANDLE_FAULT(h, r->in.handle, HTYPE_REGKEY);
+        key = h->data;
+
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
         case SECURITY_ADMINISTRATOR:
-                return reg_key_del(key, r->in.key.name);
+                result = reg_key_del(mem_ctx, key, r->in.key.name);
+                talloc_unlink(dce_call->context, h);
+
+                return result;
         default:
                 return WERR_ACCESS_DENIED;
@@ -194 +214 @@
         key = h->data;
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
         case SECURITY_ADMINISTRATOR:
-                return reg_del_value(key, r->in.value.name);
+                return reg_del_value(mem_ctx, key, r->in.value.name);
         default:
                 return WERR_ACCESS_DENIED;
@@ -282 +302 @@
         }
 
-        /* check if there is enough room for the name */
-        if (r->in.name->size < 2*strlen_m_term(data_name)) {
-                return WERR_MORE_DATA;
-        }
-
         /* "data_name" is NULL when we query the default attribute */
         if (data_name != NULL) {
@@ -297 +312 @@
         r->out.name->size = r->in.name->size;
 
-        r->out.type = talloc(mem_ctx, uint32_t);
+        r->out.type = talloc(mem_ctx, enum winreg_Type);
         if (!r->out.type) {
                 return WERR_NOMEM;
         }
-        *r->out.type = data_type;
+        *r->out.type = (enum winreg_Type) data_type;
 
         /* check the client has enough room for the value */
@@ -337 +352 @@
         key = h->data;
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
@@ -399 +414 @@
         key = h->data;
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
@@ -422 +437 @@
                 return WERR_ACCESS_DENIED;
         }
-
 }
 
@@ -441 +455 @@
         key = h->data;
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
@@ -451 +465 @@
                         r->out.max_valnamelen, r->out.max_valbufsize);
 
+                if (r->out.max_subkeylen != NULL) {
+                        /* for UTF16 encoding */
+                        *r->out.max_subkeylen *= 2;
+                }
+                if (r->out.max_valnamelen != NULL) {
+                        /* for UTF16 encoding */
+                        *r->out.max_valnamelen *= 2;
+                }
+
                 if (classname != NULL) {
                         r->out.classname->name = classname;
@@ -483 +506 @@
         key = h->data;
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
         case SECURITY_ADMINISTRATOR:
         case SECURITY_USER:
+                if ((r->in.type == NULL) || (r->in.data_length == NULL) ||
+                    (r->in.data_size == NULL)) {
+                        return WERR_INVALID_PARAM;
+                }
+
                 result = reg_key_get_value_by_name(mem_ctx, key, 
                          r->in.value_name->name, &value_type, &value_data);
@@ -496 +524 @@
                         value_data.data = r->in.data;
                         value_data.length = *r->in.data_length;
-                }
-
-                r->out.type = talloc(mem_ctx, uint32_t);
+                } else {
+                        if ((r->in.data != NULL)
+                            && (*r->in.data_size < value_data.length)) {
+                                result = WERR_MORE_DATA;
+                        }
+                }
+
+                r->out.type = talloc(mem_ctx, enum winreg_Type);
                 if (!r->out.type) {
                         return WERR_NOMEM;
                 }
-                *r->out.type = value_type;
+                *r->out.type = (enum winreg_Type) value_type;
                 r->out.data_length = talloc(mem_ctx, uint32_t);
                 if (!r->out.data_length) {
@@ -581 +614 @@
         key = h->data;
 
-        switch (security_session_user_level(dce_call->conn->auth_state.session_info))
+        switch (security_session_user_level(dce_call->conn->auth_state.session_info, NULL))
         {
         case SECURITY_SYSTEM:
@@ -691 +724 @@
 }
 
+/*
+  winreg_DeleteKeyEx
+*/
+static WERROR dcesrv_winreg_DeleteKeyEx(struct dcesrv_call_state *dce_call,
+                                        TALLOC_CTX *mem_ctx,
+                                        struct winreg_DeleteKeyEx *r)
+{
+        return WERR_NOT_SUPPORTED;
+}
 
 /* include the generated boilerplate */