diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2004-10-29 12:12:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:02 -0500 |
commit | 9ba6c3885acb79d9c35e600f9a67f8ed0200edfd (patch) | |
tree | f730ef7a01d9d42f43df21fca4b4bfb513739209 /source4/lib/registry/tools | |
parent | a29c24f180cc21b358c51a86632eb1cc2cb17868 (diff) | |
download | samba-9ba6c3885acb79d9c35e600f9a67f8ed0200edfd.tar.gz samba-9ba6c3885acb79d9c35e600f9a67f8ed0200edfd.tar.bz2 samba-9ba6c3885acb79d9c35e600f9a67f8ed0200edfd.zip |
r3368: 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)
(This used to be commit 313034b10d7a70d079e2bec1af38cf2a7cd918c1)
Diffstat (limited to 'source4/lib/registry/tools')
-rw-r--r-- | source4/lib/registry/tools/regdiff.c | 4 | ||||
-rw-r--r-- | source4/lib/registry/tools/regpatch.c | 2 | ||||
-rw-r--r-- | source4/lib/registry/tools/regshell.c | 6 | ||||
-rw-r--r-- | source4/lib/registry/tools/regtree.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c index 524e538591..41a29e46d3 100644 --- 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 1b33628a71..eed249d353 100644 --- 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 78fe36f1a0..db7af9d5b6 100644 --- 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 bc0055a891..66bce1e499 100644 --- 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; |