diff options
| -rw-r--r-- | source/rpc_client/cli_spoolss.c | 4 | ||||
| -rwxr-xr-x | source/script/installswat.sh | 4 | ||||
| -rw-r--r-- | source/utils/net_rpc.c | 2 | ||||
| -rw-r--r-- | 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 -<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Documentation</h3> +<h3><a href="/swat/help/manpages/samba.7.html" target="docs">Samba</a> Documentation</h3> <ul> <li><b>Daemons</b> <ul> - <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - the SMB daemon - <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver - <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - the winbind daemon + <li><a href="/swat/help/manpages/smbd.8.html" target="docs">smbd</a> - the SMB daemon + <li><a href="/swat/help/manpages/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver + <li><a href="/swat/help/manpages/winbindd.8.html" target="docs">winbindd</a> - the winbind daemon </ul> <li><b>Configuration Files</b> <ul> - <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file - <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file - <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file + <li><a href="/swat/help/manpages/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file + <li><a href="/swat/help/manpages/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file + <li><a href="/swat/help/manpages/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file </ul> <li><b>Administrative Utilities</b> <ul> - <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons - <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords - <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web configuration tool - <li><a href="/swat/help/net.8.html" target="docs">net</a> - tool for administration of Samba and remote CIFS servers - <li><a href="/swat/help/pdbedit.8.html" target="docs">pdbedit</a> - Samba user account management tool - <li><a href="/swat/help/tdbbackup.8.html" target="docs">tdbbackup</a> - Tool for backing up TDB databases + <li><a href="/swat/help/manpages/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons + <li><a href="/swat/help/manpages/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords + <li><a href="/swat/help/manpages/swat.8.html" target="docs">SWAT</a> - web configuration tool + <li><a href="/swat/help/manpages/net.8.html" target="docs">net</a> - tool for administration of Samba and remote CIFS servers + <li><a href="/swat/help/manpages/pdbedit.8.html" target="docs">pdbedit</a> - Samba user account management tool + <li><a href="/swat/help/manpages/tdbbackup.8.html" target="docs">tdbbackup</a> - Tool for backing up TDB databases </ul> <li><b>Client Tools</b> <ul> - <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client - <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool - <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - command line SMB client - <li><a href="/swat/help/smbmnt.8.html" target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts - <li><a href="/swat/help/smbmount.8.html" target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux - <li><a href="/swat/help/smbumount.8.html" target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux - <li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication - <li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares - <li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - Allow access to remote SMB shares using a UNIX shell - <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer - <li><a href="/swat/help/smbtree.1.html" target="docs">smbtree</a> - Text-based SMB network browsing + <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client + <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool + <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - command line SMB client + <li><a href="/swat/help/manpages/smbmnt.8.html" target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts + <li><a href="/swat/help/manpages/smbmount.8.html" target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux + <li><a href="/swat/help/manpages/smbumount.8.html" target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux + <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication + <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares + <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer + <li><a href="/swat/help/manpages/smbtree.1.html" target="docs">smbtree</a> - Text-based SMB network browsing </ul> <li><b>Diagnostic Utilities</b> <ul> - <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba - <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - validating your config file - <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - testing printer configuration - <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool - <li><a href="/swat/help/wbinfo.1.html" target="docs">wbinfo</a> - Tool for getting winbind information + <li><a href="/swat/help/manpages/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba + <li><a href="/swat/help/manpages/testparm.1.html" target="docs">testparm</a> - validating your config file + <li><a href="/swat/help/manpages/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool + <li><a href="/swat/help/manpages/wbinfo.1.html" target="docs">wbinfo</a> - Tool for getting winbind information </ul> <li><b>Misc. Utilities</b> <ul> - <li><a href="/swat/help/profiles.1.html" target="docs">profiles</a> - migrating profiles from one domain to another - <li><a href="/swat/help/editreg.1.html" target="docs">editreg</a> - editing windows registry files - <li><a href="/swat/help/log2pcap.1.html" target="docs">log2pcap</a> - generate pcap files from samba log files + <li><a href="/swat/help/manpages/profiles.1.html" target="docs">profiles</a> - migrating profiles from one domain to another + <li><a href="/swat/help/manpages/log2pcap.1.html" target="docs">log2pcap</a> - generate pcap files from samba log files </ul> <li><b>Books</b> <ul> - <li><a href="/swat/using_samba/toc.html" target="docs">Using Samba, 2ed.</a> - by Jay Ts, Robert Eckstein, and David Collier-Brown - <li><a href="/swat/help/Samba-HOWTO-Collection/">The Official Samba HOWTO and Reference Guide</a> - <li><a href="/swat/help/Samba-Guide/">Samba 3 by Example</a> - <li><a href="/swat/help/Samba-Developers-Guide/">The Samba Developer Guide</a> + <li><a href="/swat/help/using_samba/toc.html" target="docs">Using Samba, 2ed.</a> - by Jay Ts, Robert Eckstein, and David Collier-Brown + <li><a href="/swat/help/Samba3-HOWTO/">The Official Samba HOWTO and Reference Guide</a> + <li><a href="/swat/help/Samba3-ByExample/">Samba 3 by Example</a> + <li><a href="/swat/help/Samba3-Developers-Guide/">The Samba Developer Guide</a> </ul> </ul> |