From 5084d752169cb9e734f3098ab013599917e7035e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 28 Jul 2005 17:31:57 +0000 Subject: [PATCH] r8836: bring in SWAT install changes and volker uninit'd variable fixes --- source/rpc_client/cli_spoolss.c | 4 +- source/script/installswat.sh | 4 +- source/utils/net_rpc.c | 2 +- swat/help/welcome.html | 69 ++++++++++++++++----------------- 4 files changed, 38 insertions(+), 41 deletions(-) diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c index 7ebae0868fa..f2df763b4fe 100644 --- a/source/rpc_client/cli_spoolss.c +++ b/source/rpc_client/cli_spoolss.c @@ -1467,7 +1467,7 @@ WERROR cli_spoolss_getprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, prs_struct qbuf, rbuf; SPOOL_Q_GETPRINTERDATAEX in; SPOOL_R_GETPRINTERDATAEX out; - uint32 offered; + uint32 offered = 0; ZERO_STRUCT(in); ZERO_STRUCT(out); @@ -1753,7 +1753,7 @@ WERROR cli_spoolss_enumprinterkey(struct cli_state *cli, TALLOC_CTX *mem_ctx, prs_struct qbuf, rbuf; SPOOL_Q_ENUMPRINTERKEY in; SPOOL_R_ENUMPRINTERKEY out; - uint32 offered; + uint32 offered = 0; ZERO_STRUCT(in); ZERO_STRUCT(out); diff --git a/source/script/installswat.sh b/source/script/installswat.sh index 53c268a95a1..2b99b9c57f1 100755 --- a/source/script/installswat.sh +++ b/source/script/installswat.sh @@ -3,7 +3,7 @@ SWATDIR=`echo $1 | sed 's/\/\//\//g'` SRCDIR=$2/ -BOOKDIR=$SWATDIR/using_samba +BOOKDIR=$SWATDIR/help/using_samba echo Installing SWAT in $SWATDIR echo Installing the Samba Web Administration Tool @@ -75,7 +75,7 @@ done if [ -d $SRCDIR../docs/htmldocs/ ]; then - for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide + for dir in htmldocs/manpages htmldocs/Samba3-ByExample htmldocs/Samba3-Developers-Guide htmldocs/Samba3-HOWTO do if [ ! -d $SRCDIR../docs/$dir ]; then diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c index 3f92404dda2..1c44e79f302 100644 --- a/source/utils/net_rpc.c +++ b/source/utils/net_rpc.c @@ -5104,7 +5104,7 @@ static NTSTATUS vampire_trusted_domain(struct cli_state *cli, { NTSTATUS nt_status; LSA_TRUSTED_DOMAIN_INFO *info; - char *cleartextpwd; + char *cleartextpwd = NULL; DATA_BLOB data; smb_ucs2_t *uni_dom_name; diff --git a/swat/help/welcome.html b/swat/help/welcome.html index 052d5e8091a..3a6677cb5f9 100644 --- a/swat/help/welcome.html +++ b/swat/help/welcome.html @@ -2,64 +2,61 @@ Please choose a configuration action using one of the above buttons -

Samba Documentation

+

Samba Documentation

-- 2.34.1