Changeset 745 for trunk/server/libgpo/gpext

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)
• libgpo/gpext/gpext.c (modified) (5 diffs)
• libgpo/gpext/gpext.h (modified) (4 diffs)

trunk/server/libgpo/gpext/gpext.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "../libgpo/gpo.h"
 #include "../libgpo/gpext/gpext.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/util/dlinklist.h"
+#include "../libcli/registry/util_reg.h"
+#if _SAMBA_BUILD_ == 3
+#include "libgpo/gpo_proto.h"
+#include "registry.h"
+#include "registry/reg_api.h"
+#endif
 
 static struct gp_extension *extensions = NULL;
@@ -277 +284 @@
                 case REG_SZ:
                 case REG_EXPAND_SZ:
-                        data->v.sz.str = talloc_strdup(mem_ctx, data_s);
-                        NT_STATUS_HAVE_NO_MEMORY(data->v.sz.str);
-                        data->v.sz.len = strlen(data_s);
+                        if (!push_reg_sz(mem_ctx, &data->data, data_s)) {
+                                return NT_STATUS_NO_MEMORY;
+                        }
                         break;
-                case REG_DWORD:
-                        data->v.dword = atoi(data_s);
+                case REG_DWORD: {
+                        uint32_t v = atoi(data_s);
+                        data->data = data_blob_talloc(mem_ctx, NULL, 4);
+                        SIVAL(data->data.data, 0, v);
                         break;
+                }
                 default:
                         return NT_STATUS_NOT_SUPPORTED;
@@ -587 +597 @@
 
                         if (!reg_ctx) {
-                                NT_USER_TOKEN *token;
+                                struct security_token *token;
 
                                 token = registry_create_system_token(mem_ctx);
@@ -671 +681 @@
                            TALLOC_CTX *mem_ctx,
                            uint32_t flags,
-                           const NT_USER_TOKEN *token,
+                           const struct security_token *token,
                            struct GROUP_POLICY_OBJECT *gpo_list,
                            const char *extension_guid,
@@ -685 +695 @@
                                  TALLOC_CTX *mem_ctx,
                                  uint32_t flags,
-                                 const NT_USER_TOKEN *token,
+                                 const struct security_token *token,
                                  struct registry_key *root_key,
                                  struct GROUP_POLICY_OBJECT *gpo,

trunk/server/libgpo/gpext/gpext.h

@@ -66 +66 @@
                                          uint32_t flags,
                                          struct registry_key *root_key,
-                                         const NT_USER_TOKEN *token,
+                                         const struct security_token *token,
                                          struct GROUP_POLICY_OBJECT *gpo,
                                          const char *extension_guid,
@@ -74 +74 @@
                                          TALLOC_CTX *mem_ctx,
                                          uint32_t flags,
-                                         const NT_USER_TOKEN *token,
+                                         const struct security_token *token,
                                          struct GROUP_POLICY_OBJECT *gpo_list,
                                          const char *extension_guid);
@@ -110 +110 @@
                            TALLOC_CTX *mem_ctx,
                            uint32_t flags,
-                           const NT_USER_TOKEN *token,
+                           const struct security_token *token,
                            struct GROUP_POLICY_OBJECT *gpo_list,
                            const char *extension_guid,
@@ -117 +117 @@
                                  TALLOC_CTX *mem_ctx,
                                  uint32_t flags,
-                                 const NT_USER_TOKEN *token,
+                                 const struct security_token *token,
                                  struct registry_key *root_key,
                                  struct GROUP_POLICY_OBJECT *gpo,