Changeset 745 for trunk/server/source4/lib/registry/tools

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/tools/regdiff.c (modified) (1 diff)
• source4/lib/registry/tools/regpatch.c (modified) (1 diff)
• source4/lib/registry/tools/regshell.c (modified) (16 diffs)
• source4/lib/registry/tools/regtree.c (modified) (5 diffs)

trunk/server/source4/lib/registry/tools/regdiff.c

@@ -131 +131 @@
         poptFreeContext(pc);
 
-        error = reg_dotreg_diff_save(ctx, outputfile, lp_iconv_convenience(cmdline_lp_ctx), &callbacks,
-                                     &callback_data);
+        error = reg_dotreg_diff_save(ctx, outputfile, &callbacks, &callback_data);
         if (!W_ERROR_IS_OK(error)) {
                 fprintf(stderr, "Problem saving registry diff to '%s': %s\n",

trunk/server/source4/lib/registry/tools/regpatch.c

@@ -69 +69 @@
         poptFreeContext(pc);
 
-        reg_diff_apply(h, lp_iconv_convenience(cmdline_lp_ctx), patch);
+        reg_diff_apply(h, patch);
 
         return 0;

trunk/server/source4/lib/registry/tools/regshell.c

@@ -25 +25 @@
 #include "lib/events/events.h"
 #include "system/time.h"
-#include "lib/smbreadline/smbreadline.h"
+#include "../libcli/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/registry/tools/common.h"
@@ -126 +126 @@
                 printf("Key Class: %s\n", classname);
         last_mod = nt_time_to_unix(last_change);
-        printf("Time Last Modified: %s\n", ctime(&last_mod));
+        printf("Time Last Modified: %s", ctime(&last_mod));
         printf("Number of subkeys: %d\n", num_subkeys);
         printf("Number of values: %d\n", num_values);
@@ -141 +141 @@
         error = reg_get_sec_desc(ctx, ctx->current, &sec_desc);
         if (!W_ERROR_IS_OK(error)) {
-                printf("Error getting security descriptor\n");
-                return error;
+                printf("Error getting security descriptor: %s\n", win_errstr(error));
+                return WERR_OK;
         }
         ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor,
@@ -196 +196 @@
         }
 
-        if (!reg_string_to_val(ctx, lp_iconv_convenience(cmdline_lp_ctx), 
-                               argv[2], argv[3], &val.data_type,
-                               &val.data)) {
+        if (!reg_string_to_val(ctx, argv[2], argv[3], &val.data_type, &val.data)) {
                 fprintf(stderr, "Unable to interpret data\n");
                 return WERR_INVALID_PARAM;
@@ -260 +258 @@
 
         printf("%s\n%s\n", str_regtype(value_type),
-                   reg_val_data_string(ctx, lp_iconv_convenience(cmdline_lp_ctx), value_type, value_data));
+                   reg_val_data_string(ctx, value_type, value_data));
 
         return WERR_OK;
@@ -267 +265 @@
 static WERROR cmd_ls(struct regshell_context *ctx, int argc, char **argv)
 {
-        int i;
+        unsigned int i;
         WERROR error;
         uint32_t valuetype;
@@ -283 +281 @@
 
         if (!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
-                fprintf(stderr, "Error occured while browsing thru keys: %s\n",
+                fprintf(stderr, "Error occurred while browsing through keys: %s\n",
                         win_errstr(error));
                 return error;
@@ -291 +289 @@
                 ctx->current, i, &name, &valuetype, &valuedata)); i++)
                 printf("V \"%s\" %s %s\n", name, str_regtype(valuetype),
-                           reg_val_data_string(ctx, lp_iconv_convenience(cmdline_lp_ctx), valuetype, valuedata));
+                           reg_val_data_string(ctx, valuetype, valuedata));
 
         return WERR_OK;
@@ -326 +324 @@
         }
 
-        error = reg_key_del(ctx->current, argv[1]);
+        error = reg_key_del(ctx, ctx->current, argv[1]);
         if(!W_ERROR_IS_OK(error)) {
                 fprintf(stderr, "Error deleting '%s'\n", argv[1]);
@@ -346 +344 @@
         }
 
-        error = reg_del_value(ctx->current, argv[1]);
+        error = reg_del_value(ctx, ctx->current, argv[1]);
         if(!W_ERROR_IS_OK(error)) {
                 fprintf(stderr, "Error deleting value '%s'\n", argv[1]);
@@ -389 +387 @@
                        int argc, char **argv)
 {
-        int i;
+        unsigned int i;
         printf("Available commands:\n");
         for(i = 0; regshell_cmds[i].name; i++) {
@@ -430 +428 @@
         /* Complete command */
         char **matches;
-        int i, len, samelen=0, count=1;
+        size_t len, samelen=0;
+        unsigned int i, count=1;
 
         matches = malloc_array_p(char *, MAX_COMPLETIONS);
@@ -478 +477 @@
         struct registry_key *base;
         const char *subkeyname;
-        int i, j = 1;
-        int samelen = 0;
-        int len;
+        unsigned int i, j = 1;
+        size_t len, samelen = 0;
         char **matches;
         const char *base_n = "";
@@ -594 +592 @@
 
         if (ctx->current == NULL) {
-                int i;
+                unsigned int i;
 
                 for (i = 0; (reg_predefined_keys[i].handle != 0) &&
@@ -617 +615 @@
         if (ctx->current == NULL) {
                 fprintf(stderr, "Unable to access any of the predefined keys\n");
-                return -1;
+                return 1;
         }
 
@@ -625 +623 @@
                 char *line, *prompt;
 
-                asprintf(&prompt, "%s\\%s> ", ctx->predef?ctx->predef:"", ctx->path);
+                if (asprintf(&prompt, "%s\\%s> ", ctx->predef?ctx->predef:"",
+                             ctx->path) < 0) {
+                        ret = false;
+                        break;
+                }
 
                 current_key = ctx->current;             /* No way to pass a void * pointer

trunk/server/source4/lib/registry/tools/regtree.c

@@ -34 +34 @@
  * @param novals Whether values should not be printed
  */
-static void print_tree(int level, struct registry_key *p,
+static void print_tree(unsigned int level, struct registry_key *p,
                        const char *name,
                        bool fullpath, bool novals)
@@ -44 +44 @@
         struct security_descriptor *sec_desc;
         WERROR error;
-        int i;
+        unsigned int i;
         TALLOC_CTX *mem_ctx;
 
@@ -70 +70 @@
 
         if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
-                DEBUG(0, ("Error occured while fetching subkeys for '%s': %s\n",
+                DEBUG(0, ("Error occurred while fetching subkeys for '%s': %s\n",
                                   name, win_errstr(error)));
         }
@@ -79 +79 @@
                         mem_ctx, p, i, &valuename, &valuetype, &valuedata));
                         i++) {
-                        int j;
+                        unsigned int j;
                         for(j = 0; j < level+1; j++) putchar(' ');
                         printf("%s\n",  reg_val_description(mem_ctx,
-                                lp_iconv_convenience(cmdline_lp_ctx), valuename,
-                                valuetype, valuedata));
+                                valuename, valuetype, valuedata));
                 }
                 talloc_free(mem_ctx);
 
                 if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
-                        DEBUG(0, ("Error occured while fetching values for '%s': %s\n",
+                        DEBUG(0, ("Error occurred while fetching values for '%s': %s\n",
                                 name, win_errstr(error)));
                 }
@@ -102 +101 @@
 int main(int argc, char **argv)
 {
-        int opt, i;
+        int opt;
+        unsigned int i;
         const char *file = NULL;
         const char *remote = NULL;