r3368: Default to rpc backend with binding "ncalrpc:" if no backend was specified...

Allow opening a remote registry to partly fail (I.e. if not all hives could be opened)
(This used to be commit 313034b10d7a70d079e2bec1af38cf2a7cd918c1)

diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 999203f4d1c9ff42b80e7f90a123642173845c49..044dc9a0ad11f4941dc138ebbc32275ab73f15dd 100644 (file)
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -132,9 +132,9 @@ WERROR reg_list_available_hives(TALLOC_CTX *mem_ctx, const char *backend, const
 
 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 @@ WERROR reg_open(struct registry_context **ret, const char *backend, const char *
           
        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;

diff --git a/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
index 31e55bc9a3a47aa8aeaa1422b233a78ef7d984db..27bd3ff957ef0181487d7d2827ae0f451f252dc6 100644 (file)
--- a/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
@@ -122,6 +122,7 @@ static WERROR rpc_open_hive(TALLOC_CTX *mem_ctx, struct registry_hive *h, struct
        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 @@ static WERROR rpc_open_hive(TALLOC_CTX *mem_ctx, struct registry_hive *h, struct
 
        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);

diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 524e538591e9fc2ac0cc1013fa35aa997a879138..41a29e46d39732182448f4cc48dffb72a7c9bdc0 100644 (file)
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -158,7 +158,7 @@ static void writediff(struct registry_key *oldkey, struct registry_key *newkey,
                        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 @@ static void writediff(struct registry_key *oldkey, struct registry_key *newkey,
                return 2;
        }
 
-       if(!backend2) backend2 = "dir";
+       if(!backend2) backend2 = "rpc";
 
        error = reg_open(&h2, backend2, location2, credentials2);
        if(!W_ERROR_IS_OK(error)) {

diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 1b33628a71d5b9f8f49a415844e93536376ace6c..eed249d353e9d63e53d2bb6b92f15927507e4f26 100644 (file)
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -760,7 +760,7 @@ static int nt_apply_reg_command_file(struct registry_context *r, const char *cmd
        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[] = {

diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 78fe36f1a0601d51ed9d696ca389005dcd982e2c..db7af9d5b68566d803d37d7ec1767a101d2df573 100644 (file)
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -337,7 +337,7 @@ static char **reg_completion(const char *text, int start, int end)
  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 @@ static char **reg_completion(const char *text, int start, int end)
        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 @@ static char **reg_completion(const char *text, int start, int end)
        }
        poptFreeContext(pc);
 
-    setup_logging("regtree", True);
-
        curkey = h->hives[0]->root;
 
        while(True) {

diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index bc0055a8912310c04c4e4bd69892119361a59040..66bce1e499d4cfd865db1578ed24f1ba4261fe49 100644 (file)
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -70,7 +70,7 @@ static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
  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;