Changeset 745 for trunk/server/source4/lib/registry/patchfile.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)
• source4/lib/registry/patchfile.c (modified) (28 diffs)

trunk/server/source4/lib/registry/patchfile.c

@@ -5 +5 @@
    Copyright (C) Jelmer Vernooij 2004-2007
    Copyright (C) Wilco Baan Hofman 2006
-   Copyright (C) Matthias Dieter Wallnöfer 2008
+   Copyright (C) Matthias Dieter Wallnöfer 2008-2010
 
    This program is free software; you can redistribute it and/or modify
@@ -27 +27 @@
 
 _PUBLIC_ WERROR reg_preg_diff_load(int fd,
-                                   struct smb_iconv_convenience *iconv_convenience, 
                                    const struct reg_diff_callbacks *callbacks,
                                    void *callback_data);
 
 _PUBLIC_ WERROR reg_dotreg_diff_load(int fd,
-                                     struct smb_iconv_convenience *iconv_convenience,
                                      const struct reg_diff_callbacks *callbacks,
                                      void *callback_data);
@@ -45 +43 @@
                              void *callback_data)
 {
-        int i;
+        unsigned int i;
         struct registry_key *t1 = NULL, *t2 = NULL;
         char *tmppath;
@@ -87 +85 @@
 
                 if (!W_ERROR_IS_OK(error2) && !W_ERROR_EQUAL(error2, WERR_BADFILE)) {
-                        DEBUG(0, ("Error occured while getting subkey by name: %s\n",
+                        DEBUG(0, ("Error occurred while getting subkey by name: %s\n",
                                 win_errstr(error2)));
                         talloc_free(mem_ctx);
@@ -96 +94 @@
                 /* didn't have such a subkey and therefore add a del diff */
                 tmppath = talloc_asprintf(mem_ctx, "%s\\%s", path, keyname1);
+                if (tmppath == NULL) {
+                        DEBUG(0, ("Out of memory\n"));
+                        talloc_free(mem_ctx);
+                        return WERR_NOMEM;
+                }
                 if (!W_ERROR_IS_OK(error2))
                         callbacks->del_key(callback_data, tmppath);
@@ -102 +105 @@
                 error1 = reg_open_key(mem_ctx, oldkey, keyname1, &t1);
                 if (!W_ERROR_IS_OK(error1)) {
-                        DEBUG(0, ("Error occured while getting subkey by name: %s\n",
+                        DEBUG(0, ("Error occurred while getting subkey by name: %s\n",
                         win_errstr(error1)));
                         talloc_free(mem_ctx);
@@ -155 +158 @@
                 }
 
-                /* oldkey didn't have such a subkey, add add diff */
+                /* oldkey didn't have such a subkey, add a add diff */
                 tmppath = talloc_asprintf(mem_ctx, "%s\\%s", path, keyname1);
+                if (tmppath == NULL) {
+                        DEBUG(0, ("Out of memory\n"));
+                        talloc_free(mem_ctx);
+                        return WERR_NOMEM;
+                }
                 callbacks->add_key(callback_data, tmppath);
 
@@ -162 +170 @@
                 error1 = reg_open_key(mem_ctx, newkey, keyname1, &t2);
                 if (!W_ERROR_IS_OK(error1)) {
-                        DEBUG(0, ("Error occured while getting subkey by name: %s\n",
+                        DEBUG(0, ("Error occurred while getting subkey by name: %s\n",
                         win_errstr(error1)));
                         talloc_free(mem_ctx);
@@ -176 +184 @@
                 const char *name;
                 uint32_t type1, type2;
-                DATA_BLOB contents1, contents2;
+                DATA_BLOB contents1 = { NULL, 0 }, contents2 = { NULL, 0 };
 
                 error1 = reg_key_get_value_by_index(mem_ctx, newkey, i,
@@ -203 +211 @@
 
                 if (W_ERROR_IS_OK(error2)
-                        && (data_blob_cmp(&contents1, &contents2) == 0)
-                        && (type1 == type2))
+                    && (data_blob_cmp(&contents1, &contents2) == 0)
+                    && (type1 == type2)) {
+                        talloc_free(discard_const_p(char, name));
+                        talloc_free(contents1.data);
+                        talloc_free(contents2.data);
                         continue;
+                }
 
                 callbacks->set_value(callback_data, path, name,
                                      type1, contents1);
+
+                talloc_free(discard_const_p(char, name));
+                talloc_free(contents1.data);
+                talloc_free(contents2.data);
         }
 
@@ -215 +231 @@
                 const char *name;
                 uint32_t type;
-                DATA_BLOB contents;
+                DATA_BLOB contents = { NULL, 0 };
 
                 error1 = reg_key_get_value_by_index(mem_ctx, oldkey, i, &name,
@@ -232 +248 @@
                         error2 = WERR_BADFILE;
 
-                if (W_ERROR_IS_OK(error2))
+                if (W_ERROR_IS_OK(error2)) {
+                        talloc_free(discard_const_p(char, name));
+                        talloc_free(contents.data);
                         continue;
+                }
 
                 if (!W_ERROR_EQUAL(error2, WERR_BADFILE)) {
@@ -243 +262 @@
 
                 callbacks->del_value(callback_data, path, name);
+
+                talloc_free(discard_const_p(char, name));
+                talloc_free(contents.data);
         }
 
@@ -257 +279 @@
                                   void *callback_data)
 {
-        int i;
+        unsigned int i;
         WERROR error;
 
@@ -281 +303 @@
                 }
 
+                /* if "r1" is NULL (old hive) and "r2" isn't (new hive) then
+                 * the hive doesn't exist yet and we have to generate an add
+                 * diff */
+                if ((r1 == NULL) && (r2 != NULL)) {
+                        callbacks->add_key(callback_data,
+                                           reg_predefined_keys[i].name);
+                }
+                /* if "r1" isn't NULL (old hive) and "r2" is (new hive) then
+                 * the hive shouldn't exist anymore and we have to generate a
+                 * del diff */
+                if ((r1 != NULL) && (r2 == NULL)) {
+                        callbacks->del_key(callback_data,
+                                           reg_predefined_keys[i].name);
+                }
+
                 error = reg_generate_diff_key(r1, r2,
                         reg_predefined_keys[i].name, callbacks,
@@ -300 +337 @@
  */
 _PUBLIC_ WERROR reg_diff_load(const char *filename,
-                              struct smb_iconv_convenience *iconv_convenience,
                               const struct reg_diff_callbacks *callbacks,
                               void *callback_data)
@@ -334 +370 @@
         if (strncmp(hdr, "PReg", 4) == 0) {
                 /* Must be a GPO Registry.pol file */
-                return reg_preg_diff_load(fd, iconv_convenience, callbacks, callback_data);
+                return reg_preg_diff_load(fd, callbacks, callback_data);
         } else {
                 /* Must be a normal .REG file */
-                return reg_dotreg_diff_load(fd, iconv_convenience, callbacks, callback_data);
+                return reg_dotreg_diff_load(fd, callbacks, callback_data);
         }
 }
@@ -353 +389 @@
         /* Recursively create the path */
         buf = talloc_strdup(ctx, key_name);
+        W_ERROR_HAVE_NO_MEMORY(buf);
         buf_ptr = buf;
 
@@ -367 +404 @@
                         }
                         *buf_ptr++ = '\\';
-                }
-        }
+                        talloc_free(tmp);
+                }
+        }
+
+        talloc_free(buf);
 
         /* Add the key */
@@ -379 +419 @@
                 return error;
         }
+        talloc_free(tmp);
+
         return WERR_OK;
 }
@@ -388 +430 @@
         /* We can't proof here for success, because a common superkey could */
         /* have been deleted before the subkey's (diff order). This removed */
-        /* therefore all childs recursively and the "WERR_BADFILE" result is */
+        /* therefore all children recursively and the "WERR_BADFILE" result is */
         /* expected. */
 
@@ -420 +462 @@
         }
 
