summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-06-05 19:30:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:31 -0500
commit39e465a0965b7974c95f318db240d47cced37874 (patch)
tree52544445a76701caf4175c76cab1e1e64bd26cec /source4
parent39965d1993f854874d0f636ae14dbeb246c5b531 (diff)
downloadsamba-39e465a0965b7974c95f318db240d47cced37874.tar.gz
samba-39e465a0965b7974c95f318db240d47cced37874.tar.bz2
samba-39e465a0965b7974c95f318db240d47cced37874.zip
r1035: Support shared modules again
(This used to be commit 7949dc25ab05f7d5ad6217a6304e1f50b8b5dc41)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pl2
-rw-r--r--source4/lib/registry/tools/regdiff.c24
2 files changed, 13 insertions, 13 deletions
diff --git a/source4/build/smb_build/makefile.pl b/source4/build/smb_build/makefile.pl
index 0b85fac926..7f05ed9bcd 100644
--- a/source4/build/smb_build/makefile.pl
+++ b/source4/build/smb_build/makefile.pl
@@ -294,7 +294,7 @@ sub _prepare_subsystem_obj_list($)
# $module_ctx->{OBJ_LIST} - the list of objectfiles which sould be linked to this module
#
# $output - the resulting output buffer
-sub _prepare_module_objlist($)
+sub _prepare_module_obj_list($)
{
my $ctx = shift;
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 7520e653bb..b599a54c2e 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -91,7 +91,7 @@ static void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
}
}
- int main(int argc, char **argv)
+int main(int argc, char **argv)
{
int opt;
poptContext pc;
@@ -115,7 +115,7 @@ static void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
};
pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
-
+
while((opt = poptGetNextOpt(pc)) != -1) {
switch(opt) {
case 'c':
@@ -123,9 +123,9 @@ static void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
else if(!credentials2) credentials2 = poptGetOptArg(pc);
break;
case 'b':
- if(!backend1 && !from_null) backend1 = poptGetOptArg(pc);
- else if(!backend2) backend2 = poptGetOptArg(pc);
- break;
+ if(!backend1 && !from_null) backend1 = poptGetOptArg(pc);
+ else if(!backend2) backend2 = poptGetOptArg(pc);
+ break;
}
}
setup_logging(argv[0], True);
@@ -154,13 +154,13 @@ static void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
}
if(!backend2) backend2 = "dir";
-
+
error = reg_open(backend2, location2, credentials2, &h2);
if(!W_ERROR_IS_OK(error)) {
fprintf(stderr, "Unable to open '%s' with backend '%s'\n", location2, backend2);
return 1;
}
-
+
poptFreeContext(pc);
if(outputfile) {
@@ -175,24 +175,24 @@ static void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
fprintf(fd, "; Generated using regdiff\n");
error2 = error = WERR_OK;
-
+
for(i = 0; ; i++) {
if(backend1) error = reg_get_hive(h1, i, &root1);
else root1 = NULL;
if(!W_ERROR_IS_OK(error)) break;
-
+
if(backend2) error2 = reg_get_hive(h2, i, &root2);
else root2 = NULL;
-
+
if(!W_ERROR_IS_OK(error2)) break;
-
+
writediff(root1, root2, fd);
if(!root1 && !root2) break;
}
fclose(fd);
-
+
return 0;
}