Changeset 745 for trunk/server/source3/libgpo/gpext/scripts.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/libgpo/gpext/scripts.c (modified) (6 diffs)

trunk/server/source3/libgpo/gpext/scripts.c

@@ -19 +19 @@
 
 #include "includes.h"
-#include "libgpo/gpo_ini.h"
+#include "../libgpo/gpo_ini.h"
+#include "../libgpo/gpo.h"
+#include "libgpo/gpo_proto.h"
+#include "registry.h"
+#include "registry/reg_api.h"
+#include "../libcli/registry/util_reg.h"
 
 #define GP_EXT_NAME "scripts"
@@ -94 +99 @@
         switch (data->type) {
                 case REG_QWORD:
-                        data->v.qword = *(uint64_t *)data_p;
+                        data->data = data_blob_talloc(mem_ctx, NULL, 8);
+                        SBVAL(data->data.data, 0, *(uint64_t *)data_p);
                         break;
                 case REG_SZ:
-                        data->v.sz.str = talloc_strdup(mem_ctx, (char *)data_p);
-                        data->v.sz.len = strlen(data->v.sz.str);
+                        if (!push_reg_sz(mem_ctx, &data->data, (char *)data_p)) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
                         break;
                 default:
@@ -256 +263 @@
 
 static WERROR scripts_apply(TALLOC_CTX *mem_ctx,
-                            const struct nt_user_token *token,
+                            const struct security_token *token,
                             struct registry_key *root_key,
                             uint32_t flags,
@@ -276 +283 @@
 #if 0
         if (flags & GPO_INFO_FLAG_MACHINE) {
-                struct nt_user_token *tmp_token;
+                struct security_token *tmp_token;
 
                 tmp_token = registry_create_system_token(mem_ctx);
@@ -296 +303 @@
         W_ERROR_HAVE_NO_MEMORY(keystr);
 
-        reg_deletekey_recursive(mem_ctx, root_key, keystr);
+        reg_deletekey_recursive(root_key, keystr);
 
         werr = gp_store_reg_subkey(mem_ctx, keystr,
@@ -333 +340 @@
                                              uint32_t flags,
                                              struct registry_key *root_key,
-                                             const struct nt_user_token *token,
+                                             const struct security_token *token,
                                              struct GROUP_POLICY_OBJECT *gpo,
                                              const char *extension_guid,