From 7d3cc61d26a7787c73397f940796c9aae93da096 Mon Sep 17 00:00:00 2001
From: Gerald Carter
Date: Sat, 5 Jan 2002 03:52:39 +0000
Subject: merge from 2.2 and regenerate docs (This used to be commit
f7d900873c3553dde88d42d903b74dc49c9a6c71)
---
docs/Samba-HOWTO-Collection.pdf | 4 +--
docs/docbook/Makefile.in | 50 ++++++++++++++++++++--------------
docs/docbook/manpages/smb.conf.5.sgml | 19 +++++++------
docs/docbook/manpages/smbclient.1.sgml | 8 ++++--
docs/htmldocs/nmbd.8.html | 27 ++++++++++++------
docs/htmldocs/smb.conf.5.html | 44 +++++++++++++++++-------------
docs/htmldocs/smbclient.1.html | 8 ++++--
docs/htmldocs/smbd.8.html | 43 ++++++++++++++++++-----------
docs/manpages/findsmb.1 | 2 +-
docs/manpages/lmhosts.5 | 2 +-
docs/manpages/make_smbcodepage.1 | 2 +-
docs/manpages/make_unicodemap.1 | 2 +-
docs/manpages/nmbd.8 | 11 ++++++--
docs/manpages/nmblookup.1 | 2 +-
docs/manpages/rpcclient.1 | 2 +-
docs/manpages/samba.7 | 2 +-
docs/manpages/smb.conf.5 | 20 ++++++++------
docs/manpages/smbcacls.1 | 2 +-
docs/manpages/smbclient.1 | 10 ++++---
docs/manpages/smbcontrol.1 | 2 +-
docs/manpages/smbd.8 | 11 ++++++--
docs/manpages/smbmnt.8 | 2 +-
docs/manpages/smbmount.8 | 2 +-
docs/manpages/smbpasswd.5 | 2 +-
docs/manpages/smbpasswd.8 | 2 +-
docs/manpages/smbsh.1 | 2 +-
docs/manpages/smbspool.8 | 2 +-
docs/manpages/smbstatus.1 | 2 +-
docs/manpages/smbtar.1 | 2 +-
docs/manpages/smbumount.8 | 2 +-
docs/manpages/swat.8 | 2 +-
docs/manpages/testparm.1 | 2 +-
docs/manpages/testprns.1 | 2 +-
docs/manpages/wbinfo.1 | 2 +-
docs/manpages/winbindd.8 | 2 +-
35 files changed, 182 insertions(+), 119 deletions(-)
diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf
index 511edd4ed1..e68e259243 100644
--- a/docs/Samba-HOWTO-Collection.pdf
+++ b/docs/Samba-HOWTO-Collection.pdf
@@ -1,6 +1,6 @@
%PDF-1.2
%âãÏÓ
-1 0 obj<>endobj
+1 0 obj<>endobj
2 0 obj<>endobj
3 0 obj<>endobj
4 0 obj<>endobj
@@ -2889,7 +2889,7 @@ xref
0000202565 00000 n
0000202658 00000 n
trailer
-<<063ee28ad25d00a6b7ea666000182d51>]>>
+<<71955562bbbbfce752847baaa5e75306>]>>
startxref
202872
%%EOF
diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index b0d445852c..83b9920535 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -34,7 +34,7 @@ MANPAGES=$(MANDIR)/findsmb.1 $(MANDIR)/smbclient.1 \
$(MANDIR)/smbmount.8 $(MANDIR)/swat.8 $(MANDIR)/rpcclient.1 \
$(MANDIR)/smbpasswd.5 $(MANDIR)/testparm.1 $(MANDIR)/samba.7 \
$(MANDIR)/smbpasswd.8 $(MANDIR)/testprns.1 \
- $(MANDIR)/smb.conf.5 $(MANDIR)/wbinfo.1 \
+ $(MANDIR)/smb.conf.5 $(MANDIR)/wbinfo.1 $(MANDIR)/pdbedit.8 \
$(MANDIR)/smbcacls.1 $(MANDIR)/smbsh.1 $(MANDIR)/winbindd.8 \
$(MANDIR)/make_unicodemap.1
@@ -48,7 +48,7 @@ SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \
manpages/rpcclient.1.sgml manpages/smbpasswd.5.sgml \
manpages/testparm.1.sgml manpages/samba.7.sgml \
manpages/smbpasswd.8.sgml manpages/testprns.1.sgml \
- manpages/smb.conf.5.sgml \
+ manpages/smb.conf.5.sgml manpages/pdbedit.8.sgml \
manpages/wbinfo.1.sgml manpages/smbcacls.1.sgml \
manpages/smbsh.1.sgml manpages/winbindd.8.sgml \
manpages/make_unicodemap.1.sgml
@@ -58,29 +58,33 @@ HOWTOSRC=projdoc/DOMAIN_MEMBER.sgml projdoc/NT_Security.sgml \
projdoc/UNIX_INSTALL.sgml projdoc/winbind.sgml projdoc/OS2-Client-HOWTO.sgml \
projdoc/Samba-PDC-HOWTO.sgml projdoc/ENCRYPTION.sgml \
projdoc/CVS-Access.sgml projdoc/Integrating-with-Windows.sgml \
- projdoc/PAM-Authentication-And-Samba.sgml
-
-FAQSRC=faq/samba-pdc-faq.sgml
+ projdoc/PAM-Authentication-And-Samba.sgml projdoc/Samba-LDAP-HOWTO.sgml
######################################################################
# Make instructions
######################################################################
-all: HOWTO proj-doc man-all man-html-all
-
-man: $(MANPAGES)
-
-FAQ: $(FAQSRC)
- @echo Building SAMBA PDC FAQ...
+all:
+ @echo "Possible options to the Makefile include:"
+ @echo " all-docs - Force a rebuild of all documentation"
+ @echo " HOWTO - Build all individual HOWTOs in html format"
+ @echo " proj-doc - Build the Samba-HOWTO-Collection.[pdf|html] file"
+ @echo " man - Rebuild html and nroff versions of man pages as necessary"
+ @echo " syntax - Check the SGML/DocBook syntax of all source files"
+
+all-docs: HOWTO proj-doc man-all man-html-all
+
+syntax: $(SGMLMANSRC) projdoc/samba-doc.sgml
+ @echo Checking syntax of all SGML/DocBook source files...
@(for i in $?; do \
- htmlfile=`echo $$i | sed 's,.*/,,' | sed "s/\.sgml/\.html/g"`; \
- echo "Making $$htmlfile"; \
- $(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl \
- -f /tmp/jade.log $$i > ../htmldocs/$$htmlfile; \
- cat /tmp/jade.log | grep -v DTDDECL; \
- /bin/rm -f /tmp/jade.log; \
+ echo "$$i..."; \
+ $(NSGMLS) -sv $$i 2>&1 | grep -v "DTDDECL catalog entries are not supported" ; \
done)
+
+
+
+man: $(MANPAGES)
HOWTO: $(HOWTOSRC)
@echo Building HOWTO pages...
@@ -112,9 +116,6 @@ proj-doc:
@/bin/mv -f samba-doc.html ../htmldocs/Samba-HOWTO-Collection.html
-
-
-
## generate all HTML man pages
man-html-all: $(SGMLMANSRC)
@echo Building HTML formatted man pages...
@@ -363,6 +364,15 @@ $(MANDIR)/winbindd.8: manpages/winbindd.8.sgml
@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
+$(MANDIR)/pdbedit.8: manpages/pdbedit.8.sgml
+ @echo "Making $@"
+ @$(NSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
+ @cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
+ @/bin/rm -f `echo $@ | sed 's,.*/,,'`
+ @echo "Making HTML version of $@"
+ @$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
+
+
## Clean Rule
clean:
/bin/rm -f manpage.*
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index a7328e7cf6..9e719e1f2a 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -2493,7 +2493,7 @@
causes smbd to authenticate against another
server.
- Default: encrypt passwords = no
+ Default: encrypt passwords = yes
@@ -3451,10 +3451,13 @@
This option is used to control the tcp port number used to contact
the ldap server.
- The default is to use the stand LDAP port 389.
+ The default is to use the stand LDAPS port 636.
- Default : ldap port = 389
+ See Also: ldap ssl
+
+
+ Default : ldap port = 636
@@ -3502,15 +3505,15 @@
The ldap ssl can be set to one of three values:
- (a) on - Always use SSL when contacting the
- ldap server, (b) off -
- Never use SSL when querying the directory, or (c) start
- tls - Use the LDAPv3 StartTLS extended operation
+ (a) on - Always use SSL when contacting the
+ ldap server, (b) off -
+ Never use SSL when querying the directory, or (c) start_tls
+ - Use the LDAPv3 StartTLS extended operation
(RFC2830) for communicating with the directory server.
- Default : ldap ssl = off
+ Default : ldap ssl = on
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index 6cc7be654a..4f36de1576 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -357,7 +357,7 @@
to read the password.
A third option is to use a credentials file which
- contains the plaintext of the username and password. This
+ contains the plaintext of the domain name, username and password. This
option is mainly provided for scripts where the admin doesn't
wish to pass the credentials on the command line or via environment
variables. If this method is used, make certain that the permissions
@@ -375,17 +375,19 @@
-A filenameThis option allows
- you to specify a file from which to read the username and
+ you to specify a file from which to read the username, domain name, and
password used in the connection. The format of the file is
username = <value>
password = <value>
+domain = <value>
- Make certain that the permissions on the file restrict
+ If the domain parameter is missing the current workgroup name
+ is used instead. Make certain that the permissions on the file restrict
access from unwanted users.
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index ad8c7c61ab..f926e46a75 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -37,12 +37,12 @@ NAME="AEN8"
>nmbd [-D] [-a] [-o] [-P] [-h] [-V] [-d <debug level>] [-H <lmhosts file>] [-l <log directory>] [-n <primary netbios name>] [-p <port number>] [-s <configuration file>]
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 deamon mode when run from the
+ command line.
+
ldap ssl can be set to one of three values:
- (a) onon - Always use SSL when contacting the
ldap server, (b) off, (b) off -
- Never use SSL when querying the directory, or (c) start
- tls - Use the LDAPv3 StartTLS extended operation
+ Never use SSL when querying the directory, or (c) start_tls
+ - Use the LDAPv3 StartTLS extended operation
(RFC2830) for communicating with the directory server.
Default : ldap ssl = offldap ssl = on
WARNINGS
VERSION
SEE ALSO
AUTHOR
A third option is to use a credentials file which
- contains the plaintext of the username and password. This
+ contains the plaintext of the domain name, username and password. This
option is mainly provided for scripts where the admin doesn't
wish to pass the credentials on the command line or via environment
variables. If this method is used, make certain that the permissions
@@ -589,7 +589,7 @@ CLASS="COMMAND"
>
This option allows
- you to specify a file from which to read the username and
+ you to specify a file from which to read the username, domain name, and
password used in the connection. The format of the file is
Make certain that the permissions on the file restrict
+>If the domain parameter is missing the current workgroup name
+ is used instead. Make certain that the permissions on the file restrict
access from unwanted users.
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 deamon mode when run from the
+ command line.
+
-o
FILES
LIMITATIONS
ENVIRONMENT VARIABLES
INSTALLATION
RUNNING THE SERVER AS A DAEMON
RUNNING THE SERVER ON REQUEST
PAM INTERACTION
TESTING THE INSTALLATION
VERSION
DIAGNOSTICS
SIGNALS
SEE ALSO
AUTHOR
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "FINDSMB" "1" "06 December 2001" "" ""
+.TH "FINDSMB" "1" "04 January 2002" "" ""
.SH NAME
findsmb \- list info about machines that respond to SMB name queries on a subnet
.SH SYNOPSIS
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index eb55aa3104..2b9ea91961 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "LMHOSTS" "5" "06 December 2001" "" ""
+.TH "LMHOSTS" "5" "04 January 2002" "" ""
.SH NAME
lmhosts \- The Samba NetBIOS hosts file
.SH SYNOPSIS
diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1
index bb53aeb02d..dd1483f288 100644
--- a/docs/manpages/make_smbcodepage.1
+++ b/docs/manpages/make_smbcodepage.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "MAKE_SMBCODEPAGE" "1" "06 December 2001" "" ""
+.TH "MAKE_SMBCODEPAGE" "1" "04 January 2002" "" ""
.SH NAME
make_smbcodepage \- construct a codepage file for Samba
.SH SYNOPSIS
diff --git a/docs/manpages/make_unicodemap.1 b/docs/manpages/make_unicodemap.1
index 93683c2708..fd96e89711 100644
--- a/docs/manpages/make_unicodemap.1
+++ b/docs/manpages/make_unicodemap.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "MAKE_UNICODEMAP" "1" "06 December 2001" "" ""
+.TH "MAKE_UNICODEMAP" "1" "04 January 2002" "" ""
.SH NAME
make_unicodemap \- construct a unicode map file for Samba
.SH SYNOPSIS
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index e7786549a1..928cfce6e5 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,12 +3,12 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "NMBD" "8" "06 December 2001" "" ""
+.TH "NMBD" "8" "04 January 2002" "" ""
.SH NAME
nmbd \- NetBIOS name server to provide NetBIOS over IP naming services to clients
.SH SYNOPSIS
.sp
-\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d \fR ] [ \fB-H \fR ] [ \fB-l \fR ] [ \fB-n \fR ] [ \fB-p \fR ] [ \fB-s \fR ]
+\fBnmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-d \fR ] [ \fB-H \fR ] [ \fB-l \fR ] [ \fB-n \fR ] [ \fB-p \fR ] [ \fB-s \fR ]
.SH "DESCRIPTION"
.PP
This program is part of the Samba suite.
@@ -61,6 +61,13 @@ If this parameter is specified, each new
connection will append log messages to the log file.
This is the default.
.TP
+\fB-i\fR
+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 deamon mode when run from the
+command line.
+.TP
\fB-o\fR
If this parameter is specified, the
log files will be overwritten when opened. By default,
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index c607a4a72d..0913f841a6 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "NMBLOOKUP" "1" "06 December 2001" "" ""
+.TH "NMBLOOKUP" "1" "04 January 2002" "" ""
.SH NAME
nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names
.SH SYNOPSIS
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index a29dbe2844..3db53bc751 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "RPCCLIENT" "1" "06 December 2001" "" ""
+.TH "RPCCLIENT" "1" "04 January 2002" "" ""
.SH NAME
rpcclient \- tool for executing client side MS-RPC functions
.SH SYNOPSIS
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index ff16ff7c91..883452243f 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SAMBA" "7" "06 December 2001" "" ""
+.TH "SAMBA" "7" "04 January 2002" "" ""
.SH NAME
SAMBA \- A Windows SMB/CIFS fileserver for UNIX
.SH SYNOPSIS
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 9d88615f3f..92ad1158f5 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMB.CONF" "5" "06 December 2001" "" ""
+.TH "SMB.CONF" "5" "04 January 2002" "" ""
.SH NAME
smb.conf \- The configuration file for the Samba suite
.SH "SYNOPSIS"
@@ -2682,7 +2682,7 @@ and maintain this file), or set the security = [server|domain] parameter which
causes \fBsmbd\fR to authenticate against another
server.
-Default: \fBencrypt passwords = no\fR
+Default: \fBencrypt passwords = yes\fR
.TP
\fBenhanced browsing (G)\fR
This option enables a couple of enhancements to
@@ -3428,9 +3428,11 @@ under active development.
This option is used to control the tcp port number used to contact
the \fIldap server\fR.
-The default is to use the stand LDAP port 389.
+The default is to use the stand LDAPS port 636.
-Default : \fBldap port = 389\fR
+See Also: ldap ssl
+
+Default : \fBldap port = 636\fR
.TP
\fBldap server (G)\fR
This parameter is only available if Samba has been
@@ -3457,13 +3459,13 @@ Samba SSL support which is enabled by specifying the
script (see \fIssl\fR).
The \fIldap ssl\fR can be set to one of three values:
-(a) \fBon\fR - Always use SSL when contacting the
-\fIldap server\fR, (b) \fBoff\fR -
-Never use SSL when querying the directory, or (c) \fBstart
-tls\fR - Use the LDAPv3 StartTLS extended operation
+(a) on - Always use SSL when contacting the
+\fIldap server\fR, (b) off -
+Never use SSL when querying the directory, or (c) start_tls
+- Use the LDAPv3 StartTLS extended operation
(RFC2830) for communicating with the directory server.
-Default : \fBldap ssl = off\fR
+Default : \fBldap ssl = on\fR
.TP
\fBldap suffix (G)\fR
This parameter is only available if Samba has been
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index d2da694a26..022485bdcb 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBCACLS" "1" "06 December 2001" "" ""
+.TH "SMBCACLS" "1" "04 January 2002" "" ""
.SH NAME
smbcacls \- Set or get ACLs on an NT file or directory names
.SH SYNOPSIS
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 4c5ef0b3e4..5278887f0a 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBCLIENT" "1" "06 December 2001" "" ""
+.TH "SMBCLIENT" "1" "04 January 2002" "" ""
.SH NAME
smbclient \- ftp-like client to access SMB/CIFS resources on servers
.SH SYNOPSIS
@@ -267,7 +267,7 @@ a \fBPASSWD\fR environment variable from which
to read the password.
A third option is to use a credentials file which
-contains the plaintext of the username and password. This
+contains the plaintext of the domain name, username and password. This
option is mainly provided for scripts where the admin doesn't
wish to pass the credentials on the command line or via environment
variables. If this method is used, make certain that the permissions
@@ -283,18 +283,20 @@ it in directly.
.TP
\fB-A filename\fR
This option allows
-you to specify a file from which to read the username and
+you to specify a file from which to read the username, domain name, and
password used in the connection. The format of the file is
.sp
.nf
username =
password =
+domain =
.sp
.fi
-Make certain that the permissions on the file restrict
+If the domain parameter is missing the current workgroup name
+is used instead. Make certain that the permissions on the file restrict
access from unwanted users.
.TP
\fB-L\fR
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index 4b27119673..673c839d80 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBCONTROL" "1" "06 December 2001" "" ""
+.TH "SMBCONTROL" "1" "04 January 2002" "" ""
.SH NAME
smbcontrol \- send messages to smbd or nmbd processes
.SH SYNOPSIS
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index a01a239e5e..9554bba6d5 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -3,12 +3,12 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBD" "8" "20 December 2001" "" ""
+.TH "SMBD" "8" "04 January 2002" "" ""
.SH NAME
smbd \- server to provide SMB/CIFS services to clients
.SH SYNOPSIS
.sp
-\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d \fR ] [ \fB-l \fR ] [ \fB-p \fR ] [ \fB-O \fR ] [ \fB-s \fR ]
+\fBsmbd\fR [ \fB-D\fR ] [ \fB-a\fR ] [ \fB-i\fR ] [ \fB-o\fR ] [ \fB-P\fR ] [ \fB-h\fR ] [ \fB-V\fR ] [ \fB-b\fR ] [ \fB-d \fR ] [ \fB-l \fR ] [ \fB-p \fR ] [ \fB-O \fR ] [ \fB-s \fR ]
.SH "DESCRIPTION"
.PP
This program is part of the Samba suite.
@@ -64,6 +64,13 @@ If this parameter is specified, each new
connection will append log messages to the log file.
This is the default.
.TP
+\fB-i\fR
+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 deamon mode when run from the
+command line.
+.TP
\fB-o\fR
If this parameter is specified, the
log files will be overwritten when opened. By default,
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
index bab134ef54..34c1970137 100644
--- a/docs/manpages/smbmnt.8
+++ b/docs/manpages/smbmnt.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBMNT" "8" "06 December 2001" "" ""
+.TH "SMBMNT" "8" "04 January 2002" "" ""
.SH NAME
smbmnt \- helper utility for mounting SMB filesystems
.SH SYNOPSIS
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index 70a0911887..dcfe11e4b4 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBMOUNT" "8" "06 December 2001" "" ""
+.TH "SMBMOUNT" "8" "04 January 2002" "" ""
.SH NAME
smbmount \- mount an smbfs filesystem
.SH SYNOPSIS
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index b1adf080e7..9fa964c9bb 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBPASSWD" "5" "06 December 2001" "" ""
+.TH "SMBPASSWD" "5" "04 January 2002" "" ""
.SH NAME
smbpasswd \- The Samba encrypted password file
.SH SYNOPSIS
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 8e5be46e31..151a3270ff 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBPASSWD" "8" "06 December 2001" "" ""
+.TH "SMBPASSWD" "8" "04 January 2002" "" ""
.SH NAME
smbpasswd \- change a user's SMB password
.SH SYNOPSIS
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index 349853bbc7..598da181d1 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBSH" "1" "06 December 2001" "" ""
+.TH "SMBSH" "1" "04 January 2002" "" ""
.SH NAME
smbsh \- Allows access to Windows NT filesystem using UNIX commands
.SH SYNOPSIS
diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8
index 864ea348f2..d18f48b5ca 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBSPOOL" "8" "06 December 2001" "" ""
+.TH "SMBSPOOL" "8" "04 January 2002" "" ""
.SH NAME
smbspool \- send print file to an SMB printer
.SH SYNOPSIS
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 17c1df25e5..9147ad98e7 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBSTATUS" "1" "06 December 2001" "" ""
+.TH "SMBSTATUS" "1" "04 January 2002" "" ""
.SH NAME
smbstatus \- report on current Samba connections
.SH SYNOPSIS
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index 8e70d75fd8..eb4a8b0319 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBTAR" "1" "06 December 2001" "" ""
+.TH "SMBTAR" "1" "04 January 2002" "" ""
.SH NAME
smbtar \- shell script for backing up SMB/CIFS shares directly to UNIX tape drives
.SH SYNOPSIS
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
index d20826950a..dff1dbca36 100644
--- a/docs/manpages/smbumount.8
+++ b/docs/manpages/smbumount.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SMBUMOUNT" "8" "06 December 2001" "" ""
+.TH "SMBUMOUNT" "8" "04 January 2002" "" ""
.SH NAME
smbumount \- smbfs umount for normal users
.SH SYNOPSIS
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 5e19f8705c..419eccf23a 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "SWAT" "8" "06 December 2001" "" ""
+.TH "SWAT" "8" "04 January 2002" "" ""
.SH NAME
swat \- Samba Web Administration Tool
.SH SYNOPSIS
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index d9515eddf4..23bbe1d0c6 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "TESTPARM" "1" "06 December 2001" "" ""
+.TH "TESTPARM" "1" "04 January 2002" "" ""
.SH NAME
testparm \- check an smb.conf configuration file for internal correctness
.SH SYNOPSIS
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index fd62ed8386..8fbb41affa 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "TESTPRNS" "1" "06 December 2001" "" ""
+.TH "TESTPRNS" "1" "04 January 2002" "" ""
.SH NAME
testprns \- check printer name for validity with smbd
.SH SYNOPSIS
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 63795899c8..a42a9ca31e 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "WBINFO" "1" "06 December 2001" "" ""
+.TH "WBINFO" "1" "04 January 2002" "" ""
.SH NAME
wbinfo \- Query information from winbind daemon
.SH SYNOPSIS
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index cfd4fa2fb2..da5988811a 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -3,7 +3,7 @@
.\"
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng .
-.TH "WINBINDD" "8" "06 December 2001" "" ""
+.TH "WINBINDD" "8" "04 January 2002" "" ""
.SH NAME
winbindd \- Name Service Switch daemon for resolving names from NT servers
.SH SYNOPSIS
--
cgit