From 2fb5c7c580a3fff3c7d477b65a1c4852af86433b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 1 Oct 2002 17:16:07 +0000 Subject: merge from HEAD (This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e) --- docs/docbook/Makefile.in | 27 ++++++++++++----- docs/docbook/devdoc/dev-doc.sgml | 6 +++- docs/docbook/devdoc/internals.sgml | 1 + docs/docbook/devdoc/parsing.sgml | 2 +- docs/docbook/manpages/samba.7.sgml | 2 +- docs/docbook/manpages/smb.conf.5.sgml | 55 ++++++++++++++++++++++++++++------- docs/docbook/manpages/vfstest.1.sgml | 44 ++++++++++++++-------------- 7 files changed, 94 insertions(+), 43 deletions(-) (limited to 'docs/docbook') diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index b225eb9780..c79c9008ff 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -57,30 +57,41 @@ all: @echo "txt - Build plain text version of HOWTO Collection" manpages: $(MANPAGES) -pdf: ../Samba-HOWTO-Collection.pdf -ps: ../Samba-HOWTO-Collection.ps -txt: ../Samba-HOWTO-Collection.txt +pdf: ../Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf +ps: ../Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps +txt: ../textdocs/Samba-HOWTO-Collection.txt ../textdocs/Samba-Developers-Guide.txt htmlman: $(MANPAGES_HTML) +html-single: ../$(HTMLDIR)/Samba-HOWTO-Collection.html ../$(HTMLDIR)/Samba-Developers-Guide.html html: $(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) projdoc/samba-doc.sgml -html-single: ../Samba-HOWTO-Collection.html ../Samba-Developers-Guide.html ../Samba-HOWTO-Collection.txt: $(SGMLDIR)/samba-doc.sgml $(DOCBOOK2TXT) -o .. $< mv ../samba-doc.txt $@ +../Samba-Developers-Guide.txt: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2TXT) -o .. $< + mv ../samba-doc.txt $@ + ../Samba-HOWTO-Collection.ps: $(SGMLDIR)/samba-doc.sgml $(DOCBOOK2PS) -o .. $< mv ../samba-doc.ps $@ -../Samba-HOWTO-Collection.pdf: ../Samba-HOWTO-Collection.html +../Samba-Developers-Guide.ps: $(SGMLDIR)/samba-doc.sgml + $(DOCBOOK2PS) -o .. $< + mv ../samba-doc.ps $@ + +../Samba-HOWTO-Collection.pdf: ../$(HTMLDIR)/Samba-HOWTO-Collection.html + $(HTMLDOC) --book --color --links -f $@ $< + +../Samba-Developers-Guide.pdf: ../$(HTMLDIR)/Samba-Developers-Guide.html $(HTMLDOC) --book --color --links -f $@ $< -../Samba-HOWTO-Collection.html: $(SGMLDIR)/samba-doc.sgml +../$(HTMLDIR)/Samba-HOWTO-Collection.html: $(SGMLDIR)/samba-doc.sgml $(DOCBOOK2HTML) -u -o .. $< mv ../samba-doc.html $@ -../Samba-Developers-Guide.html: devdoc/dev-doc.sgml +../$(HTMLDIR)/Samba-Developers-Guide.html: devdoc/dev-doc.sgml $(DOCBOOK2HTML) -u -o .. $< mv ../dev-doc.html $@ @@ -95,4 +106,4 @@ $(MANDIR)/%: $(MANSGMLDIR)/%.sgml mv $@.temp $@ clean: - rm -f $(MANPAGES) $(MANPAGES_HTML) ../htmldocs/*.html ../Samba-HOWTO-Collection.pdf ../Samba-HOWTO-Collection.ps + rm -f $(MANPAGES) $(MANPAGES_HTML) ../$(HTMLDIR)/*.html ../Samba-HOWTO-Collection.p* ../Samba-Developers-Guide.p* diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.sgml index c1ffb735ba..5191ddcb93 100644 --- a/docs/docbook/devdoc/dev-doc.sgml +++ b/docs/docbook/devdoc/dev-doc.sgml @@ -8,6 +8,8 @@ + + ]> @@ -25,7 +27,7 @@ Abstract -Last Update : Mon aug 26 12:41:19 CEST 2002 +Last Update : Mon Sep 30 15:23:53 CDT 2002 @@ -58,5 +60,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt diff --git a/docs/docbook/devdoc/internals.sgml b/docs/docbook/devdoc/internals.sgml index 79524347b6..982cfd2e10 100644 --- a/docs/docbook/devdoc/internals.sgml +++ b/docs/docbook/devdoc/internals.sgml @@ -26,6 +26,7 @@ telling if a particular char* is in dos codepage or unix codepage. This led to a nightmare of code that tried to cope with particular cases without handlingt the general case. + The new functions diff --git a/docs/docbook/devdoc/parsing.sgml b/docs/docbook/devdoc/parsing.sgml index 0121935d26..8d929617f5 100644 --- a/docs/docbook/devdoc/parsing.sgml +++ b/docs/docbook/devdoc/parsing.sgml @@ -196,7 +196,7 @@ terminating character, and the rest of the line is ignored. The lines <section> :== <section header> { <parameter line> } <section header> :== '[' NAME ']' <parameter line> :== NAME '=' VALUE NL - + Basically, this means that diff --git a/docs/docbook/manpages/samba.7.sgml b/docs/docbook/manpages/samba.7.sgml index ce443e78d9..17865edd81 100644 --- a/docs/docbook/manpages/samba.7.sgml +++ b/docs/docbook/manpages/samba.7.sgml @@ -124,7 +124,7 @@ If you require help, visit the Samba webpage at http://www.samba.org/ and explore the many option available to you. - + diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index d22ed39de5..c0893f1005 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -656,8 +656,9 @@ ldap filter ldap ssl ldap suffix - ldap suffix - ldap suffix + ldap user suffix + ldap machine suffix + ldap passwd sync lm announce lm interval @@ -1138,7 +1139,16 @@ add group script (G) This is the full pathname to a script that will - be run AS ROOT by smbd(8) when a new group is requested. It will expand any %g to the group name passed. This script is only useful for installations using the Windows NT domain administration tools. + be run AS ROOT by smbd(8) when a new group is + requested. It will expand any + %g to the group name passed. + This script is only useful for installations using the + Windows NT domain administration tools. The script is + free to create a group with an arbitrary name to + circumvent unix group name restrictions. In that case + the script must print the numeric gid of the created + group on stdout. @@ -3484,13 +3494,16 @@ 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 - (RFC2830) for communicating with the directory server. - - + + + On = Always use SSL when contacting the + ldap server. + + Off = Never use SSL when querying the directory. + + Start_tls = Use the LDAPv3 StartTLS extended operation + (RFC2830) for communicating with the directory server. + Default : ldap ssl = on @@ -3533,7 +3546,29 @@ + + ldap passwd sync (G) + This option is used to define whether + or not Samba should sync the LDAP password with the NT + and LM hashes for normal accounts (NOT for + workstation, server or domain trusts) on a password + change via SAMBA. + + + The ldap passwd sync can be set to one of three values: + + + Yes = Try to update the LDAP, NT and LM passwords and update the pwdLastSet time. + + No = Update NT and LM passwords and update the pwdLastSet time. + + Only = Only update the LDAP password and let the LDAP server do the rest. + + + Default : ldap passwd sync = no + + diff --git a/docs/docbook/manpages/vfstest.1.sgml b/docs/docbook/manpages/vfstest.1.sgml index 11878c1c89..9a7eff1939 100644 --- a/docs/docbook/manpages/vfstest.1.sgml +++ b/docs/docbook/manpages/vfstest.1.sgml @@ -16,8 +16,8 @@ vfstest -d debuglevel - -c "command" - -l "logfile" + -c command + -l logfile -h @@ -28,9 +28,9 @@ This tool is part of the Samba suite. - vfstest is a small command line + vfstest is a small command line utility that has the ability to test dso samba VFS modules. It gives the - user the ability to call the various VFS functions manually and + user the ability to call the various VFS functions manually and supports cascaded VFS modules. @@ -43,20 +43,20 @@ -c|--command=command - Execute the specified (colon-seperated) commands. + Execute the specified (colon-seperated) commands. See below for the commands that are available. - + -d|--debug=debuglevel - set the debuglevel. Debug level 0 is the lowest + set the debuglevel. Debug level 0 is the lowest and 100 being the highest. This should be set to 100 if you are - planning on submitting a bug report to the Samba team (see - BUGS.txt). + planning on submitting a bug report to the Samba team (see + BUGS.txt). - + -h|--help Print a summary of command line options. @@ -65,8 +65,8 @@ -l|--logfile=logbasename - File name for log/debug files. The extension - '.client' will be appended. The log file is never removed + File name for log/debug files. The extension + '.client' will be appended. The log file is never removed by the client. @@ -81,10 +81,10 @@ VFS COMMANDS load <module.so> - Load specified VFS module - + populate <char> <size> - Populate a data buffer with the specified data - + showdata [<offset> <len>] - Show data currently in data buffer @@ -122,9 +122,9 @@ mknod - VFS mknod() realpath - VFS realpath() - + GENERAL COMMANDS - + conf <smb.conf> - Load a different configuration file help [<command>] - Get list of commands or info about specified command @@ -134,25 +134,25 @@ freemem - Free memory currently in use exit - Exit vfstest - + VERSION - This man page is correct for version 3.0 of the Samba + This man page is correct for version 3.0 of the Samba suite. AUTHOR - - The original Samba software and related utilities + + 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 + by the Samba Team as an Open Source project similar to the way the Linux kernel is developed. - + The vfstest man page was written by Jelmer Vernooij. -- cgit