Makefile.in: Added target for makeyodldocs - not used by default.

rpc_client/cli_reg.c: The perils of cut-n-paste coding include using variables before
                      they are initialised :-).
script/makeyodldocs.sh: Remove the intermediate files.
Jeremy.
(This used to be commit 88031bca5c528157ef2fe1d976a245b186ff8959)

3 files changed, 16 insertions, 5 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index fee28ac8f4..59e824bd8e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -476,6 +476,14 @@ distclean: realclean
 	-rm -f config.status config.cache
 	-rm -rf .deps
 
+#
+# This target is for documenation updators. It regenerates
+# the man pages and HTML docs from the YODL source files.
+# In order for this target to work YODL must be installed
+# and working on your system. JRA.
+yodldocs:
+	@$(SHELL) $(srcdir)/script/makeyodldocs.sh $(srcdir)
+
 # this target is really just for my use. It only works on a limited
 # range of machines and is used to produce a list of potentially
 # dead (ie. unused) functions in the code. (tridge)
diff --git a/source3/rpc_client/cli_reg.c b/source3/rpc_client/cli_reg.c
index 9ded3c4e67..240a1fbb67 100644
--- a/source3/rpc_client/cli_reg.c
+++ b/source3/rpc_client/cli_reg.c
@@ -42,7 +42,7 @@ BOOL do_reg_connect(struct cli_state *cli, char *full_keyname,
 	fstring key_name;
 	char *srch;
 	BOOL res1;
-	BOOL res;
+	BOOL res = False;
 	BOOL hklm = False;
 	BOOL hku  = False;
 
@@ -70,16 +70,16 @@ BOOL do_reg_connect(struct cli_state *cli, char *full_keyname,
 
 	if (hklm)
 	{
-		res = res ? do_reg_open_hklm(cli,
+		res = do_reg_open_hklm(cli,
 				0x84E0, 0x02000000,
-				reg_hnd) : False;
+				reg_hnd);
 	}
 	
 	if (hku)
 	{
-		res = res ? do_reg_open_hku(cli,
+		res = do_reg_open_hku(cli,
 				0x84E0, 0x02000000,
-				reg_hnd) : False;
+				reg_hnd);
 	}
 
 	/* open an entry */
diff --git a/source3/script/makeyodldocs.sh b/source3/script/makeyodldocs.sh
index ded7d69a6d..def0af345f 100755
--- a/source3/script/makeyodldocs.sh
+++ b/source3/script/makeyodldocs.sh
@@ -44,6 +44,7 @@ do
 				exit 1
 			fi
 			cp $bn.man ../manpages/$bn || echo "Cannot create $YODLDIR/../manpages/$bn"
+			rm -f $bn.man
 
 			echo "Creating html versions of man pages..."
 			echo $d
@@ -54,6 +55,7 @@ do
 				exit 1
 			fi
 			cp $bn.html ../htmldocs || echo "Cannot create $YODLDIR/../htmldocs/$bn.html"
+			rm -f $bn.html
 			;;
 		*)
 #
@@ -67,6 +69,7 @@ do
                 exit 1
             fi
 			cp $bn.html ../htmldocs || echo "Cannot create $YODLDIR/../htmldocs/$bn.html"
+			rm -f $bn.html
 		;;
 	esac
 done