+        talloc_free(tmp);
+
         return WERR_OK;
 }
@@ -438 +482 @@
         }
 
-        error = reg_del_value(tmp, value_name);
+        error = reg_del_value(ctx, tmp, value_name);
         if (!W_ERROR_IS_OK(error)) {
                 DEBUG(0, ("Error deleting value '%s'\n", value_name));
@@ -444 +488 @@
         }
 
+        talloc_free(tmp);
 
         return WERR_OK;
@@ -453 +498 @@
         struct registry_key *key;
         WERROR error;
-        const char* value_name;
+        const char *value_name;
 
         error = reg_open_key_abs(ctx, ctx, key_name, &key);
@@ -467 +512 @@
         while (W_ERROR_IS_OK(reg_key_get_value_by_index(
                         ctx, key, 0, &value_name, NULL, NULL))) {
-                error = reg_del_value(key, value_name);
+                error = reg_del_value(ctx, key, value_name);
                 if (!W_ERROR_IS_OK(error)) {
                         DEBUG(0, ("Error deleting value '%s'\n", value_name));
                         return error;
                 }
-        }
+                talloc_free(discard_const_p(char, value_name));
+        }
+
+        talloc_free(key);
 
         return WERR_OK;
@@ -481 +529 @@
  */
 _PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, 
-                                                           struct smb_iconv_convenience *iconv_convenience, 
                                                            const char *filename)
 {
@@ -493 +540 @@
         callbacks.done = NULL;
 
-        return reg_diff_load(filename, iconv_convenience,
-                             &callbacks, ctx);
-}
+        return reg_diff_load(filename, &callbacks, ctx);
+}