Author: jelmer Date: 2004-10-29 12:12:24 +0000 (Fri, 29 Oct 2004) New Revision: 3368
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3368 Log: Default to rpc backend with binding "ncalrpc:" if no backend was specified in the various registry tools. Allow opening a remote registry to partly fail (I.e. if not all hives could be opened) Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c branches/SAMBA_4_0/source/lib/registry/tools/regshell.c branches/SAMBA_4_0/source/lib/registry/tools/regtree.c Changeset: Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c 2004-10-29 11:44:59 UTC (rev 3367) +++ branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c 2004-10-29 12:12:24 UTC (rev 3368) @@ -132,9 +132,9 @@ WERROR reg_open(struct registry_context **ret, const char *backend, const char *location, const char *credentials) { - WERROR error = reg_create(ret); + WERROR error = reg_create(ret), reterror = WERR_NO_MORE_ITEMS; char **hives; - int i; + int i, j; TALLOC_CTX *mem_ctx = talloc_init("reg_open"); if(!W_ERROR_IS_OK(error)) return error; @@ -147,11 +147,15 @@ if(!W_ERROR_IS_OK(error)) return error; + j = 0; for(i = 0; hives[i]; i++) { error = reg_import_hive(*ret, backend, location, credentials, hives[i]); - if(!W_ERROR_IS_OK(error)) return error; - (*ret)->hives[i]->name = talloc_strdup((*ret)->mem_ctx, hives[i]); + if (W_ERROR_IS_OK(error)) { + reterror = WERR_OK; + (*ret)->hives[j]->name = talloc_strdup((*ret)->mem_ctx, hives[i]); + j++; + } else if (!W_ERROR_IS_OK(reterror)) reterror = error; } return WERR_OK; Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c 2004-10-29 11:44:59 UTC (rev 3367) +++ branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc/reg_backend_rpc.c 2004-10-29 12:12:24 UTC (rev 3368) @@ -122,6 +122,7 @@ user = talloc_strdup(mem_ctx, h->credentials); pass = strchr(user, '%'); if (pass) { + *pass = '\0'; pass = strdup(pass+1); } else { pass = strdup(""); @@ -136,14 +137,20 @@ h->backend_data = p; - if(NT_STATUS_IS_ERR(status)) return ntstatus_to_werror(status); + if(NT_STATUS_IS_ERR(status)) { + DEBUG(1, ("Unable to open '%s': %s\n", h->location, nt_errstr(status))); + return ntstatus_to_werror(status); + } for(n = 0; known_hives[n].name; n++) { if(!strcmp(known_hives[n].name, h->backend_hivename)) break; } - if(!known_hives[n].name) return WERR_NO_MORE_ITEMS; + if(!known_hives[n].name) { + DEBUG(1, ("No such hive %s\n", known_hives[n].name)); + return WERR_NO_MORE_ITEMS; + } *k = talloc_p(mem_ctx, struct registry_key); (*k)->backend_data = mykeydata = talloc_p(mem_ctx, struct rpc_key_data); Modified: branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c 2004-10-29 11:44:59 UTC (rev 3367) +++ branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c 2004-10-29 12:12:24 UTC (rev 3368) @@ -158,7 +158,7 @@ return 1; } - if(!backend1) backend1 = "dir"; + if(!backend1) backend1 = "rpc"; error = reg_open(&h1, backend1, location1, credentials1); if(!W_ERROR_IS_OK(error)) { @@ -173,7 +173,7 @@ return 2; } - if(!backend2) backend2 = "dir"; + if(!backend2) backend2 = "rpc"; error = reg_open(&h2, backend2, location2, credentials2); if(!W_ERROR_IS_OK(error)) { Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2004-10-29 11:44:59 UTC (rev 3367) +++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2004-10-29 12:12:24 UTC (rev 3368) @@ -760,7 +760,7 @@ const char *location; const char *credentials = NULL; const char *patch; - const char *backend = "dir"; + const char *backend = "rpc"; struct registry_context *h; WERROR error; struct poptOption long_options[] = { Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2004-10-29 11:44:59 UTC (rev 3367) +++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2004-10-29 12:12:24 UTC (rev 3368) @@ -337,7 +337,7 @@ int main(int argc, char **argv) { int opt; - const char *backend = "dir"; + const char *backend = "rpc"; const char *credentials = NULL; struct registry_key *curkey = NULL; poptContext pc; @@ -363,6 +363,8 @@ while((opt = poptGetNextOpt(pc)) != -1) { } + setup_logging("regtree", True); + error = reg_open(&h, backend, poptPeekArg(pc), credentials); if(!W_ERROR_IS_OK(error)) { fprintf(stderr, "Unable to open '%s' with backend '%s'\n", poptGetArg(pc), backend); @@ -370,8 +372,6 @@ } poptFreeContext(pc); - setup_logging("regtree", True); - curkey = h->hives[0]->root; while(True) { Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c =================================================================== --- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2004-10-29 11:44:59 UTC (rev 3367) +++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2004-10-29 12:12:24 UTC (rev 3368) @@ -70,7 +70,7 @@ int main(int argc, char **argv) { int opt, i; - const char *backend = "dir"; + const char *backend = "rpc"; const char *credentials = NULL; poptContext pc; struct registry_context *h;
