From a7801db32afb25cc88f171d9b8896b2f663ba351 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 24 Jul 2013 10:12:19 +0200 Subject: docs-xml: Remove obsolete swat manpage and references. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10041 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Jul 24 12:42:29 CEST 2013 on sn-devel-104 --- docs-xml/manpages/samba.7.xml | 8 - docs-xml/manpages/smb.conf.5.xml | 5 +- docs-xml/manpages/swat.8.xml | 237 ------------------------ docs-xml/smbdotconf/base/bindinterfacesonly.xml | 15 +- docs-xml/wscript_build | 1 - 5 files changed, 3 insertions(+), 263 deletions(-) delete mode 100644 docs-xml/manpages/swat.8.xml (limited to 'docs-xml') diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml index 7f9246e3b4..9f99c4f832 100644 --- a/docs-xml/manpages/samba.7.xml +++ b/docs-xml/manpages/samba.7.xml @@ -201,14 +201,6 @@ NET.EXE command. - - swat - 8 - swat is a web-based - interface to configuring smb.conf. - - - wbinfo 1 diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml index 5de8c1fdbd..975d1058cf 100644 --- a/docs-xml/manpages/smb.conf.5.xml +++ b/docs-xml/manpages/smb.conf.5.xml @@ -21,10 +21,8 @@ The smb.conf file is a configuration file for the Samba suite. smb.conf contains runtime configuration information for the Samba programs. The - smb.conf file is designed to be configured and administered by the - swat 8 program. The complete description of the file format and possible parameters held within are here for reference purposes. - + @@ -800,7 +798,6 @@ chmod 1770 /usr/local/samba/lib/usershares samba 7, smbpasswd - 8, swat 8, smbd 8, nmbd 8, winbindd diff --git a/docs-xml/manpages/swat.8.xml b/docs-xml/manpages/swat.8.xml deleted file mode 100644 index 2be6611aca..0000000000 --- a/docs-xml/manpages/swat.8.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - swat - 8 - Samba - System Administration tools - 4.1 - - - - - swat - Samba Web Administration Tool - - - - - swat - -s <smb config file> - -a - -P - - - - - DESCRIPTION - - This tool is part of the samba - 7 suite. - - - swat allows a Samba administrator to - configure the complex smb.conf - 5 file via a Web browser. In addition, - a swat configuration page has help links - to all the configurable options in the smb.conf file allowing an - administrator to easily look up the effects of any change. - - swat is run from inetd - - - - - OPTIONS - - - - -s smb configuration file - The default configuration file path is - determined at compile time. The file specified contains - the configuration details required by the smbd - 8 server. This is the file - that swat will modify. - The information in this file includes server-specific - information such as what printcap file to use, as well as - descriptions of all the services that the server is to provide. - See smb.conf for more information. - - - - - - -a - This option disables authentication and - places swat in demo mode. In that mode anyone will be able to modify - the smb.conf file. - - WARNING: Do NOT enable this option on a production - server. - - - - -P - This option restricts read-only users to the password - management page. swat can then be used to change - user passwords without users seeing the "View" and "Status" menu - buttons. - - - &stdarg.server.debug; - &popt.common.samba; - &stdarg.help; - - - - - - - - INSTALLATION - - Swat is included as binary package with most distributions. The - package manager in this case takes care of the installation and - configuration. This section is only for those who have compiled - swat from scratch. - - - After you compile SWAT you need to run make install - to install the swat binary - and the various help files and images. A default install would put - these in: - - - /usr/local/samba/sbin/swat - /usr/local/samba/swat/images/* - /usr/local/samba/swat/help/* - - - - Inetd Installation - - You need to edit your /etc/inetd.conf - and /etc/services - to enable SWAT to be launched via inetd. - - In /etc/services you need to - add a line like this: - - swat 901/tcp - - Note for NIS/YP and LDAP users - you may need to rebuild the - NIS service maps rather than alter your local - /etc/services file. - - the choice of port number isn't really important - except that it should be less than 1024 and not currently - used (using a number above 1024 presents an obscure security - hole depending on the implementation details of your - inetd daemon). - - In /etc/inetd.conf you should - add a line like this: - - swat stream tcp nowait.400 root - /usr/local/samba/sbin/swat swat - - Once you have edited /etc/services - and /etc/inetd.conf you need to send a - HUP signal to inetd. To do this use kill -1 PID - where PID is the process ID of the inetd daemon. - - - - - - - - - LAUNCHING - - To launch SWAT just run your favorite web browser and - point it at "http://localhost:901/". - - Note that you can attach to SWAT from any IP connected - machine but connecting from a remote machine leaves your - connection open to password sniffing as passwords will be sent - in the clear over the wire. - - - - FILES - - - - /etc/inetd.conf - This file must contain suitable startup - information for the meta-daemon. - - - - /etc/services - This file must contain a mapping of service name - (e.g., swat) to service port (e.g., 901) and protocol type - (e.g., tcp). - - - - /usr/local/samba/lib/smb.conf - This is the default location of the - smb.conf5 - server configuration file that swat edits. Other - common places that systems install this file are - /usr/samba/lib/smb.conf and /etc/smb.conf - . This file describes all the services the server - is to make available to clients. - - - - - - - WARNINGS - - swat will rewrite your - smb.conf5 - file. It will rearrange the entries and delete all - comments, include= and copy= - options. If you have a carefully crafted - smb.conf then back it up or don't use swat! - - - - - VERSION - - This man page is correct for version 3 of the Samba suite. - - - - SEE ALSO - inetd(5), - smbd8 - , smb.conf - 5 - - - - AUTHOR - - The original Samba software and related utilities - were created by Andrew Tridgell. Samba is now developed - by the Samba Team as an Open Source project similar - to the way the Linux kernel is developed. - - The original Samba man pages were written by Karl Auer. - The man page sources were converted to YODL format (another - excellent piece of Open Source software, available at - ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0 - release by Jeremy Allison. The conversion to DocBook for - Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for - Samba 3.0 was done by Alexander Bokovoy. - - - diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml index 6e8321bbca..b9b420de85 100644 --- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml +++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml @@ -37,9 +37,8 @@ If is set and the network address 127.0.0.1 is not added to the parameter list - smbpasswd 8 and - swat 8 may not work as - expected due to the reasons covered below. + smbpasswd 8 may not + work as expected due to the reasons covered below. @@ -54,16 +53,6 @@ machine set to the IP name of the primary interface of the local host. - - The swat status page tries to connect with smbd and nmbd at the address - 127.0.0.1 to determine if they are running. Not adding 127.0.0.1 - will cause smbd and nmbd to always show - "not running" even if they really are. This can prevent swat - from starting/stopping/restarting smbd and nmbd. - - no diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build index a75ae055be..588b0b9f00 100644 --- a/docs-xml/wscript_build +++ b/docs-xml/wscript_build @@ -41,7 +41,6 @@ manpages=''' manpages/smbta-util.8 manpages/smbtar.1 manpages/smbtree.1 - manpages/swat.8 manpages/testparm.1 manpages/vfs_acl_tdb.8 manpages/vfs_acl_xattr.8 -- cgit