diff --git a/docs-xml/manpages/samba.8.xml b/docs-xml/manpages/samba.8.xml index 229e9419764..9ce65c850b3 100644 --- a/docs-xml/manpages/samba.8.xml +++ b/docs-xml/manpages/samba.8.xml @@ -44,6 +44,29 @@ samba is the server daemon that provides Active Directory, filesharing and printing services to clients. + The server provides filespace and directory services to + clients using the SMB (or CIFS) protocol and other + related protocols such as DCE/RPC, LDAP and Kerberos. + + + + Clients supported include MSCLIENT 3.0 for DOS, Windows for + Workgroups, Windows 95/98/ME, Windows NT, Windows 2000/XP/2003, + OS/2, DAVE for Macintosh, and cifsfs for Linux. + + An extensive description of the services that the + server can provide is given in the man page for the + configuration file controlling the attributes of those + services (see smb.conf + 5. This man page will not describe the + services, but will concentrate on the administrative aspects + of running the server. + + + Please note that there are significant security + implications to running this server, and the smb.conf + 5 manual page should be regarded as mandatory reading before + proceeding with installation. @@ -71,13 +94,21 @@ server to run "interactively", not as a daemon, even if the server is executed on the command line of a shell. Setting this parameter negates the implicit daemon mode when run from the - command line. + command line. samba also logs to standard + output, as if the -S parameter had been + given. - -M|--model - Select process model. + -M model + This parameter can be used to specify the + "process model" samba should use. This determines + how concurrent clients are handled. Available process + models include single (everything in + a single process), standard (similar + behaviour to that of Samba 3), thread + (single process, different threads. @@ -147,10 +178,66 @@ -V|--version Print version. - + + FILES + + + + /etc/rc + or whatever initialization script your + system uses). + + If running the server as a daemon at startup, + this file will need to contain an appropriate startup + sequence for the server. + + + + /etc/services + If running the server via the + meta-daemon inetd, this file + must contain a mapping of service name (e.g., netbios-ssn) + to service port (e.g., 139) and protocol type (e.g., tcp). + + + + + /usr/local/samba/lib/smb.conf + This is the default location of the smb.conf + 5 server configuration file. Other common places that systems + install this file are /usr/samba/lib/smb.conf + and /etc/samba/smb.conf. + + This file describes all the services the server + is to make available to clients. See smb.conf + 5 for more information. + + + + + + + DIAGNOSTICS + + Most diagnostics issued by the server are logged + in a specified log file. The log file name is specified + at compile time, but may be overridden on the command line. + + The number and nature of diagnostics available depends + on the debug level used by the server. If you have problems, set + the debug level to 3 and peruse the log files. + + Most messages are reasonably self-explanatory. Unfortunately, + at the time this man page was created, there are too many diagnostics + available in the source code to warrant describing each and every + diagnostic. At this stage your best bet is still to grep the + source code and inspect the conditions that gave rise to the + diagnostics you are seeing. + + VERSION @@ -160,13 +247,18 @@ SEE ALSO hosts_access - 5, inetd + 5 + smb.conf + 5, smbclient + 8, samba-tool 8, smbd 8, nmbd - 8, smb.conf - 5, smbclient - 1, testparm - 1. + 8, winbindd + 1, and the + Internet RFC's rfc1001.txt, rfc1002.txt. + In addition the CIFS (formerly SMB) specification is available + as a link from the Web page + http://samba.org/cifs/. diff --git a/source4/smbd/samba.8.xml b/source4/smbd/samba.8.xml deleted file mode 100644 index 891c847ff12..00000000000 --- a/source4/smbd/samba.8.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - samba - 8 - Samba - System Administration tools - 4.0 - - - - - samba - server to provide filesharing- and directory services to clients - - - - - samba - -i - -M model - - - - - DESCRIPTION - This program is part of the samba - 7 suite. - - samba is the server daemon that - provides filesharing and directory services to Windows clients. - The server provides filespace and directory services to - clients using the SMB (or CIFS) protocol and other - related protocols such as DCE/RPC, LDAP and Kerberos. - - - - Clients supported include MSCLIENT 3.0 for DOS, Windows for - Workgroups, Windows 95/98/ME, Windows NT, Windows 2000/XP/2003, - OS/2, DAVE for Macintosh, and cifsfs for Linux. - - An extensive description of the services that the - server can provide is given in the man page for the - configuration file controlling the attributes of those - services (see smb.conf - 5. This man page will not describe the - services, but will concentrate on the administrative aspects - of running the server. - - Please note that there are significant security - implications to running this server, and the smb.conf - 5 manual page should be regarded as mandatory reading before - proceeding with installation. - - As of Samba 4, there is a single daemon that incorporates the - functionality of both smbd and nmbd that are present in older versions - of Samba. - - - - - OPTIONS - - - - -i - If this parameter is specified it causes the - server to run "interactively", not as a daemon, even if the - server is executed on the command line of a shell. Setting this - parameter negates the implicit daemon mode when run from the - command line. samba also logs to standard - output, as if the -S parameter had been - given. - - - - - -M model - This parameter can be used to specify the - "process model" samba should use. This determines - how concurrent clients are handled. Available process - models include single (everything in - a single process), standard (similar - behaviour to that of Samba 3), thread - (single process, different threads. - - - - - - - FILES - - - - /etc/rc - or whatever initialization script your - system uses). - - If running the server as a daemon at startup, - this file will need to contain an appropriate startup - sequence for the server. - - - - /etc/services - If running the server via the - meta-daemon inetd, this file - must contain a mapping of service name (e.g., netbios-ssn) - to service port (e.g., 139) and protocol type (e.g., tcp). - - - - - /usr/local/samba/lib/smb.conf - This is the default location of the smb.conf - 5 server configuration file. Other common places that systems - install this file are /usr/samba/lib/smb.conf - and /etc/samba/smb.conf. - - This file describes all the services the server - is to make available to clients. See smb.conf - 5 for more information. - - - - - - - VERSION - - This man page is correct for version 4 of - the Samba suite. - - - - DIAGNOSTICS - - Most diagnostics issued by the server are logged - in a specified log file. The log file name is specified - at compile time, but may be overridden on the command line. - - The number and nature of diagnostics available depends - on the debug level used by the server. If you have problems, set - the debug level to 3 and peruse the log files. - - Most messages are reasonably self-explanatory. Unfortunately, - at the time this man page was created, there are too many diagnostics - available in the source code to warrant describing each and every - diagnostic. At this stage your best bet is still to grep the - source code and inspect the conditions that gave rise to the - diagnostics you are seeing. - - - - SEE ALSO - hosts_access - 5 - smb.conf - 5, smbclient - 1, testparm - 1, and the - Internet RFC's rfc1001.txt, rfc1002.txt. - In addition the CIFS (formerly SMB) specification is available - as a link from the Web page - http://samba.org/cifs/. - - - - 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. - - - - diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index bfa13121f28..5be4d2b5fdb 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -19,7 +19,6 @@ bld.SAMBA_LIBRARY('process_model', bld.SAMBA_BINARY('samba', source='server.c', - manpages='samba.8', subsystem_name='service', deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA popt gensec registry ntptr ntvfs share cluster COMMON_SCHANNEL SECRETS''',