syncing up with SAMBA_2_2

docs/docbook/Makefile.in

@@ -36,7 +36,8 @@ MANPAGES=$(MANDIR)/findsmb.1 $(MANDIR)/smbclient.1 \
 	$(MANDIR)/smbpasswd.5 $(MANDIR)/testparm.1 $(MANDIR)/samba.7 \
 	$(MANDIR)/smbpasswd.8 $(MANDIR)/testprns.1 \
 	$(MANDIR)/smb.conf.5 $(MANDIR)/wbinfo.1 \
-	$(MANDIR)/smbcacls.1 $(MANDIR)/smbsh.1 $(MANDIR)/winbindd.8 
+	$(MANDIR)/smbcacls.1 $(MANDIR)/smbsh.1 $(MANDIR)/winbindd.8 \
+	$(MANDIR)/make_unicodemap.1
 
 SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \
 	manpages/smbspool.8.sgml manpages/lmhosts.5.sgml \
@@ -50,12 +51,14 @@ SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \
 	manpages/smbpasswd.8.sgml manpages/testprns.1.sgml \
 	manpages/smb.conf.5.sgml \
 	manpages/wbinfo.1.sgml manpages/smbcacls.1.sgml \
-	manpages/smbsh.1.sgml manpages/winbindd.8.sgml
+	manpages/smbsh.1.sgml manpages/winbindd.8.sgml \
+	manpages/make_unicodemap.1.sgml
 
 HOWTOSRC=projdoc/DOMAIN_MEMBER.sgml projdoc/NT_Security.sgml \
 	projdoc/msdfs_setup.sgml projdoc/printer_driver2.sgml \
 	projdoc/UNIX_INSTALL.sgml projdoc/winbind.sgml projdoc/OS2-Client-HOWTO.sgml \
-	projdoc/Samba-PDC-HOWTO.sgml projdoc/ENCRYPTION.sgml
+	projdoc/Samba-PDC-HOWTO.sgml projdoc/ENCRYPTION.sgml \
+	projdoc/CVS-Access.sgml
 
 FAQSRC=faq/samba-pdc-faq.sgml
 
@@ -71,7 +74,7 @@ man: $(MANPAGES)
 FAQ: $(FAQSRC)
 	@echo Building SAMBA PDC FAQ...
 	@(for i in $?; do \
-	   htmlfile=`basename $$i | sed "s/\.sgml/\.html/g"`; \
+	   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; \
@@ -82,13 +85,13 @@ FAQ: $(FAQSRC)
 HOWTO: $(HOWTOSRC)
 	@echo Building HOWTO pages...
 	@(for i in $?; do \
-	   htmlfile=`basename $$i | sed "s/\.sgml/\.html/g"`; \
+	   htmlfile=`echo $$i | sed 's,.*/,,' | sed "s/\.sgml/\.html/g"`; \
 	   echo "Making $$htmlfile"; \
-	   cat $$i | $(PERL) scripts/make-article.pl > /tmp/`basename $$i`; \
+	   cat $$i | $(PERL) scripts/make-article.pl > /tmp/`echo $$i | sed 's,.*/,,'`; \
 	   $(JADE) -t sgml -V nochunks -d  $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl \
-	      -f /tmp/jade.log /tmp/`basename $$i` > ../htmldocs/$$htmlfile; \
+	      -f /tmp/jade.log /tmp/`echo $$i | sed 's,.*/,,'` > ../htmldocs/$$htmlfile; \
 	   cat /tmp/jade.log | grep -v DTDDECL; \
-	   /bin/rm -f /tmp/jade.log /tmp/`basename $$i`; \
+	   /bin/rm -f /tmp/jade.log /tmp/`echo $$i | sed 's,.*/,,'`; \
 	done)
 
 
@@ -102,7 +105,6 @@ proj-doc:
 	@(cd projdoc; $(JADE) -t sgml -i html -V nochunks -d  ../stylesheets/ldp.dsl\#html samba-doc.sgml > ../samba-doc.html)
 	@(cd scripts; ./ldp_print ../samba-doc.html)
 	@mv -f samba-doc.pdf ../Samba-HOWTO-Collection.pdf
-	#@$(HTMLDOC) -f ../Samba-HOWTO-Collection.pdf samba-doc.html
 	@/bin/mv -f samba-doc.html ../htmldocs/Samba-HOWTO-Collection.html
 
 
@@ -113,7 +115,7 @@ proj-doc:
 man-html-all: $(SGMLMANSRC)
 	@echo Building HTML formatted man pages...
 	@(for i in $?; do \
-	   htmlfile=`basename $$i | sed "s/\.sgml/\.html/g"`; \
+	   htmlfile=`echo $$i | sed 's,.*/,,' | sed "s/\.sgml/\.html/g"`; \
 	   echo "Making $$htmlfile"; \
 	   $(JADE) -t sgml -i html -V nochunks -d  ./stylesheets/ldp.dsl\#html -f /tmp/jade.log $$i > ../htmldocs/$$htmlfile; \
 	   cat /tmp/jade.log | grep -v DTDDECL; \
@@ -124,7 +126,7 @@ man-html-all: $(SGMLMANSRC)
 man-all: $(SGMLMANSRC)
 	@echo Building man pages...
 	@(for i in $?; do \
-		manfile=`basename $$i | sed "s/\.sgml//g"`; \
+		manfile=`echo $$i | sed 's,.*/,,' | sed "s/\.sgml//g"`; \
 		echo "Making $$manfile"; \
 		$(ONSGMLS) -f /tmp/docbook2x.log $$i | $(SGMLSPL) \
 	           $(SGML_SHARE)/docbook2X/docbook2man-spec.pl; \
@@ -143,210 +145,218 @@ man-all: $(SGMLMANSRC)
 $(MANDIR)/findsmb.1:  manpages/findsmb.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbclient.1: manpages/smbclient.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbspool.8: manpages/smbspool.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/lmhosts.5: manpages/lmhosts.5.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbcontrol.1: manpages/smbcontrol.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbstatus.1: manpages/smbstatus.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/make_smbcodepage.1: manpages/make_smbcodepage.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
+
+$(MANDIR)/make_unicodemap.1: manpages/make_unicodemap.1.sgml
+	@echo "Making $@"
+	@$(ONSGMLS) $< | $(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"`
 
 $(MANDIR)/smbd.8: manpages/smbd.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbtar.1: manpages/smbtar.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/nmbd.8: manpages/nmbd.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbmnt.8: manpages/smbmnt.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbumount.8: manpages/smbumount.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/nmblookup.1: manpages/nmblookup.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbmount.8: manpages/smbmount.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/swat.8: manpages/swat.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/rpcclient.1: manpages/rpcclient.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbpasswd.5: manpages/smbpasswd.5.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/testparm.1: manpages/testparm.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/samba.7: manpages/samba.7.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbpasswd.8: manpages/smbpasswd.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/testprns.1: manpages/testprns.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smb.conf.5: manpages/smb.conf.5.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/wbinfo.1: manpages/wbinfo.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbcacls.1: manpages/smbcacls.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/smbsh.1 : manpages/smbsh.1.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 $(MANDIR)/winbindd.8: manpages/winbindd.8.sgml
 	@echo "Making $@"
 	@$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl
-	@cat `basename $@` | $(PERL) scripts/strip-links.pl > $@
+	@cat `echo $@ | sed 's,.*/,,'` | $(PERL) scripts/strip-links.pl > $@
-	@/bin/rm -f `basename $@`
+	@/bin/rm -f `echo $@ | sed 's,.*/,,'`
 	@echo "Making HTML version of $@"
-	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"`
+	@$(JADE) -t sgml -i html -V nochunks -d ./stylesheets/ldp.dsl\#html $< > $(HTMLDIR)/`echo $< | sed 's,.*/,,'| sed "s/\.sgml/\.html/g"`
 
 
 ## Clean Rule

docs/docbook/manpages/make_smbcodepage.1.sgml

@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="findsmb">
+<refentry id="make-smbcodepage">
 
 <refmeta>
 	<refentrytitle>make_smbcodepage</refentrytitle>
@@ -56,11 +56,11 @@
 		
 		<varlistentry>
 		<term>inputfile</term>
-		<listitem><para>This is the input file to process. In t
+		<listitem><para>This is the input file to process. In 
-		he '<parameter>c</parameter>' case this will be a text 
+		the <parameter>c</parameter> case this will be a text 
 		codepage definition file such as the ones found in the Samba 	
 		<filename>source/codepages</filename> directory. In
-		the '<parameter>d</parameter>' case this will be the 
+		the <parameter>d</parameter> case this will be the 
 		binary format codepage definition file normally found in 
 		the <filename>lib/codepages</filename> directory in the 
 		Samba install directory path.</para></listitem>

docs/docbook/manpages/make_unicodemap.1.sgml

@@ -0,0 +1,172 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<refentry id="make-unicodemap">
+
+<refmeta>
+	<refentrytitle>make_unicodemap</refentrytitle>
+	<manvolnum>1</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>make_unicodemap</refname>
+	<refpurpose>construct a unicode map file for Samba</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>make_unicodemap</command>
+		<arg choice="req">codepage</arg>
+		<arg choice="req">inputfile</arg>
+		<arg choice="req">outputfile</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>
+	This tool is part of the <ulink url="samba.7.html">Samba</ulink> 
+	suite.
+	</para>
+
+	<para>
+	<command>make_unicodemap</command> compiles text unicode map 
+	files into binary unicodef map files for use with the 
+	internationalization features of Samba 2.2.
+	</para>
+</refsect1>
+
+
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>codepage</term>
+		<listitem><para>This is the codepage or UNIX character 
+		set we are processing (a number, e.g. 850).
+		</para></listitem>
+		</varlistentry>
+		
+		<varlistentry>
+		<term>inputfile</term>
+		<listitem><para>This is the input file to process. This is a 
+		text unicode map file such as the ones found in the Samba
+		<filename>source/codepages</filename> directory. 
+		</para></listitem>
+		</varlistentry>
+		
+		<varlistentry>
+		<term>outputfile</term>
+		<listitem><para>This is the binary output file to produce. 
+		</para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+
+<refsect1>
+	<title>Samba Unicode Map Files</title>
+
+	<para>
+	A text Samba unicode map file is a description that tells Samba 
+	how to map characters from a specified DOS code page or UNIX character 
+	set to 16 bit unicode.
+	</para>
+
+	<para>A binary Samba unicode map file is a binary representation 
+	of the same information, including a value that specifies what 
+	codepage or UNIX character set this file is describing. 
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>Files</title>
+
+	<para><filename>CP&lt;codepage&gt;.TXT</filename></para> 
+
+	<para>
+	These are the input (text) unicode map files provided 
+	in the Samba <filename>source/codepages</filename> 
+	directory. 
+	</para>
+	
+	<para>
+	A text unicode map file consists of multiple lines 
+	containing two fields. These fields are :  
+	</para>
+	
+	<itemizedlist>
+		<listitem><para><parameter>character</parameter> - which is 
+		the (hex) character mapped on this line.
+		</para></listitem>
+		
+		<listitem><para><parameter>unicode</parameter> - which 
+		is the (hex) 16 bit unicode character that the character
+		will map to. 
+		</para></listitem>
+	</itemizedlist>
+
+	<para>
+	<filename>unicode_map.&lt;codepage&gt;</filename>  - These are 
+	the output (binary) unicode map files produced and placed in 
+	the Samba destination <filename>lib/codepage</filename> 
+	directory.
+	</para>
+</refsect1>
+
+
+<refsect1>
+	<title>Installation</title>
+
+	<para>
+	The location of the server and its support files is a matter
+	for individual system administrators. The following are thus 
+	suggestions only. 
+	</para>
+	
+	<para>
+	It is recommended that the <command>make_unicodemap</command> 
+	program be installed under the 
+	<filename>$prefix/samba</filename> hierarchy, 
+	in a directory readable by all, writeable only by root. The 
+	program itself should be executable by all.  The program
+	should NOT be setuid or setgid! 
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 2.2 of 
+	the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+	<title>SEE ALSO</title>
+	<para><ulink url="smbd.8.html"><command>smbd(8)</command></ulink>, 
+	<ulink url="smb.conf.5.html">smb.conf(5)</ulink>
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+	
+	<para>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.</para>
+	
+	<para>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
+	<ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
+	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
+	release by Jeremy Allison.  The conversion to DocBook for 
+	Samba 2.2 was done by Gerald Carter</para>
+</refsect1>
+
+</refentry>

docs/docbook/manpages/nmbd.8.sgml

@@ -37,7 +37,7 @@
 
 	<para><command>nmbd</command> is a server that understands 
 	and can reply to NetBIOS over IP name service requests, like 
-	those produced by SMBD/CIFS clients such as Windows 95/98/ME, 
+	those produced by SMB/CIFS clients such as Windows 95/98/ME, 
 	Windows NT, Windows 2000, and LanManager clients. It also
 	participates in the browsing protocols which make up the 
 	Windows "Network Neighborhood" view.</para>

docs/docbook/manpages/rpcclient.1.sgml

@@ -107,8 +107,9 @@
 		
 		<varlistentry>
 		<term>-l logbasename</term>
-		<listitem><para>File name for log/debug files. .client will be 
+		<listitem><para>File name for log/debug files. The extension 
-		appended. The log file is never removed  by the client.
+		'.client' will be appended. The log file is never removed  
+		by the client.
 		</para></listitem>
 		</varlistentry>
 
@@ -161,9 +162,8 @@
 		<varlistentry>
 		<term>-W domain</term>
 		<listitem><para>Set the SMB domain of the username.   This 
-		overrides the default  domain which is the domain of the 
+		overrides the default domain which is the domain defined in 
-		server specified with the  <parameter>-S</parameter> option.  
+		smb.conf.  If the domain specified is the same as the server's NetBIOS name, 
-		If the domain specified is the same as the server's NetBIOS name, 
 		it causes the client to log on using the  server's local SAM (as 
 		opposed to the Domain SAM). </para></listitem>
 		</varlistentry>
@@ -179,8 +179,15 @@
 	<para><emphasis>LSARPC</emphasis></para>
 	<itemizedlist>
 		<listitem><para><command>lsaquery</command></para></listitem>
-		<listitem><para><command>lookupsids</command></para></listitem>
+		
-		<listitem><para><command>lookupnames</command></para></listitem>
+		<listitem><para><command>lookupsids</command> - Resolve a list 
+		of SIDs to usernames.
+		</para></listitem>
+		
+		<listitem><para><command>lookupnames</command> - Resolve s list 
+		of usernames to SIDs.
+		</para></listitem>
+		
 		<listitem><para><command>enumtrusts</command></para></listitem>
 	</itemizedlist>	
 	<para> </para>
@@ -193,6 +200,10 @@
 		<listitem><para><command>querygroup</command></para></listitem>
 		<listitem><para><command>queryusergroups</command></para></listitem>
 		<listitem><para><command>querygroupmem</command></para></listitem>
+		<listitem><para><command>queryaliasmem</command></para></listitem>
+		<listitem><para><command>querydispinfo</command></para></listitem>
+		<listitem><para><command>querydominfo</command></para></listitem>
+		<listitem><para><command>enumdomgroups</command></para></listitem>
 	</itemizedlist>
 	<para> </para>
 
@@ -244,6 +255,12 @@
 		</listitem>
 
 
+		<listitem><para><command>deldriver</command> - Delete the 
+		specified printer driver for all architectures.  This
+		does not delete the actual driver files from the server,
+		only the entry from the server's list of drivers.
+		</para></listitem>
+
 		<listitem><para><command>enumdata</command> - Enumerate all 
 		printer setting data stored on the server. On Windows NT  clients, 
 		these values are stored  in the registry, while Samba servers 

docs/docbook/manpages/smb.conf.5.sgml

@@ -325,7 +325,7 @@
 
 	<para>Many of the strings that are settable in the config file 
 	can take substitutions. For example the option "path =
-	/tmp/%U" would be interpreted as "path = 
+	/tmp/%u" would be interpreted as "path = 
 	/tmp/john" if the user connected with the username john.</para>
 
 	<para>These substitutions are mostly noted in the descriptions below, 
@@ -586,8 +586,9 @@
 	each parameter for details.  Note that some are synonyms.</para>
 
 	<itemizedlist>
+		<listitem><para><link linkend="ADDPRINTERCOMMAND"><parameter>add printer command</parameter></link></para></listitem>
+		<listitem><para><link linkend="ADDSHARECOMMAND"><parameter>add share command</parameter></link></para></listitem>
 		<listitem><para><link linkend="ADDUSERSCRIPT"><parameter>add user script</parameter></link></para></listitem>
-		<listitem><para><link linkend="ADDPRINTERCOMMAND"><parameter>addprinter command</parameter></link></para></listitem>
 		<listitem><para><link linkend="ALLOWTRUSTEDDOMAINS"><parameter>allow trusted domains</parameter></link></para></listitem>
 		<listitem><para><link linkend="ANNOUNCEAS"><parameter>announce as</parameter></link></para></listitem>
 		<listitem><para><link linkend="ANNOUNCEVERSION"><parameter>announce version</parameter></link></para></listitem>
@@ -595,6 +596,7 @@
 		<listitem><para><link linkend="BINDINTERFACESONLY"><parameter>bind interfaces only</parameter></link></para></listitem>
 		<listitem><para><link linkend="BROWSELIST"><parameter>browse list</parameter></link></para></listitem>
 		<listitem><para><link linkend="CHANGENOTIFYTIMEOUT"><parameter>change notify timeout</parameter></link></para></listitem>
+		<listitem><para><link linkend="CHANGESHARECOMMAND"><parameter>change share command</parameter></link></para></listitem>
 		<listitem><para><link linkend="CHARACTERSET"><parameter>character set</parameter></link></para></listitem>
 		<listitem><para><link linkend="CLIENTCODEPAGE"><parameter>client code page</parameter></link></para></listitem>
 		<listitem><para><link linkend="CODEPAGEDIRECTORY"><parameter>code page directory</parameter></link></para></listitem>
@@ -608,15 +610,13 @@
 		<listitem><para><link linkend="DEBUGLEVEL"><parameter>debuglevel</parameter></link></para></listitem>
 		<listitem><para><link linkend="DEFAULT"><parameter>default</parameter></link></para></listitem>
 		<listitem><para><link linkend="DEFAULTSERVICE"><parameter>default service</parameter></link></para></listitem>
+		<listitem><para><link linkend="DELETEPRINTERCOMMAND"><parameter>delete printer command</parameter></link></para></listitem>
+		<listitem><para><link linkend="DELETESHARECOMMAND"><parameter>delete share command</parameter></link></para></listitem>
 		<listitem><para><link linkend="DELETEUSERSCRIPT"><parameter>delete user script</parameter></link></para></listitem>
-		<listitem><para><link linkend="DELETEPRINTERCOMMAND"><parameter>deleteprinter command</parameter></link></para></listitem>
 		<listitem><para><link linkend="DFREECOMMAND"><parameter>dfree command</parameter></link></para></listitem>
 		<listitem><para><link linkend="DNSPROXY"><parameter>dns proxy</parameter></link></para></listitem>
 		<listitem><para><link linkend="DOMAINADMINGROUP"><parameter>domain admin group</parameter></link></para></listitem>
-		<listitem><para><link linkend="DOMAINADMINUSERS"><parameter>domain admin users</parameter></link></para></listitem>
-		<listitem><para><link linkend="DOMAINGROUPS"><parameter>domain groups</parameter></link></para></listitem>
 		<listitem><para><link linkend="DOMAINGUESTGROUP"><parameter>domain guest group</parameter></link></para></listitem>
-		<listitem><para><link linkend="DOMAINGUESTUSERS"><parameter>domain guest users</parameter></link></para></listitem>
 		<listitem><para><link linkend="DOMAINLOGONS"><parameter>domain logons</parameter></link></para></listitem>
 		<listitem><para><link linkend="DOMAINMASTER"><parameter>domain master</parameter></link></para></listitem>
 		<listitem><para><link linkend="ENCRYPTPASSWORDS"><parameter>encrypt passwords</parameter></link></para></listitem>
@@ -670,9 +670,11 @@
 		<listitem><para><link linkend="NTPIPESUPPORT"><parameter>nt pipe support</parameter></link></para></listitem>
 		<listitem><para><link linkend="NTSMBSUPPORT"><parameter>nt smb support</parameter></link></para></listitem>
 		<listitem><para><link linkend="NULLPASSWORDS"><parameter>null passwords</parameter></link></para></listitem>
+		<listitem><para><link linkend="OBEYPAMRESTRICTIONS"><parameter>obey pam restrictions</parameter></link></para></listitem>
 		<listitem><para><link linkend="OPLOCKBREAKWAITTIME"><parameter>oplock break wait time</parameter></link></para></listitem>
 		<listitem><para><link linkend="OSLEVEL"><parameter>os level</parameter></link></para></listitem>
 		<listitem><para><link linkend="OS2DRIVERMAP"><parameter>os2 driver map</parameter></link></para></listitem>
+		<listitem><para><link linkend="PAMPASSWORDCHANGE"><parameter>pam password change</parameter></link></para></listitem>
 		<listitem><para><link linkend="PANICACTION"><parameter>panic action</parameter></link></para></listitem>
 		<listitem><para><link linkend="PASSWDCHAT"><parameter>passwd chat</parameter></link></para></listitem>
 		<listitem><para><link linkend="PASSWDCHATDEBUG"><parameter>passwd chat debug</parameter></link></para></listitem>
@@ -881,6 +883,119 @@
 	
 	<variablelist>
 	
+
+		<varlistentry>
+		<term><anchor id="ADDPRINTERCOMMAND">add printer command (G)</term>
+		<listitem><para>With the introduction of MS-RPC based printing
+		support for Windows NT/2000 clients in Samba 2.2, The MS Add
+		Printer Wizard (APW) icon is now also available in the 
+		"Printers..." folder displayed a share listing.  The APW
+		allows for printers to be add remotely to a Samba or Windows 
+		NT/2000 print server.</para>
+		
+		<para>For a Samba host this means that the printer must be 
+		physically added to underlying printing system.  The <parameter>add 
+		printer command</parameter> defines a script to be run which 
+		will perform the necessary operations for adding the printer
+		to the print system and to add the appropriate service definition 
+		to the  <filename>smb.conf</filename> file in order that it can be 
+		shared by <ulink url="smbd.8.html"><command>smbd(8)</command>
+		</ulink>.</para>
+		
+		<para>The <parameter>add printer command</parameter> is
+		automatically invoked with the following parameter (in 
+		order:</para>
+		
+		<itemizedlist>
+			<listitem><para><parameter>printer name</parameter></para></listitem>
+			<listitem><para><parameter>share name</parameter></para></listitem>
+			<listitem><para><parameter>port name</parameter></para></listitem>
+			<listitem><para><parameter>driver name</parameter></para></listitem>
+			<listitem><para><parameter>location</parameter></para></listitem>
+			<listitem><para><parameter>Windows 9x driver location</parameter>
+			</para></listitem>
+		</itemizedlist>
+		
+		<para>All parameters are filled in from the PRINTER_INFO_2 structure sent 
+		by the Windows NT/2000 client with one exception.  The "Windows 9x
+		driver location" parameter is included for backwards compatibility
+		only.  The remaining fields in the structure are generated from answers
+		to the APW questions.</para>
+		
+		<para>Once the <parameter>add printer command</parameter> has 
+		been executed, <command>smbd</command> will reparse the <filename>
+		smb.conf</filename> to determine if the share defined by the APW
+		exists.  If the sharename is still invalid, then <command>smbd
+		</command> will return an ACCESS_DENIED error to the client.</para>
+		
+		<para>See also <link linkend="DELETEPRINTERCOMMAND"><parameter>
+		delete printer command</parameter></link>, <link 
+		linkend="printing"><parameter>printing</parameter></link>,
+		<link linkend="SHOWADDPRINTERWIZARD"><parameter>show add
+		printer wizard</parameter></link></para>
+		
+		<para>Default: <emphasis>none</emphasis></para>
+		<para>Example: <command>addprinter command = /usr/bin/addprinter
+		</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term><anchor id="ADDSHARECOMMAND">add share command (G)</term>
+		<listitem><para>Samba 2.2.0 introduced the ability to dynamically 
+		add and delete shares via the Windows NT 4.0 Server Manager.  The 
+		<parameter>add share command</parameter> is used to define an 
+		external program or script which will add a new service definition 
+		to <filename>smb.conf</filename>.  In order to successfully 
+		execute the <parameter>add share command</parameter>, <command>smbd</command>
+		requires that the administrator be connected using a root account (i.e. 
+		uid == 0).
+		</para>
+		
+		<para>
+		When executed, <command>smbd</command> will automatically invoke the 
+		<parameter>add share command</parameter> with four parameters.
+		</para>
+		
+		<itemizedlist>
+			<listitem><para><parameter>configFile</parameter> - the location 
+			of the global <filename>smb.conf</filename> file. 
+			</para></listitem>
+			
+			<listitem><para><parameter>shareName</parameter> - the name of the new 
+			share.
+			</para></listitem>
+			
+			<listitem><para><parameter>pathName</parameter> - path to an **existing**
+			directory on disk.
+			</para></listitem>
+			
+			<listitem><para><parameter>comment</parameter> - comment string to associate 
+			with the new share.
+			</para></listitem>
+		</itemizedlist>
+		
+		<para>
+		This parameter is only used for add file shares.  To add printer shares, 
+		see the <link linkend="ADDPRINTERCOMMAND"><parameter>add printer 
+		command</parameter></link>.
+		</para>
+		
+		<para>
+		See also <link linkend="CHANGESHARECOMMAND"><parameter>change share 
+		command</parameter></link>, <link linkend="DELETESHARECOMMAND"><parameter>delete share
+		command</parameter></link>.
+		</para>
+		
+		<para>Default: <emphasis>none</emphasis></para>
+		<para>Example: <command>add share command = /usr/local/bin/addshare</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
 		<varlistentry>
 		<term><anchor id="ADDUSERSCRIPT">add user script (G)</term>
 		<listitem><para>This is the full pathname to a script that will 
@@ -934,63 +1049,6 @@
 
 
 
-		<varlistentry>
-		<term><anchor id="ADDPRINTERCOMMAND">addprinter command (G)</term>
-		<listitem><para>With the introduction of MS-RPC based printing
-		support for Windows NT/2000 clients in Samba 2.2, The MS Add
-		Printer Wizard (APW) icon is now also available in the 
-		"Printers..." folder displayed a share listing.  The APW
-		allows for printers to be add remotely to a Samba or Windows 
-		NT/2000 print server.</para>
-		
-		<para>For a Samba host this means that the printer must be 
-		physically added to underlying printing system.  The <parameter>
-		addprinter command</parameter> defines a script to be run which 
-		will perform the necessary operations for adding the printer
-		to the print system and to add the appropriate service definition 
-		to the  <filename>smb.conf</filename> file in order that it can be 
-		shared by <ulink url="smbd.8.html"><command>smbd(8)</command>
-		</ulink>.</para>
-		
-		<para>The <parameter>addprinter command</parameter> is
-		automatically invoked with the following parameter (in 
-		order:</para>
-		
-		<itemizedlist>
-			<listitem><para><parameter>printer name</parameter></para></listitem>
-			<listitem><para><parameter>share name</parameter></para></listitem>
-			<listitem><para><parameter>port name</parameter></para></listitem>
-			<listitem><para><parameter>driver name</parameter></para></listitem>
-			<listitem><para><parameter>location</parameter></para></listitem>
-			<listitem><para><parameter>Windows 9x driver location</parameter>
-			</para></listitem>
-		</itemizedlist>
-		
-		<para>All parameters are filled in from the PRINTER_INFO_2 structure sent 
-		by the Windows NT/2000 client with one exception.  The "Windows 9x
-		driver location" parameter is included for backwards compatibility
-		only.  The remaining fields in the structure are generated from answers
-		to the APW questions.</para>
-		
-		<para>Once the <parameter>addprinter command</parameter> has 
-		been executed, <command>smbd</command> will reparse the <filename>
-		smb.conf</filename> to determine if the share defined by the APW
-		exists.  If the sharename is still invalid, then <command>smbd
-		</command> will return an ACCESS_DENIED error to the client.</para>
-		
-		<para>See also <link linkend="DELETEPRINTERCOMMAND"><parameter>
-		deleteprinter command</parameter></link>, <link 
-		linkend="printing"><parameter>printing</parameter></link>,
-		<link linkend="SHOWADDPRINTERWIZARD"><parameter>show add
-		printer wizard</parameter></link></para>
-		
-		<para>Default: <emphasis>none</emphasis></para>
-		<para>Example: <command>addprinter command = /usr/bin/addprinter
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
 		<varlistentry>
 		<term><anchor id="ADMINUSERS">admin users (S)</term>
 		<listitem><para>This is a list of users who will be granted 
@@ -1264,7 +1322,60 @@
 		<para>Would change the scan time to every 5 minutes.</para></listitem>
 		</varlistentry>
 		
+
+
+		<varlistentry>
+		<term><anchor id="CHANGESHARECOMMAND">change share command (G)</term>
+		<listitem><para>Samba 2.2.0 introduced the ability to dynamically 
+		add and delete shares via the Windows NT 4.0 Server Manager.  The 
+		<parameter>change share command</parameter> is used to define an 
+		external program or script which will modify an existing service definition 
+		in <filename>smb.conf</filename>.  In order to successfully 
+		execute the <parameter>change share command</parameter>, <command>smbd</command>
+		requires that the administrator be connected using a root account (i.e. 
+		uid == 0).
+		</para>
 		
+		<para>
+		When executed, <command>smbd</command> will automatically invoke the 
+		<parameter>change share command</parameter> with four parameters.
+		</para>
+		
+		<itemizedlist>
+			<listitem><para><parameter>configFile</parameter> - the location 
+			of the global <filename>smb.conf</filename> file. 
+			</para></listitem>
+			
+			<listitem><para><parameter>shareName</parameter> - the name of the new 
+			share.
+			</para></listitem>
+			
+			<listitem><para><parameter>pathName</parameter> - path to an **existing**
+			directory on disk.
+			</para></listitem>
+			
+			<listitem><para><parameter>comment</parameter> - comment string to associate 
+			with the new share.
+			</para></listitem>
+		</itemizedlist>
+		
+		<para>
+		This parameter is only used modify existing file shares definitions.  To modify 
+		printer shares, use the "Printers..." folder as seen when browsing the Samba host.
+		</para>
+		
+		<para>
+		See also <link linkend="ADDSHARECOMMAND"><parameter>add share
+		command</parameter></link>, <link linkend="DELETESHARECOMMAND"><parameter>delete 
+		share command</parameter></link>.
+		</para>
+		
+		<para>Default: <emphasis>none</emphasis></para>
+		<para>Example: <command>change share command = /usr/local/bin/addshare</command></para>
+		</listitem>
+		</varlistentry>
+
+
 		
 		<varlistentry>
 		<term><anchor id="CHARACTERSET">character set (G)</term>
@@ -1545,6 +1656,11 @@
 		mode bits on created directories.  See also the <link linkend="INHERITPERMISSIONS">
 		<parameter>inherit permissions</parameter></link> parameter.</para>
 
+		<para>Note that this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		a mask on access control lists also, they need to set the <link 
+		linkend="SECURITYMASK"><parameter>security mask</parameter></link>.</para>
+
 		<para>Default: <command>create mask = 0744</command></para>
 		<para>Example: <command>create mask = 0775</command></para></listitem>
 		</varlistentry>
@@ -1648,15 +1764,9 @@
 
 		<varlistentry>
 		<term><anchor id="DEBUGLEVEL">debuglevel (G)</term>
-		<listitem><para>The value of the parameter (an integer) allows 
+		<listitem><para>Synonym for <link linkend="LOGLEVEL"><parameter>
-		the debug level (logging level) to be specified in the 
+		log level</parameter></link>.</para>
-		<filename>smb.conf</filename> file. This is to give greater 
+		</listitem>
-		flexibility in the configuration of the system.</para>
-
-		<para>The default will be the debug level specified on 
-		the command line or level zero if none was specified.</para>
-
-		<para>Example: <command>debug level = 3</command></para></listitem>
 		</varlistentry>
 
 
@@ -1720,6 +1830,48 @@
 		
 
 
+		<varlistentry>
+		<term><anchor id="DELETEPRINTERCOMMAND">delete printer command (G)</term>
+		<listitem><para>With the introduction of MS-RPC based printer
+		support for Windows NT/2000 clients in Samba 2.2, it is now 
+		possible to delete printer at run time by issuing the 
+		DeletePrinter() RPC call.</para>
+		
+		<para>For a Samba host this means that the printer must be 
+		physically deleted from underlying printing system.  The <parameter>
+		deleteprinter command</parameter> defines a script to be run which 
+		will perform the necessary operations for removing the printer
+		from the print system and from <filename>smb.conf</filename>.
+		</para>
+		
+		<para>The <parameter>delete printer command</parameter> is 
+		automatically called with only one parameter: <parameter>
+		"printer name"</parameter>.</para>
+		
+				
+		<para>Once the <parameter>delete printer command</parameter> has 
+		been executed, <command>smbd</command> will reparse the <filename>
+		smb.conf</filename> to associated printer no longer exists.  
+		If the sharename is still valid, then <command>smbd
+		</command> will return an ACCESS_DENIED error to the client.</para>
+		
+		<para>See also <link linkend="ADDPRINTERCOMMAND"><parameter>
+		add printer command</parameter></link>, <link 
+		linkend="printing"><parameter>printing</parameter></link>,
+		<link linkend="SHOWADDPRINTERWIZARD"><parameter>show add
+		printer wizard</parameter></link></para>
+		
+		<para>Default: <emphasis>none</emphasis></para>
+		<para>Example: <command>deleteprinter command = /usr/bin/removeprinter
+		</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
+
+
+
 		<varlistentry>
 		<term><anchor id="DELETEREADONLY">delete readonly (S)</term>
 		<listitem><para>This parameter allows readonly files to be deleted.  
@@ -1733,6 +1885,53 @@
 		</varlistentry>
 
 
+
+		<varlistentry>
+		<term><anchor id="DELETESHARECOMMAND">delete share command (G)</term>
+		<listitem><para>Samba 2.2.0 introduced the ability to dynamically 
+		add and delete shares via the Windows NT 4.0 Server Manager.  The 
+		<parameter>delete share command</parameter> is used to define an 
+		external program or script which will remove an existing service 
+		definition from <filename>smb.conf</filename>.  In order to successfully 
+		execute the <parameter>delete share command</parameter>, <command>smbd</command>
+		requires that the administrator be connected using a root account (i.e. 
+		uid == 0).
+		</para>
+		
+		<para>
+		When executed, <command>smbd</command> will automatically invoke the 
+		<parameter>delete share command</parameter> with two parameters.
+		</para>
+		
+		<itemizedlist>
+			<listitem><para><parameter>configFile</parameter> - the location 
+			of the global <filename>smb.conf</filename> file. 
+			</para></listitem>
+			
+			<listitem><para><parameter>shareName</parameter> - the name of 
+			the existing service.
+			</para></listitem>
+		</itemizedlist>
+		
+		<para>
+		This parameter is only used to remove file shares.  To delete printer shares, 
+		see the <link linkend="DELETEPRINTERCOMMAND"><parameter>delete printer 
+		command</parameter></link>.
+		</para>
+		
+		<para>
+		See also <link linkend="ADDSHARECOMMAND"><parameter>delete share
+		command</parameter></link>, <link linkend="CHANGESHARECOMMAND"><parameter>change 
+		share</parameter></link>.
+		</para>
+		
+		<para>Default: <emphasis>none</emphasis></para>
+		<para>Example: <command>delete share command = /usr/local/bin/delshare</command></para>
+		
+		</listitem>
+		</varlistentry>
+
+
 		
 		
 		<varlistentry>
@@ -1797,46 +1996,6 @@
 
 
 
-		<varlistentry>
-		<term><anchor id="DELETEPRINTERCOMMAND">deleteprinter command (G)</term>
-		<listitem><para>With the introduction of MS-RPC based printer
-		support for Windows NT/2000 clients in Samba 2.2, it is now 
-		possible to delete printer at run time by issuing the 
-		DeletePrinter() RPC call.</para>
-		
-		<para>For a Samba host this means that the printer must be 
-		physically deleted from underlying printing system.  The <parameter>
-		deleteprinter command</parameter> defines a script to be run which 
-		will perform the necessary operations for removing the printer
-		from the print system and from <filename>smb.conf</filename>.
-		</para>
-		
-		<para>The <parameter>deleteprinter command</parameter> is 
-		automatically called with only one parameter: <parameter>
-		"printer name"</parameter>.</para>
-		
-				
-		<para>Once the <parameter>deleteprinter command</parameter> has 
-		been executed, <command>smbd</command> will reparse the <filename>
-		smb.conf</filename> to associated printer no longer exists.  
-		If the sharename is still valid, then <command>smbd
-		</command> will return an ACCESS_DENIED error to the client.</para>
-		
-		<para>See also <link linkend="ADDPRINTERCOMMAND"><parameter>
-		addprinter command</parameter></link>, <link 
-		linkend="printing"><parameter>printing</parameter></link>,
-		<link linkend="SHOWADDPRINTERWIZARD"><parameter>show add
-		printer wizard</parameter></link></para>
-		
-		<para>Default: <emphasis>none</emphasis></para>
-		<para>Example: <command>deleteprinter command = /usr/bin/removeprinter
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-
 
 		<varlistentry>
 		<term><anchor id="DELETEVETOFILES">delete veto files (S)</term>
@@ -1962,6 +2121,11 @@
 		</parameter></link> parameter. This parameter is set to 000 by 
 		default (i.e. no extra mode bits are added).</para>
 
+		<para>Note that this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		a mask on access control lists also, they need to set the <link 
+		linkend="DIRECTORYSECURITYMASK"><parameter>directory security mask</parameter></link>.</para>
+
 		<para>See the <link linkend="FORCEDIRECTORYMODE"><parameter>force 
 		directory mode</parameter></link> parameter to cause particular mode 
 		bits to always be set on created directories.</para>
@@ -2002,17 +2166,15 @@
 		mask may be treated as a set of bits the user is not allowed 
 		to change.</para>
 
-		<para>If not set explicitly this parameter is set to the same 
+		<para>If not set explicitly this parameter is set to 0777
-		value as the <link linkend="DIRECTORYMASK"><parameter>directory 
+		meaning a user is allowed to modify all the user/group/world
-		mask</parameter></link> parameter. To allow a user to
+		permissions on a directory.</para>
-		modify all the user/group/world permissions on a directory, set 
-		this parameter to 0777.</para>
 
 		<para><emphasis>Note</emphasis> that users who can access the 
 		Samba server through other means can easily bypass this restriction, 
 		so it is primarily useful for standalone "appliance" systems.  
-		Administrators of most normal systems will probably want to set 
+		Administrators of most normal systems will probably want to leave
-		it to 0777.</para>
+		it as the default of 0777.</para>
 
 		<para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE"><parameter>
 		force directory security mode</parameter></link>, <link
@@ -2020,9 +2182,8 @@
 		<link linkend="FORCESECURITYMODE"><parameter>force security mode
 		</parameter></link> parameters.</para>
 
-		<para>Default: <command>directory security mask = &lt;same as 
+		<para>Default: <command>directory security mask = 0777</command></para>
-		directory mask&gt;</command></para>
+		<para>Example: <command>directory security mask = 0700</command></para>
-		<para>Example: <command>directory security mask = 0777</command></para>
 		</listitem>
 		</varlistentry>
 		
@@ -2054,67 +2215,47 @@
 
 		<varlistentry>
 		<term><anchor id="DOMAINADMINGROUP">domain admin group (G)</term>
-		<listitem><para>This is an <emphasis>EXPERIMENTAL</emphasis> parameter 
+		<listitem><para>This parameter is intended as a temporary solution
-		that is part of the unfinished Samba NT Domain Controller Code. It may 
+		to enable users to be a member of the "Domain Admins" group when 
-		be removed in a later release. To work with the latest code builds 
+		a Samba host is acting as a PDC.  A complete solution will be provided
-		that may have more support for Samba NT Domain Controller functionality 
+		by a system for mapping Windows NT/2000 groups onto UNIX groups.
-		please subscribe to the mailing list <ulink
+		Please note that this parameter has a somewhat confusing name.  It 
-		url="mailto:samba-ntdom@samba.org">samba-ntdom</ulink> available by 
+		accepts a list of usernames and of group names in standard 
-		visiting the web page at <ulink url="http://lists.samba.org/">
+		<filename>smb.conf</filename>	notation.
-		http://lists.samba.org/</ulink>.</para></listitem>
+		</para>
+		
+		<para>See also <link linkend="DOMAINGUESTGROUP"><parameter>domain
+		guest group</parameter></link>, <link linkend="DOMAINLOGONS"><parameter>domain
+		logons</parameter></link>
+		</para>
+		
+		<para>Default: <emphasis>no domain administrators</emphasis></para>
+		<para>Example: <command>domain admin group = root @wheel</command></para>
+		</listitem>
 		</varlistentry>
 
 
-		<varlistentry>
-		<term><anchor id="DOMAINADMINUSERS">domain admin users (G)</term>
-		<listitem><para>This is an <emphasis>EXPERIMENTAL</emphasis> parameter 
-		that is part of the unfinished Samba NT Domain Controller Code. It may 
-		be removed in a later release. To work with the latest code builds 
-		that may have more support for Samba NT Domain Controller functionality 
-		please subscribe to the mailing list <ulink
-		url="mailto:samba-ntdom@samba.org">samba-ntdom</ulink> available by 
-		visiting the web page at <ulink url="http://lists.samba.org/">
-		http://lists.samba.org/</ulink>.</para></listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="DOMAINGROUPS">domain groups (G)</term>
-		<listitem><para>This is an <emphasis>EXPERIMENTAL</emphasis> parameter 
-		that is part of the unfinished Samba NT Domain Controller Code. It may 
-		be removed in a later release. To work with the latest code builds 
-		that may have more support for Samba NT Domain Controller functionality 
-		please subscribe to the mailing list <ulink
-		url="mailto:samba-ntdom@samba.org">samba-ntdom</ulink> available by 
-		visiting the web page at <ulink url="http://lists.samba.org/">
-		http://lists.samba.org/</ulink>.</para></listitem>
-		</varlistentry>
-
 
 
 		<varlistentry>
 		<term><anchor id="DOMAINGUESTGROUP">domain guest group (G)</term>
-		<listitem><para>This is an <emphasis>EXPERIMENTAL</emphasis> parameter 
+		<listitem><para>This parameter is intended as a temporary solution
-		that is part of the unfinished Samba NT Domain Controller Code. It may 
+		to enable users to be a member of the "Domain Guests" group when 
-		be removed in a later release. To work with the latest code builds 
+		a Samba host is acting as a PDC.  A complete solution will be provided
-		that may have more support for Samba NT Domain Controller functionality 
+		by a system for mapping Windows NT/2000 groups onto UNIX groups.
-		please subscribe to the mailing list <ulink
+		Please note that this parameter has a somewhat confusing name.  It 
-		url="mailto:samba-ntdom@samba.org">samba-ntdom</ulink> available by 
+		accepts a list of usernames and of group names in standard 
-		visiting the web page at <ulink url="http://lists.samba.org/">
+		<filename>smb.conf</filename>	notation.
-		http://lists.samba.org/</ulink>.</para></listitem>
+		</para>
-		</varlistentry>
+		
-
+		<para>See also <link linkend="DOMAINADMINGROUP"><parameter>domain
-
+		admin group</parameter></link>, <link linkend="DOMAINLOGONS"><parameter>domain
-		<varlistentry>
+		logons</parameter></link>
-		<term><anchor id="DOMAINGUESTUSERS">domain guest users (G)</term>
+		</para>		
-		<listitem><para>This is an <emphasis>EXPERIMENTAL</emphasis> parameter 
+		
-		that is part of the unfinished Samba NT Domain Controller Code. It may 
+		<para>Default: <emphasis>no domain guests</emphasis></para>
-		be removed in a later release. To work with the latest code builds 
+		<para>Example: <command>domain guest group = nobody @guest</command></para>
-		that may have more support for Samba NT Domain Controller functionality 
+		</listitem>
-		please subscribe to the mailing list <ulink
-		url="mailto:samba-ntdom@samba.org">samba-ntdom</ulink> available by 
-		visiting the web page at <ulink url="http://lists.samba.org/">
-		http://lists.samba.org/</ulink>.</para></listitem>
 		</varlistentry>
 
 
@@ -2431,6 +2572,12 @@
 		mode after the mask set in the <parameter>create mask</parameter> 
 		parameter is applied.</para>
 		
+		<para>Note that by default this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		this mask on access control lists also, they need to set the <link 
+		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
+		mask</parameter></link> to true.</para>
+
 		<para>See also the parameter <link linkend="CREATEMASK"><parameter>create 
 		mask</parameter></link> for details on masking mode bits on files.</para>
 
@@ -2459,6 +2606,12 @@
 		mask in the parameter <parameter>directory mask</parameter> is 
 		applied.</para>
 
+		<para>Note that by default this parameter does not apply to permissions
+		set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+		this mask on access control lists also, they need to set the <link 
+		linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with 
+		mask</parameter></link> to true.</para>
+
 		<para>See also the parameter <link linkend="DIRECTORYMASK"><parameter>
 		directory mask</parameter></link> for details on masking mode bits 
 		on created directories.</para>
@@ -2490,17 +2643,15 @@
 		mask may be treated as a set of bits that, when modifying security 
 		on a directory, the user has always set to be 'on'.</para>
 
-		<para>If not set explicitly this parameter is set to the same 
+		<para>If not set explicitly this parameter is 000, which 
-		value as the <link linkend="FORCEDIRECTORYMODE"><parameter>force 
+		allows a user to modify all the user/group/world permissions on a 
-		directory mode</parameter></link> parameter. To allow
+		directory without restrictions.</para>
-		a user to modify all the user/group/world permissions on a 
-		directory without restrictions, set this parameter to 000.</para>
 
 		<para><emphasis>Note</emphasis> that users who can access the 
 		Samba server through other means can easily bypass this restriction, 
 		so it is primarily useful for standalone "appliance" systems.  
-		Administrators of most normal systems will probably want to set 
+		Administrators of most normal systems will probably want to leave
-		it to 0000.</para>
+		it set as 0000.</para>
 
 		<para>See also the <link linkend="DIRECTORYSECURITYMASK"><parameter>
 		directory security mask</parameter></link>, <link linkend="SECURITYMASK">
@@ -2508,9 +2659,8 @@
 		<link linkend="FORCESECURITYMODE"><parameter>force security mode
 		</parameter></link> parameters.</para>
 
-		<para>Default: <command>force directory security mode = &lt;same as 
+		<para>Default: <command>force directory security mode = 0</command></para>
-		force directory mode&gt;</command></para>
+		<para>Example: <command>force directory security mode = 700</command></para>
-		<para>Example: <command>force directory security mode = 0</command></para>
 		</listitem>
 		</varlistentry>
 
@@ -2568,17 +2718,15 @@
 		mask may be treated as a set of bits that, when modifying security 
 		on a file, the user has always set to be 'on'.</para>
 
-		<para>If not set explicitly this parameter is set to the same 
+		<para>If not set explicitly this parameter is set to 0,
-		value as the <link linkend="FORCECREATEMODE"><parameter>force 
+		and allows a user to modify all the user/group/world permissions on a file,
-		create mode</parameter></link> parameter. To allow a user to 
+		with no restrictions.</para>
-		modify all the user/group/world permissions on a file, with no 
-		restrictions set this parameter to 000.</para>
 		
 		<para><emphasis>Note</emphasis> that users who can access 
 		the Samba server through other means can easily bypass this restriction, 
 		so it is primarily useful for standalone "appliance" systems.  
-		Administrators of most normal systems will probably want to set 
+		Administrators of most normal systems will probably want to leave
-		it to 0000.</para>
+		this set to 0000.</para>
 
 		<para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE"><parameter>
 		force directory security mode</parameter></link>,
@@ -2586,9 +2734,8 @@
 		mask</parameter></link>, <link linkend="SECURITYMASK"><parameter>
 		security mask</parameter></link> parameters.</para>
 
-		<para>Default: <command>force security mode = &lt;same as force 
+		<para>Default: <command>force security mode = 0</command></para>
-		create mode&gt;</command></para>
+		<para>Example: <command>force security mode = 700</command></para>
-		<para>Example: <command>force security mode = 0</command></para>
 		</listitem>
 		</varlistentry>
 		
@@ -3340,9 +3487,15 @@
 
 		<varlistentry>
 		<term><anchor id="LOGLEVEL">log level (G)</term>
-		<listitem><para>Synonym for <link linkend="DEBUGLEVEL"><parameter>
+		<listitem><para>The value of the parameter (an integer) allows 
-		debug level</parameter></link>.</para>
+		the debug level (logging level) to be specified in the 
-		</listitem>
+		<filename>smb.conf</filename> file. This is to give greater 
+		flexibility in the configuration of the system.</para>
+
+		<para>The default will be the log level specified on 
+		the command line or level zero if none was specified.</para>
+
+		<para>Example: <command>log level = 3</command></para></listitem>
 		</varlistentry>
 
 
@@ -4580,6 +4733,28 @@
 
 
 
+
+		<varlistentry>
+		<term><anchor id="OBEYPAMRESTRICTIONS">obey pam restrictions (G)</term>
+		<listitem><para>When Samba 2.2 is configure to enable PAM support
+		(i.e. --with-pam), this parameter will control whether or not Samba
+		should obey PAM's account and session management directives.  The 
+		default behavior is to use PAM for clear text authentication only
+		and to ignore any account or session management.  Note that Samba
+		always ignores PAM for authentication in the case of <link
+		linkend="ENCRYPTPASSWORDS"><parameter>encrypt passwords = yes</parameter>
+		</link>.  The reason is that PAM modules cannot support the challenge/response
+		authentication mechanism needed in the presence of SMB password encryption.
+		</para>
+
+		<para>Default: <command>obey pam restrictions = no</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
+
+
 		<varlistentry>
 		<term><anchor id="ONLYUSER">only user (S)</term>
 		<listitem><para>This is a boolean option that controls whether 
@@ -4608,24 +4783,6 @@
 
 
 
-
-		<varlistentry>
-		<term><anchor id="OLELOCKINGCOMPATIBILITY">ole locking compatibility (G)</term>
-		<listitem><para>This parameter allows an administrator to turn 
- 		off the byte range lock manipulation that is done within Samba to 
-		give compatibility for OLE applications. Windows OLE applications 
-		use byte range locking as a form of inter-process communication, by 
-		locking ranges of bytes around the 2^32 region of a file range. This 
-		can cause certain UNIX lock managers to crash or otherwise cause 
-		problems. Setting this parameter to <constant>no</constant> means you 
-		trust your UNIX lock manager to handle such cases correctly.</para>
-
-		<para>Default: <command>ole locking compatibility = yes</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
 		<varlistentry>
 		<term><anchor id="ONLYGUEST">only guest (S)</term>
 		<listitem><para>A synonym for <link linkend="GUESTONLY"><parameter>
@@ -4755,6 +4912,21 @@
 		</varlistentry>
 
 
+		<varlistentry>
+		<term><anchor id="PAMPASSWORDCHANGE">pam password change (G)</term>
+		<listitem><para>With the addition of better PAM support in Samba 2.2, 
+		this parameter, it is possible to use PAM's password change control 
+		flag for Samba.  If enabled, then PAM will be used for password
+		changes when requested by an SMB client, and  the <link 
+		linkend="PASSWDCHAT"><parameter>passwd chat</parameter></link> must be
+		be changed to work with the pam prompts.
+		</para>
+		
+		<para>Default: <command>pam password change = no</command></para>
+		
+		</listitem>
+		</varlistentry>
+
 
 		<varlistentry>
 		<term><anchor id="PANICACTION">panic action (G)</term>
@@ -4810,10 +4982,21 @@
 		password cleartext. In this case the old password cleartext is set 
 		to "" (the empty string).</para>
 
+		<para>Also, if the <link linkend="PAMPASSWORDCHANGE"><parameter>pam
+		password change</parameter></link> parameter is set to true, then the
+		chat sequence should consist of three elements. The first element should
+		match the pam prompt for the old password, the second element should match
+		the pam prompt for the first request for the new password, and the final
+		element should match the pam prompt for the second request for the new password.
+		These matches are done case insentively. Under most conditions this change
+		is done as root so the prompt for the old password will never be matched.
+		</para>
+
 		<para>See also <link linkend="UNIXPASSWORDSYNC"><parameter>unix password 
 		sync</parameter></link>, <link linkend="PASSWDPROGRAM"><parameter>
-		passwd program</parameter></link> and <link linkend="PASSWDCHATDEBUG">
+		passwd program</parameter></link> ,<link linkend="PASSWDCHATDEBUG">
-		<parameter>passwd chat debug</parameter></link>.</para>
+		<parameter>passwd chat debug</parameter></link> and <link linkend="PAMPASSWORDCHANGE">
+		<parameter>pam password change</parameter></link>.</para>
 
 		<para>Default: <command>passwd chat = *new*password* %n\n 
 		*new*password* %n\n *changed*</command></para>
@@ -5798,6 +5981,35 @@
 
 
 
+		<varlistentry>
+		<term><anchor id="RESTRICTACLWITHMASK">restrict acl with mask (S)</term>
+		<listitem><para>This is a boolean parameter.  If set to false (default), then 
+		Creation of files with access control lists (ACLS) and modification of ACLs
+		using the Windows NT/2000 ACL editor will be applied directly to the file
+		or directory.</para>
+
+		<para>If set to True, then all requests to set an ACL on a file will have the
+		parameters <link linkend="CREATEMASK"><parameter>create mask</parameter></link>,
+		<link linkend="FORCECREATEMODE"><parameter>force create mode</parameter></link>
+		applied before setting the ACL, and all requests to set an ACL on a directory will
+		have the parameters <link linkend="DIRECTORYMASK"><parameter>directory 
+		mask</parameter></link>, <link linkend="FORCEDIRECTORYMODE"><parameter>force 
+		directory mode</parameter></link> applied before setting the ACL.
+		</para>
+
+		<para>See also <link linkend="CREATEMASK"><parameter>create mask</parameter></link>,
+		<link linkend="FORCECREATEMODE"><parameter>force create mode</parameter></link>,
+		<link linkend="DIRECTORYMASK"><parameter>directory mask</parameter></link>,
+		<link linkend="FORCEDIRECTORYMODE"><parameter>force directory mode</parameter></link>
+		</para>
+
+		<para>Default: <command>restrict acl with mask = no</command></para>
+		</listitem>
+		</varlistentry>
+
+
+
+
 		<varlistentry>
 		<term><anchor id="RESTRICTANONYMOUS">restrict anonymous (G)</term>
 		<listitem><para>This is a boolean parameter.  If it is true, then 
@@ -6176,17 +6388,15 @@
 		mask may be treated as a set of bits the user is not allowed 
 		to change.</para>
 
-		<para>If not set explicitly this parameter is set to the same
+		<para>If not set explicitly this parameter is 0777, allowing
-		value as the <link linkend="CREATEMASK"><parameter>create mask
+		a user to modify all the user/group/world permissions on a file.
-		</parameter></link> parameter. To allow a user to modify all the 
+		</para>
-		user/group/world permissions on a file, set this parameter to 
-		0777.</para>
 
 		<para><emphasis>Note</emphasis> that users who can access the 
 		Samba server through other means can easily bypass this 
 		restriction, so it is primarily useful for standalone 
 		"appliance" systems.  Administrators of most normal systems will 
-		probably want to set it to 0777.</para>
+		probably want to leave it set to 0777.</para>
 		
 		<para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE">
 		<parameter>force directory security mode</parameter></link>, 
@@ -6194,9 +6404,8 @@
 		security mask</parameter></link>, <link linkend="FORCESECURITYMODE">
 		<parameter>force security mode</parameter></link> parameters.</para>
 
-		<para>Default: <command>security mask = &lt;same as create mask&gt;
+		<para>Default: <command>security mask = 0777</command></para>
-		</command></para>
+		<para>Example: <command>security mask = 0770</command></para>
-		<para>Example: <command>security mask = 0777</command></para>
 		</listitem>
 		</varlistentry>
 

docs/docbook/manpages/smbcontrol.1.sgml

@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="findsmb">
+<refentry id="smbcontrol">
 
 <refmeta>
 	<refentrytitle>smbcontrol</refentrytitle>

docs/docbook/manpages/smbspool.8.sgml

@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="findsmb">
+<refentry id="smbspool">
 
 <refmeta>
 	<refentrytitle>smbspool</refentrytitle>
@@ -8,7 +8,7 @@
 
 
 <refnamediv>
-	<refname>nmblookup</refname>
+	<refname>smbspool</refname>
 	<refpurpose>send print file to an SMB printer</refpurpose>
 </refnamediv>
 

docs/docbook/manpages/smbstatus.1.sgml

@@ -1,5 +1,5 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
-<refentry id="findsmb">
+<refentry id="smbstatus">
 
 <refmeta>
 	<refentrytitle>smbstatus</refentrytitle>

docs/docbook/projdoc/CVS-Access.sgml

@@ -0,0 +1,157 @@
+<chapter>
+
+
+<chapterinfo>
+	<author>
+		<affiliation>
+			<orgname>Samba Team</orgname>
+		</affiliation>
+	</author>
+	
+		
+	<pubdate> (22 May 2001) </pubdate>
+</chapterinfo>
+
+<title>HOWTO Access Samba source code via CVS</title>
+
+<sect1>
+<title>Introduction</title>
+
+<para>
+Samba is developed in an open environnment.  Developers use CVS
+(Concurrent Versioning System) to "checkin" (also known as 
+"commit") new source code.  Samba's various CVS branches can
+be accessed via anonymouns CVS using the instructions
+detailed in this chapter.
+</para>
+
+<para>
+This document is a modified version of the instructions found at
+<ulink url="http://samba.org/samba/cvs.html">http://samba.org/samba/cvs.html</ulink>
+</para>
+
+</sect1>
+
+
+<sect1>
+<title>CVS Access to samba.org</title>
+
+<para>
+The machine samba.org runs a publicly accessible CVS 
+repository for access to the source code of several packages, 
+including samba, rsync and jitterbug. There are two main ways of 
+accessing the CVS server on this host.
+</para>
+
+<sect2>
+<title>Access via CVSweb</title>
+
+<para>
+You can access the source code via your 
+favourite WWW browser. This allows you to access the contents of 
+individual files in the repository and also to look at the revision 
+history and commit logs of individual files. You can also ask for a diff 
+listing between any two versions on the repository.
+</para>
+
+<para>
+Use the URL : <ulink
+url="http://samba.org/cgi-bin/cvsweb">http://samba.org/cgi-bin/cvsweb</ulink>
+</para>
+</sect2>
+
+<sect2>
+<title>Access via cvs</title>
+
+<para>
+You can also access the source code via a 
+normal cvs client.  This gives you much more control over you can 
+do with the repository and allows you to checkout whole source trees 
+and keep them uptodate via normal cvs commands. This is the 
+preferred method of access if you are a developer and not
+just a casual browser.
+</para>
+
+<para>
+To download the latest cvs source code, point your
+browser at the URL : <ulink url="http://www.cyclic.com/">http://www.cyclic.com/</ulink>.
+and click on the 'How to get cvs' link. CVS is free software under 
+the GNU GPL (as is Samba).  Note that there are several graphical CVS clients
+which provide a graphical interface to the sometimes mundane CVS commands.
+Links to theses clients are also available from http://www.cyclic.com.
+</para>
+
+<para>
+To gain access via anonymous cvs use the following steps. 
+For this example it is assumed that you want a copy of the 
+samba source code. For the other source code repositories 
+on this system just substitute the correct package name
+</para>
+
+<orderedlist>
+<listitem>
+	<para>
+	Install a recent copy of cvs. All you really need is a 
+	copy of the cvs client binary. 
+	</para>
+</listitem>
+
+
+<listitem>
+	<para>
+	Run the command 
+	</para>
+
+	<para>
+	<command>cvs -d :pserver:cvs@samba.org:/cvsroot login</command>
+	</para>
+	
+	<para>
+	When it asks you for a password type <userinput>cvs</userinput>.
+	</para>
+</listitem>
+
+
+<listitem>
+	<para>
+	Run the command 
+	</para>
+	
+	<para>
+	<command>cvs -d :pserver:cvs@samba.org:/cvsroot co samba</command>
+	</para>
+	
+	<para>
+	This will create a directory called samba containing the 
+	latest samba source code (i.e. the HEAD tagged cvs branch). This 
+	currently corresponds to the 3.0 development tree. 
+	</para>
+	
+	<para>
+	CVS branches other HEAD can be obtained by using the <parameter>-r</parameter>
+	and defining a tag name.  A list of branch tag names can be found on the
+	"Development" page of the samba web site.  A common request is to obtain the
+	latest 2.2 release code.  This could be done by using the following command.
+	</para>
+	
+	<para>
+	<command>cvs -d :pserver:cvs@samba.org:/cvsroot co -r SAMBA_2_2 samba</command>
+	</para>
+</listitem>
+
+<listitem>
+	<para>
+	Whenever you want to merge in the latest code changes use 
+	the following command from within the samba directory: 
+	</para>
+	
+	<para>
+	<command>cvs update -d -P</command>
+	</para>
+</listitem>
+</orderedlist>
+	
+</sect2>
+</sect1>
+
+</chapter>

docs/docbook/projdoc/printer_driver2.sgml

@@ -13,7 +13,7 @@
 	</author>
 	
 		
-	<pubdate> (20 Apr 2001) </pubdate>
+	<pubdate> (3 May 2001) </pubdate>
 </chapterinfo>
 
 <title>Printing Support in Samba 2.2.x</title>
@@ -55,17 +55,42 @@ SPOOLSS support includes:</para>
 	information</para></listitem>
 </itemizedlist>
 
+<para>
+There has been some initial confusion about what all this means
+and whether or not it is a requirement for printer drivers to be 
+installed on a Samba host in order to support printing from Windows 
+clients.  A bug existed in Samba 2.2.0 which made Windows NT/2000 clients 
+require that the Samba server possess a valid driver for the printer.  
+This is fixed in Samba 2.2.1 and once again, Windows NT/2000 clients
+can use the local APW for installing drivers to be used with a Samba 
+served printer.  This is the same behavior exhibited by Windows 9x clients.
+As a side note, Samba does not use these drivers in any way to process 
+spooled files.  They are utilized entirely by the clients.
+</para>
+
+<para>
+The following MS KB article, may be of some help if you are dealing with
+Windows 2000 clients:  <emphasis>How to Add Printers with No User 
+Interaction in Windows 2000</emphasis>
+</para>
+
+<para>
+<ulink url="http://support.microsoft.com/support/kb/articles/Q189/1/05.ASP">http://support.microsoft.com/support/kb/articles/Q189/1/05.ASP</ulink>
+</para>
+
 </sect1>
 
 
 <sect1>
 <title>Configuration</title>
 
+<warning>
+<title>[print$] vs. [printer$]</title>
+
 <para>
-<emphasis>WARNING!!!</emphasis> Previous versions of Samba 
+Previous versions of Samba recommended using a share named [printer$].  
-recommended using a share named [printer$].  This name was taken from the 
+This name was taken from the printer$ service created by Windows 9x 
-printer$ service created by Windows 9x clients when a 
+clients when a printer was shared.  Windows 9x printer servers always have 
-printer was shared.  Windows 9x printer servers always have 
 a printer$ service which provides read-only access via no 
 password in order to support printer driver downloads.
 </para>
@@ -81,13 +106,13 @@ the client.
 </para>
  
 <para>
-These parameters, including <parameter>printer driver 
+These parameters, including <parameter>printer driver
 file</parameter> parameter, are being depreciated and should not 
 be used in new installations.  For more information on this change, 
-you should refer to the <link linkend="MIGRATION">Migration section 
+you should refer to the <link linkend="MIGRATION">Migration section</link>
-</link>of this document.
+of this document.
 </para>
-
+</warning>
 
 <sect2>
 <title>Creating [print$]</title>	
@@ -112,18 +137,22 @@ appropriate values for your site):</para>
     guest ok = yes
     browseable = yes
     read only = yes
+    ; since this share is configured as read only, then we need
+    ; a 'write list'.  Check the file system permissions to make
+    ; sure this account can copy files to the share.  If this
+    ; is setup to a non-root account, then it should also exist
+    ; as a 'printer admin'
     write list = ntadmin
 </programlisting></para>
 	
 <para>The <ulink url="smb.conf.5.html#WRITELIST"><parameter>
 write list</parameter></ulink> is used to allow administrative 
 level user accounts to have write access in order to update files 
-on the share.  See the <ulink url="smb./conf.5.html">
+on the share.  See the <ulink url="smb./conf.5.html">smb.conf(5) 
-smb.conf(5) man page</ulink> for more information on 
+man page</ulink> for more information on configuring file shares.</para>
-configuring file shares.</para>
 	
-<para>The requirement for <ulink url="smb.conf.5.html#GUESTOK"><command>
+<para>The requirement for <ulink url="smb.conf.5.html#GUESTOK"><command>guest 
-guest ok = yes</command></ulink> depends upon how your
+ok = yes</command></ulink> depends upon how your
 site is configured.  If users will be guaranteed to have 
 an account on the Samba host, then this is a non-issue.</para>
 
@@ -165,27 +194,33 @@ for each architecture you wish to support.</para>
 </programlisting></para>
 
 <warning>
-	<title>ATTENTION!  REQUIRED PERMISSIONS</title>
+<title>ATTENTION!  REQUIRED PERMISSIONS</title>
 	
-	<para>In order to currently add a new driver to you Samba host, 
+<para>
-	one of two conditions must hold true:</para>
+In order to currently add a new driver to you Samba host, 
+one of two conditions must hold true:
+</para>
 		
-	<itemizedlist>
+<itemizedlist>
-		<listitem><para>The account used to connect to the Samba host 
+	<listitem><para>The account used to connect to the Samba host 
-		must have a uid of 0 (i.e. a root account)</para></listitem>
+	must have a uid of 0 (i.e. a root account)</para></listitem>
 		
-		<listitem><para>The account used to connect to the Samba host
+	<listitem><para>The account used to connect to the Samba host
-		must be a member of the <ulink 
+	must be a member of the <ulink 
-		url="smb.conf.5.html#PRINTERADMIN"><parameter>printer 
+	url="smb.conf.5.html#PRINTERADMIN"><parameter>printer 
-		admin</parameter></ulink> list.</para></listitem>
+	admin</parameter></ulink> list.</para></listitem>
-	</itemizedlist>
+</itemizedlist>
 
-	<para>Of course, the connected account must still possess access
+<para>
-	to add files to the subdirectories beneath [print$].</para>
+Of course, the connected account must still possess access
+to add files to the subdirectories beneath [print$]. Remember
+that all file shares are set to 'read only' by default.
+</para>
 </warning>
 
 
-<para>Once you have created the required [print$] service and 
+<para>
+Once you have created the required [print$] service and 
 associated subdirectories, simply log onto the Samba server using 
 a root (or <parameter>printer admin</parameter>) account
 from a Windows NT 4.0 client.  Navigate to the "Printers" folder
@@ -198,9 +233,27 @@ that matches the printer shares defined on your Samba host.
 <title>Setting Drivers for Existing Printers</title>
 
 <para>The initial listing of printers in the Samba host's 
-Printers folder will have no printer driver assigned to them.  
+Printers folder will have no real printer driver assigned 
-The way assign a driver to a printer is to view the Properties 
+to them.  By default, in Samba 2.2.0 this driver name was set to 
-of the printer and either</para>
+<emphasis>NO PRINTER DRIVER AVAILABLE FOR THIS PRINTER</emphasis>.
+Later versions changed this to a NULL string to allow the use
+tof the local Add Printer Wizard on NT/2000 clients.
+Attempting to view the printer properties for a printer
+which has this default driver assigned will result in 
+the error message:</para>
+
+<para>
+<emphasis>Device settings cannot be displayed.  The driver 
+for the specified printer is not installed, only spooler 
+properties will be displayed.  Do you want to install the 
+driver now?</emphasis>
+</para>
+
+<para>
+Click "No" in the error dialog and you will be presented with
+the printer properties window.  The way assign a driver to a 
+printer is to either
+</para>
 	
 <itemizedlist>
 	<listitem><para>Use the "New Driver..." button to install 
@@ -271,7 +324,7 @@ Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
      description:[POGO\\POGO\hp-print,NO DRIVER AVAILABLE FOR THIS PRINTER,]
      comment:[]
 				  
-<prompt>$ </prompt>rpcclient pogo -U root%bleaK.er \
+<prompt>$ </prompt>rpcclient pogo -U root%secret \
 <prompt>&gt; </prompt> -c "setdriver hp-print \"HP LaserJet 4000 Series PS\""
 Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
 Successfully set hp-print to driver HP LaserJet 4000 Series PS.
@@ -292,7 +345,7 @@ Add Printer Wizard icon.  The APW will be show only if
 <itemizedlist>
 	<listitem><para>The connected user is able to successfully
 	execute an OpenPrinterEx(\\server) with administrative
-	priviledges (i.e. root or <parameter>printer admin</parameter>.
+	priviledges (i.e. root or <parameter>printer admin</parameter>).
 	</para></listitem>
 	
 	<listitem><para><ulink url="smb.conf.5.html#SHOWADDPRINTERWIZARD"><parameter>show 
@@ -302,8 +355,8 @@ Add Printer Wizard icon.  The APW will be show only if
 
 <para>
 In order to be able to use the APW to successfully add a printer to a Samba 
-server, the <ulink url="smb.conf.5.html#ADDPRINTERCOMMAND"><parameter>addprinter 
+server, the <ulink url="smb.conf.5.html#ADDPRINTERCOMMAND"><parameter>add 
-command</parameter></ulink> must have a defined value.  The program
+printer command</parameter></ulink> must have a defined value.  The program
 hook must successfully add the printer to the system (i.e. 
 <filename>/etc/printcap</filename> or appropriate files) and 
 <filename>smb.conf</filename> if necessary.
@@ -312,16 +365,16 @@ hook must successfully add the printer to the system (i.e.
 <para>
 When using the APW from a client, if the named printer share does 
 not exist, <command>smbd</command> will execute the <parameter>add printer 
-program</parameter> and reparse to the <filename>smb.conf</filename>
+command</parameter> and reparse to the <filename>smb.conf</filename>
 to attempt to locate the new printer share.  If the share is still not defined,
 an error of "Access Denied" is returned to the client.  Note that the 
-<parameter>add printer program</parameter> is executed undet the context
+<parameter>add printer program</parameter> is executed under the context
 of the connected user, not necessarily a root account.
 </para>
 
 <para>
-There is a complementing <ulink url="smb.conf.5.html#DELETEPRINTERCOMMAND"><parameter>deleteprinter 
+There is a complementing <ulink url="smb.conf.5.html#DELETEPRINTERCOMMAND"><parameter>delete
-command</parameter></ulink> for removing entries from the "Printers..."
+printer command</parameter></ulink> for removing entries from the "Printers..."
 folder.
 </para>
 
@@ -473,7 +526,7 @@ foreach (supported architecture for a given driver)
 		</filename></para>
 		
 		<para>will reveal that Windows NT always uses the NT driver 
-		name.  The is ok as Windows NT always requires that at least 
+		name.  This is ok as Windows NT always requires that at least 
 		the Windows NT version of the printer driver is present.  
 		However, Samba does not have the requirement internally.  
 		Therefore, how can you use the NT driver name if is has not 
@@ -489,67 +542,167 @@ foreach (supported architecture for a given driver)
 
 
 <sect1>
-	<title><anchor id="MIGRATION">Migration to from Samba 2.0.x to 
+<title><anchor id="MIGRATION">Migration to from Samba 2.0.x to 2.2.x</title>
-	2.2.x</title>
+
+<para>
+Given that printer driver management has changed (we hope improved) in 
+2.2 over prior releases, migration from an existing setup to 2.2 can 
+follow several paths.
+</para>
+
+<para>
+Windows clients have a tendency to remember things for quite a while.
+For example, if a Windows NT client has attached to a Samba 2.0 server,
+it will remember the server as a LanMan printer server.  Upgrading 
+the Samba host to 2.2 makes support for MSRPC printing possible, but 
+the NT client will still remember the previous setting.
+</para>
+
+<para>
+In order to give an NT client printing "amesia" (only necessary if you 
+want to use the newer MSRPC printing functionality in Samba), delete 
+the registry keys associated with the print server contained in 
+<constant>[HKLM\SYSTEM\CurrentControlSet\Control\Print]</constant>.  The 
+spooler service on the client should be stopped prior to doing this:
+</para>
+
+<para>
+<prompt>C:\WINNT\ ></prompt> <userinput>net stop spooler</userinput>
+</para>
+
+<para>
+<emphasis>All the normal disclaimers about editing the registry go 
+here.</emphasis>  Be careful, and know what you are doing.
+</para>
+
+<para>
+The spooler service should be restarted after you have finished 
+removing the appropriate registry entries by replacing the 
+<command>stop</command> command above with <command>start</command>.
+</para>
+
+<para>
+Windows 9x clients will continue to use LanMan printing calls
+with a 2.2 Samba server so there is no need to perform any of these
+modifications on non-NT clients.
+</para>
 	
-	<para>Given that printer driver management has changed
+<warning>
-	(we hope improved :) ) in 2.2.0 over prior releases,
+<title>Achtung!</title>
-	migration from an existing setup to 2.2.0 can follow
+
-	several paths.</para>
+<para>
-	
+The following smb.conf parameters are considered to be depreciated and will 
-	<warning>
+be removed soon.  Do not use them in new installations
-		<title>Achtung!</title>
+</para>
-		<para>The following smb.conf parameters are considered to be
-		depreciated and will be removed soon.  Do not use them
-		in new installations</para>
 		
-		<itemizedlist>
+<itemizedlist>
-			<listitem><para><parameter>printer driver file (G)</parameter>
+	<listitem><para><parameter>printer driver file (G)</parameter>
-			</para></listitem>
+	</para></listitem>
 			
-			<listitem><para><parameter>printer driver (S)</parameter>
+	<listitem><para><parameter>printer driver (S)</parameter>
-			</para></listitem>
+	</para></listitem>
 			
-			<listitem><para><parameter>printer driver location (S)</parameter>
+	<listitem><para><parameter>printer driver location (S)</parameter>
-			</para></listitem>
+	</para></listitem>
-		</itemizedlist>
+</itemizedlist>
-	</warning>
+</warning>
 
 
-	<para>Here are the possible scenarios for supporting migration:</para>
+<para>
+Here are the possible scenarios for supporting migration:
+</para>
 	
-	<itemizedlist>
+<itemizedlist>
-		<listitem><para>If you do not desire the new Windows NT 
+	<listitem><para>If you do not desire the new Windows NT 
-		print driver support, nothing needs to be done.  
+	print driver support, nothing needs to be done.  
-		All existing parameters work the same.</para></listitem>
+	All existing parameters work the same.</para></listitem>
 
-		<listitem><para>If you want to take advantage of NT printer 
+	<listitem><para>If you want to take advantage of NT printer 
-		driver support but do not want to migrate the 
+	driver support but do not want to migrate the 
-		9x drivers to the new setup, the leave the existing 
+	9x drivers to the new setup, the leave the existing 
-		printers.def file.  When smbd attempts to locate a 
+	printers.def file.  When smbd attempts to locate a 
-		9x driver for the printer in the TDB and fails it 
+	9x driver for the printer in the TDB and fails it 
-		will drop down to using the printers.def (and all 
+	will drop down to using the printers.def (and all 
-		associated parameters).  The <command>make_printerdef</command> 
+	associated parameters).  The <command>make_printerdef</command> 
-		tool will also remain for backwards compatibility but will 
+	tool will also remain for backwards compatibility but will 
-		be moved to the "this tool is the old way of doing it" 
+	be moved to the "this tool is the old way of doing it" 
-		pile.</para></listitem>
+	pile.</para></listitem>
 
-		<listitem><para>If you install a Windows 9x driver for a printer 
+	<listitem><para>If you install a Windows 9x driver for a printer 
-		on your Samba host (in the printing TDB), this information will 
+	on your Samba host (in the printing TDB), this information will 
-		take precedence and the three old printing parameters
+	take precedence and the three old printing parameters
-		will be ignored (including print driver location).</para></listitem>
+	will be ignored (including print driver location).</para></listitem>
 
-		<listitem><para>If you want to migrate an existing <filename>printers.def</filename> 
+	<listitem><para>If you want to migrate an existing <filename>printers.def</filename> 
-		file into the new setup, the current only 
+	file into the new setup, the current only solution is to use the Windows 
-		solution is to use the Windows NT APW to install the NT drivers 
+	NT APW to install the NT drivers and the 9x  drivers.  This can be scripted 
-		and the 9x  drivers.  This can be scripted using <command>smbclient</command> 
+	using <command>smbclient</command> and <command>rpcclient</command>.  See the 
-		and <command>rpcclient</command>.  See the 
+	Imprints installation client at <ulink 
-		Imprints installation client at <ulink 
+	url="http://imprints.sourceforge.net/">http://imprints.sourceforge.net/</ulink> 
-		url="http://imprints.sourceforge.net/">http://imprints.sourceforge.net/</ulink> 
+	for an example.
-		for an example.
+	</para></listitem>
-		</para></listitem>
+</itemizedlist>
-	</itemizedlist>
 
 </sect1>
 
+
+<!--
+
+  This comment from rpc_server/srv_spoolss_nt.c:_spoolss_open_printer_ex()
+  needs to be added into a section probably.  This is to remind me it needs 
+  to be done.  -jerry
+
+                /*
+                 * If the openprinterex rpc call contains a devmode,
+                 * it's a per-user one. This per-user devmode is derivated
+                 * from the global devmode. Openprinterex() contains a per-user
+                 * devmode for when you do EMF printing and spooling.
+                 * In the EMF case, the NT workstation is only doing half the job
+                 * of rendering the page. The other half is done by running the printer
+                 * driver on the server.
+                 * The EMF file doesn't contain the page description (paper size, orientation, ...).
+                 * The EMF file only contains what is to be printed on the page.
+                 * So in order for the server to know how to print, the NT client sends
+                 * a devicemode attached to the openprinterex call.
+                 * But this devicemode is short lived, it's only valid for the current print job.
+                 *
+                 * If Samba would have supported EMF spooling, this devicemode would
+                 * have been attached to the handle, to sent it to the driver to correctly
+                 * rasterize the EMF file.
+                 *
+                 * As Samba only supports RAW spooling, we only receive a ready-to-print file,
+                 * we just act as a pass-thru between windows and the printer.
+                 *
+                 * In order to know that Samba supports only RAW spooling, NT has to call
+                 * getprinter() at level 2 (attribute field) or NT has to call startdoc()
+                 * and until NT sends a RAW job, we refuse it.
+                 *
+                 * But to call getprinter() or startdoc(), you first need a valid handle,
+                 * and to get an handle you have to call openprintex(). Hence why you have
+                 * a devicemode in the openprinterex() call.
+                 *
+                 *
+                 * Differences between NT4 and NT 2000.
+                 * NT4:
+                 * 
+                 * On NT4, you only have a global devicemode. This global devicemode can be changed
+                 * by the administrator (or by a user with enough privs). Everytime a user
+                 * wants to print, the devicemode is resetted to the default. In Word, everytime
+                 * you print, the printer's characteristics are always reset to the global devicemode.
+                 *
+                 * NT 2000:
+                 * 
+                 * In W2K, there is the notion of per-user devicemode. The first time you use
+                 * a printer, a per-user devicemode is build from the global devicemode.
+                 * If you change your per-user devicemode, it is saved in the registry, under the
+                 * H_KEY_CURRENT_KEY sub_tree. So that everytime you print, you have your default
+                 * printer preferences available.
+                 *
+                 * To change the per-user devicemode: it's the "Printing Preferences ..." button
+                 * on the General Tab of the printer properties windows.
+                 *
+                 * To change the global devicemode: it's the "Printing Defaults..." button
+                 * on the Advanced Tab of the printer properties window.
+-->
+
 </chapter>

docs/docbook/projdoc/samba-doc.sgml

@@ -8,6 +8,7 @@
 <!ENTITY NT-Security SYSTEM "NT_Security.sgml">
 <!ENTITY OS2-Client SYSTEM "OS2-Client-HOWTO.sgml">
 <!ENTITY Samba-PDC-HOWTO SYSTEM "Samba-PDC-HOWTO.sgml">
+<!ENTITY CVS-Access SYSTEM "CVS-Access.sgml">
 ]>
 
 <book id="Samba-Project-Documentation">
@@ -26,10 +27,10 @@
 <title>Abstract</title>
 
 <para>
-This book is a collection of HOWTOs added to Samba documentation over the year.
+This book is a collection of HOWTOs added to Samba documentation over the years.
 I try to ensure that all are current, but sometimes the is a larger job
-than one person can maintain.  You can always find the later version of this
+than one person can maintain.  The most recent version of this document
-PDF file at <ulink url="http://www.samba.org/">http://www.samba.org/</ulink>
+can be found at <ulink url="http://www.samba.org/">http://www.samba.org/</ulink>
 on the "Documentation" page.  Please send updates to <ulink 
 url="mailto:jerry@samba.org">jerry@samba.org</ulink>.
 </para>
@@ -49,5 +50,6 @@ Cheers, jerry
 &WINBIND;
 &NT-Security;
 &OS2-Client;
+&CVS-Access;
 
 </book>

docs/htmldocs/CVS-Access.html

@@ -0,0 +1,193 @@
+<HTML
+><HEAD
+><TITLE
+>HOWTO Access Samba source code via CVS</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="ARTICLE"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="ARTICLE"
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+><A
+NAME="AEN1"
+>HOWTO Access Samba source code via CVS</A
+></H1
+><HR></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN3"
+>Introduction</A
+></H1
+><P
+>Samba is developed in an open environnment.  Developers use CVS
+(Concurrent Versioning System) to "checkin" (also known as 
+"commit") new source code.  Samba's various CVS branches can
+be accessed via anonymouns CVS using the instructions
+detailed in this chapter.</P
+><P
+>This document is a modified version of the instructions found at
+<A
+HREF="http://samba.org/samba/cvs.html"
+TARGET="_top"
+>http://samba.org/samba/cvs.html</A
+></P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN8"
+>CVS Access to samba.org</A
+></H1
+><P
+>The machine samba.org runs a publicly accessible CVS 
+repository for access to the source code of several packages, 
+including samba, rsync and jitterbug. There are two main ways of 
+accessing the CVS server on this host.</P
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN11"
+>Access via CVSweb</A
+></H2
+><P
+>You can access the source code via your 
+favourite WWW browser. This allows you to access the contents of 
+individual files in the repository and also to look at the revision 
+history and commit logs of individual files. You can also ask for a diff 
+listing between any two versions on the repository.</P
+><P
+>Use the URL : <A
+HREF="http://samba.org/cgi-bin/cvsweb"
+TARGET="_top"
+>http://samba.org/cgi-bin/cvsweb</A
+></P
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN16"
+>Access via cvs</A
+></H2
+><P
+>You can also access the source code via a 
+normal cvs client.  This gives you much more control over you can 
+do with the repository and allows you to checkout whole source trees 
+and keep them uptodate via normal cvs commands. This is the 
+preferred method of access if you are a developer and not
+just a casual browser.</P
+><P
+>To download the latest cvs source code, point your
+browser at the URL : <A
+HREF="http://www.cyclic.com/"
+TARGET="_top"
+>http://www.cyclic.com/</A
+>.
+and click on the 'How to get cvs' link. CVS is free software under 
+the GNU GPL (as is Samba).  Note that there are several graphical CVS clients
+which provide a graphical interface to the sometimes mundane CVS commands.
+Links to theses clients are also available from http://www.cyclic.com.</P
+><P
+>To gain access via anonymous cvs use the following steps. 
+For this example it is assumed that you want a copy of the 
+samba source code. For the other source code repositories 
+on this system just substitute the correct package name</P
+><P
+></P
+><OL
+TYPE="1"
+><LI
+><P
+>	Install a recent copy of cvs. All you really need is a 
+	copy of the cvs client binary. 
+	</P
+></LI
+><LI
+><P
+>	Run the command 
+	</P
+><P
+>	<B
+CLASS="COMMAND"
+>cvs -d :pserver:cvs@samba.org:/cvsroot login</B
+>
+	</P
+><P
+>	When it asks you for a password type <TT
+CLASS="USERINPUT"
+><B
+>cvs</B
+></TT
+>.
+	</P
+></LI
+><LI
+><P
+>	Run the command 
+	</P
+><P
+>	<B
+CLASS="COMMAND"
+>cvs -d :pserver:cvs@samba.org:/cvsroot co samba</B
+>
+	</P
+><P
+>	This will create a directory called samba containing the 
+	latest samba source code (i.e. the HEAD tagged cvs branch). This 
+	currently corresponds to the 3.0 development tree. 
+	</P
+><P
+>	CVS branches other HEAD can be obtained by using the <TT
+CLASS="PARAMETER"
+><I
+>-r</I
+></TT
+>
+	and defining a tag name.  A list of branch tag names can be found on the
+	"Development" page of the samba web site.  A common request is to obtain the
+	latest 2.2 release code.  This could be done by using the following command.
+	</P
+><P
+>	<B
+CLASS="COMMAND"
+>cvs -d :pserver:cvs@samba.org:/cvsroot co -r SAMBA_2_2 samba</B
+>
+	</P
+></LI
+><LI
+><P
+>	Whenever you want to merge in the latest code changes use 
+	the following command from within the samba directory: 
+	</P
+><P
+>	<B
+CLASS="COMMAND"
+>cvs update -d -P</B
+>
+	</P
+></LI
+></OL
+></DIV
+></DIV
+></DIV
+></BODY
+></HTML
+>

docs/htmldocs/make_smbcodepage.1.html

@@ -14,7 +14,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="FINDSMB"
+NAME="MAKE-SMBCODEPAGE"
 >make_smbcodepage</A
 ></H1
 ><DIV
@@ -104,24 +104,24 @@ CLASS="PARAMETER"
 >inputfile</DT
 ><DD
 ><P
->This is the input file to process. In t
+>This is the input file to process. In 
-		he '<TT
+		the <TT
 CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->' case this will be a text 
+> case this will be a text 
 		codepage definition file such as the ones found in the Samba 	
 		<TT
 CLASS="FILENAME"
 >source/codepages</TT
 > directory. In
-		the '<TT
+		the <TT
 CLASS="PARAMETER"
 ><I
 >d</I
 ></TT
->' case this will be the 
+> case this will be the 
 		binary format codepage definition file normally found in 
 		the <TT
 CLASS="FILENAME"

docs/htmldocs/make_unicodemap.1.html

@@ -0,0 +1,276 @@
+<HTML
+><HEAD
+><TITLE
+>make_unicodemap</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="REFENTRY"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><H1
+><A
+NAME="MAKE-UNICODEMAP"
+>make_unicodemap</A
+></H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN5"
+></A
+><H2
+>Name</H2
+>make_unicodemap&nbsp;--&nbsp;construct a unicode map file for Samba</DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN8"
+></A
+><H2
+>Synopsis</H2
+><P
+><B
+CLASS="COMMAND"
+>make_unicodemap</B
+>  {codepage} {inputfile} {outputfile}</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN14"
+></A
+><H2
+>DESCRIPTION</H2
+><P
+>	This tool is part of the <A
+HREF="samba.7.html"
+TARGET="_top"
+>Samba</A
+> 
+	suite.
+	</P
+><P
+>	<B
+CLASS="COMMAND"
+>make_unicodemap</B
+> compiles text unicode map 
+	files into binary unicodef map files for use with the 
+	internationalization features of Samba 2.2.
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN20"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>codepage</DT
+><DD
+><P
+>This is the codepage or UNIX character 
+		set we are processing (a number, e.g. 850).
+		</P
+></DD
+><DT
+>inputfile</DT
+><DD
+><P
+>This is the input file to process. This is a 
+		text unicode map file such as the ones found in the Samba
+		<TT
+CLASS="FILENAME"
+>source/codepages</TT
+> directory. 
+		</P
+></DD
+><DT
+>outputfile</DT
+><DD
+><P
+>This is the binary output file to produce. 
+		</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN36"
+></A
+><H2
+>Samba Unicode Map Files</H2
+><P
+>	A text Samba unicode map file is a description that tells Samba 
+	how to map characters from a specified DOS code page or UNIX character 
+	set to 16 bit unicode.
+	</P
+><P
+>A binary Samba unicode map file is a binary representation 
+	of the same information, including a value that specifies what 
+	codepage or UNIX character set this file is describing. 
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN40"
+></A
+><H2
+>Files</H2
+><P
+><TT
+CLASS="FILENAME"
+>CP&#60;codepage&#62;.TXT</TT
+></P
+><P
+>	These are the input (text) unicode map files provided 
+	in the Samba <TT
+CLASS="FILENAME"
+>source/codepages</TT
+> 
+	directory. 
+	</P
+><P
+>	A text unicode map file consists of multiple lines 
+	containing two fields. These fields are :  
+	</P
+><P
+></P
+><UL
+><LI
+><P
+><TT
+CLASS="PARAMETER"
+><I
+>character</I
+></TT
+> - which is 
+		the (hex) character mapped on this line.
+		</P
+></LI
+><LI
+><P
+><TT
+CLASS="PARAMETER"
+><I
+>unicode</I
+></TT
+> - which 
+		is the (hex) 16 bit unicode character that the character
+		will map to. 
+		</P
+></LI
+></UL
+><P
+>	<TT
+CLASS="FILENAME"
+>unicode_map.&#60;codepage&#62;</TT
+>  - These are 
+	the output (binary) unicode map files produced and placed in 
+	the Samba destination <TT
+CLASS="FILENAME"
+>lib/codepage</TT
+> 
+	directory.
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN57"
+></A
+><H2
+>Installation</H2
+><P
+>	The location of the server and its support files is a matter
+	for individual system administrators. The following are thus 
+	suggestions only. 
+	</P
+><P
+>	It is recommended that the <B
+CLASS="COMMAND"
+>make_unicodemap</B
+> 
+	program be installed under the 
+	<TT
+CLASS="FILENAME"
+>$prefix/samba</TT
+> hierarchy, 
+	in a directory readable by all, writeable only by root. The 
+	program itself should be executable by all.  The program
+	should NOT be setuid or setgid! 
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN63"
+></A
+><H2
+>VERSION</H2
+><P
+>This man page is correct for version 2.2 of 
+	the Samba suite.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN66"
+></A
+><H2
+>SEE ALSO</H2
+><P
+><A
+HREF="smbd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbd(8)</B
+></A
+>, 
+	<A
+HREF="smb.conf.5.html"
+TARGET="_top"
+>smb.conf(5)</A
+>
+	</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN72"
+></A
+><H2
+>AUTHOR</H2
+><P
+>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.</P
+><P
+>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
+	<A
+HREF="ftp://ftp.icce.rug.nl/pub/unix/"
+TARGET="_top"
+>	ftp://ftp.icce.rug.nl/pub/unix/</A
+>) and updated for the Samba 2.0 
+	release by Jeremy Allison.  The conversion to DocBook for 
+	Samba 2.2 was done by Gerald Carter</P
+></DIV
+></BODY
+></HTML
+>

docs/htmldocs/printer_driver2.html

@@ -83,23 +83,61 @@ TARGET="_top"
 	information</P
 ></LI
 ></UL
+><P
+>There has been some initial confusion about what all this means
+and whether or not it is a requirement for printer drivers to be 
+installed on a Samba host in order to support printing from Windows 
+clients.  A bug existed in Samba 2.2.0 which made Windows NT/2000 clients 
+require that the Samba server possess a valid driver for the printer.  
+This is fixed in Samba 2.2.1 and once again, Windows NT/2000 clients
+can use the local APW for installing drivers to be used with a Samba 
+served printer.  This is the same behavior exhibited by Windows 9x clients.
+As a side note, Samba does not use these drivers in any way to process 
+spooled files.  They are utilized entirely by the clients.</P
+><P
+>The following MS KB article, may be of some help if you are dealing with
+Windows 2000 clients:  <I
+CLASS="EMPHASIS"
+>How to Add Printers with No User 
+Interaction in Windows 2000</I
+></P
+><P
+><A
+HREF="http://support.microsoft.com/support/kb/articles/Q189/1/05.ASP"
+TARGET="_top"
+>http://support.microsoft.com/support/kb/articles/Q189/1/05.ASP</A
+></P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN20"
+NAME="AEN25"
 >Configuration</A
 ></H1
+><DIV
+CLASS="WARNING"
 ><P
-><I
+></P
-CLASS="EMPHASIS"
+><TABLE
->WARNING!!!</I
+CLASS="WARNING"
-> Previous versions of Samba 
+BORDER="1"
-recommended using a share named [printer$].  This name was taken from the 
+WIDTH="100%"
-printer$ service created by Windows 9x clients when a 
+><TR
-printer was shared.  Windows 9x printer servers always have 
+><TD
+ALIGN="CENTER"
+><B
+>[print$] vs. [printer$]</B
+></TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+><P
+>Previous versions of Samba recommended using a share named [printer$].  
+This name was taken from the printer$ service created by Windows 9x 
+clients when a printer was shared.  Windows 9x printer servers always have 
 a printer$ service which provides read-only access via no 
 password in order to support printer driver downloads.</P
 ><P
@@ -124,21 +162,26 @@ the client.</P
 >These parameters, including <TT
 CLASS="PARAMETER"
 ><I
->printer driver 
+>printer driver
 file</I
 ></TT
 > parameter, are being depreciated and should not 
 be used in new installations.  For more information on this change, 
 you should refer to the <A
 HREF="#MIGRATION"
->Migration section </A
+>Migration section</A
->of this document.</P
+>
+of this document.</P
+></TD
+></TR
+></TABLE
+></DIV
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN30"
+NAME="AEN36"
 >Creating [print$]</A
 ></H2
 ><P
@@ -161,6 +204,11 @@ CLASS="PROGRAMLISTING"
     guest ok = yes
     browseable = yes
     read only = yes
+    ; since this share is configured as read only, then we need
+    ; a 'write list'.  Check the file system permissions to make
+    ; sure this account can copy files to the share.  If this
+    ; is setup to a non-root account, then it should also exist
+    ; as a 'printer admin'
     write list = ntadmin</PRE
 ></P
 ><P
@@ -178,16 +226,17 @@ level user accounts to have write access in order to update files
 on the share.  See the <A
 HREF="smb./conf.5.html"
 TARGET="_top"
->smb.conf(5) man page</A
+>smb.conf(5) 
-> for more information on 
+man page</A
-configuring file shares.</P
+> for more information on configuring file shares.</P
 ><P
 >The requirement for <A
 HREF="smb.conf.5.html#GUESTOK"
 TARGET="_top"
 ><B
 CLASS="COMMAND"
->guest ok = yes</B
+>guest 
+ok = yes</B
 ></A
 > depends upon how your
 site is configured.  If users will be guaranteed to have 
@@ -257,26 +306,26 @@ ALIGN="CENTER"
 ALIGN="LEFT"
 ><P
 >In order to currently add a new driver to you Samba host, 
-	one of two conditions must hold true:</P
+one of two conditions must hold true:</P
 ><P
 ></P
 ><UL
 ><LI
 ><P
 >The account used to connect to the Samba host 
-		must have a uid of 0 (i.e. a root account)</P
+	must have a uid of 0 (i.e. a root account)</P
 ></LI
 ><LI
 ><P
 >The account used to connect to the Samba host
-		must be a member of the <A
+	must be a member of the <A
 HREF="smb.conf.5.html#PRINTERADMIN"
 TARGET="_top"
 ><TT
 CLASS="PARAMETER"
 ><I
 >printer 
-		admin</I
+	admin</I
 ></TT
 ></A
 > list.</P
@@ -284,7 +333,8 @@ CLASS="PARAMETER"
 ></UL
 ><P
 >Of course, the connected account must still possess access
-	to add files to the subdirectories beneath [print$].</P
+to add files to the subdirectories beneath [print$]. Remember
+that all file shares are set to 'read only' by default.</P
 ></TD
 ></TR
 ></TABLE
@@ -307,14 +357,34 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN65"
+NAME="AEN71"
 >Setting Drivers for Existing Printers</A
 ></H2
 ><P
 >The initial listing of printers in the Samba host's 
-Printers folder will have no printer driver assigned to them.  
+Printers folder will have no real printer driver assigned 
-The way assign a driver to a printer is to view the Properties 
+to them.  By default, in Samba 2.2.0 this driver name was set to 
-of the printer and either</P
+<I
+CLASS="EMPHASIS"
+>NO PRINTER DRIVER AVAILABLE FOR THIS PRINTER</I
+>.
+Later versions changed this to a NULL string to allow the use
+tof the local Add Printer Wizard on NT/2000 clients.
+Attempting to view the printer properties for a printer
+which has this default driver assigned will result in 
+the error message:</P
+><P
+><I
+CLASS="EMPHASIS"
+>Device settings cannot be displayed.  The driver 
+for the specified printer is not installed, only spooler 
+properties will be displayed.  Do you want to install the 
+driver now?</I
+></P
+><P
+>Click "No" in the error dialog and you will be presented with
+the printer properties window.  The way assign a driver to a 
+printer is to either</P
 ><P
 ></P
 ><UL
@@ -361,7 +431,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN78"
+NAME="AEN88"
 >Support a large number of printers</A
 ></H2
 ><P
@@ -413,7 +483,7 @@ Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
 <TT
 CLASS="PROMPT"
 >$ </TT
->rpcclient pogo -U root%bleaK.er \
+>rpcclient pogo -U root%secret \
 <TT
 CLASS="PROMPT"
 >&gt; </TT
@@ -427,7 +497,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN89"
+NAME="AEN99"
 >Adding New Printers via the Windows NT APW</A
 ></H2
 ><P
@@ -449,7 +519,7 @@ CLASS="PARAMETER"
 ><I
 >printer admin</I
 ></TT
->.
+>).
 	</P
 ></LI
 ><LI
@@ -476,8 +546,8 @@ TARGET="_top"
 ><TT
 CLASS="PARAMETER"
 ><I
->addprinter 
+>add 
-command</I
+printer command</I
 ></TT
 ></A
 > must have a defined value.  The program
@@ -499,7 +569,7 @@ CLASS="COMMAND"
 CLASS="PARAMETER"
 ><I
 >add printer 
-program</I
+command</I
 ></TT
 > and reparse to the <TT
 CLASS="FILENAME"
@@ -512,7 +582,7 @@ CLASS="PARAMETER"
 ><I
 >add printer program</I
 ></TT
-> is executed undet the context
+> is executed under the context
 of the connected user, not necessarily a root account.</P
 ><P
 >There is a complementing <A
@@ -521,8 +591,8 @@ TARGET="_top"
 ><TT
 CLASS="PARAMETER"
 ><I
->deleteprinter 
+>delete
-command</I
+printer command</I
 ></TT
 ></A
 > for removing entries from the "Printers..."
@@ -533,7 +603,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN114"
+NAME="AEN124"
 >Samba and Printer Ports</A
 ></H2
 ><P
@@ -570,7 +640,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN122"
+NAME="AEN132"
 >The Imprints Toolset</A
 ></H1
 ><P
@@ -588,7 +658,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN126"
+NAME="AEN136"
 >What is Imprints?</A
 ></H2
 ><P
@@ -620,7 +690,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN136"
+NAME="AEN146"
 >Creating Printer Driver Packages</A
 ></H2
 ><P
@@ -636,7 +706,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN139"
+NAME="AEN149"
 >The Imprints server</A
 ></H2
 ><P
@@ -657,7 +727,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN143"
+NAME="AEN153"
 >The Installation Client</A
 ></H2
 ><P
@@ -734,7 +804,7 @@ CLASS="FILENAME"
 ></P
 ><P
 >will reveal that Windows NT always uses the NT driver 
-		name.  The is ok as Windows NT always requires that at least 
+		name.  This is ok as Windows NT always requires that at least 
 		the Windows NT version of the printer driver is present.  
 		However, Samba does not have the requirement internally.  
 		Therefore, how can you use the NT driver name if is has not 
@@ -751,18 +821,61 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN165"
+NAME="AEN175"
 ><A
 NAME="MIGRATION"
 ></A
->Migration to from Samba 2.0.x to 
+>Migration to from Samba 2.0.x to 2.2.x</A
-	2.2.x</A
 ></H1
 ><P
->Given that printer driver management has changed
+>Given that printer driver management has changed (we hope improved) in 
-	(we hope improved :) ) in 2.2.0 over prior releases,
+2.2 over prior releases, migration from an existing setup to 2.2 can 
-	migration from an existing setup to 2.2.0 can follow
+follow several paths.</P
-	several paths.</P
+><P
+>Windows clients have a tendency to remember things for quite a while.
+For example, if a Windows NT client has attached to a Samba 2.0 server,
+it will remember the server as a LanMan printer server.  Upgrading 
+the Samba host to 2.2 makes support for MSRPC printing possible, but 
+the NT client will still remember the previous setting.</P
+><P
+>In order to give an NT client printing "amesia" (only necessary if you 
+want to use the newer MSRPC printing functionality in Samba), delete 
+the registry keys associated with the print server contained in 
+<TT
+CLASS="CONSTANT"
+>[HKLM\SYSTEM\CurrentControlSet\Control\Print]</TT
+>.  The 
+spooler service on the client should be stopped prior to doing this:</P
+><P
+><TT
+CLASS="PROMPT"
+>C:\WINNT\ &#62;</TT
+> <TT
+CLASS="USERINPUT"
+><B
+>net stop spooler</B
+></TT
+></P
+><P
+><I
+CLASS="EMPHASIS"
+>All the normal disclaimers about editing the registry go 
+here.</I
+>  Be careful, and know what you are doing.</P
+><P
+>The spooler service should be restarted after you have finished 
+removing the appropriate registry entries by replacing the 
+<B
+CLASS="COMMAND"
+>stop</B
+> command above with <B
+CLASS="COMMAND"
+>start</B
+>.</P
+><P
+>Windows 9x clients will continue to use LanMan printing calls
+with a 2.2 Samba server so there is no need to perform any of these
+modifications on non-NT clients.</P
 ><DIV
 CLASS="WARNING"
 ><P
@@ -782,9 +895,8 @@ ALIGN="CENTER"
 ><TD
 ALIGN="LEFT"
 ><P
->The following smb.conf parameters are considered to be
+>The following smb.conf parameters are considered to be depreciated and will 
-		depreciated and will be removed soon.  Do not use them
+be removed soon.  Do not use them in new installations</P
-		in new installations</P
 ><P
 ></P
 ><UL
@@ -796,7 +908,7 @@ CLASS="PARAMETER"
 >printer driver file (G)</I
 ></TT
 >
-			</P
+	</P
 ></LI
 ><LI
 ><P
@@ -806,7 +918,7 @@ CLASS="PARAMETER"
 >printer driver (S)</I
 ></TT
 >
-			</P
+	</P
 ></LI
 ><LI
 ><P
@@ -816,7 +928,7 @@ CLASS="PARAMETER"
 >printer driver location (S)</I
 ></TT
 >
-			</P
+	</P
 ></LI
 ></UL
 ></TD
@@ -831,31 +943,31 @@ CLASS="PARAMETER"
 ><LI
 ><P
 >If you do not desire the new Windows NT 
-		print driver support, nothing needs to be done.  
+	print driver support, nothing needs to be done.  
-		All existing parameters work the same.</P
+	All existing parameters work the same.</P
 ></LI
 ><LI
 ><P
 >If you want to take advantage of NT printer 
-		driver support but do not want to migrate the 
+	driver support but do not want to migrate the 
-		9x drivers to the new setup, the leave the existing 
+	9x drivers to the new setup, the leave the existing 
-		printers.def file.  When smbd attempts to locate a 
+	printers.def file.  When smbd attempts to locate a 
-		9x driver for the printer in the TDB and fails it 
+	9x driver for the printer in the TDB and fails it 
-		will drop down to using the printers.def (and all 
+	will drop down to using the printers.def (and all 
-		associated parameters).  The <B
+	associated parameters).  The <B
 CLASS="COMMAND"
 >make_printerdef</B
 > 
-		tool will also remain for backwards compatibility but will 
+	tool will also remain for backwards compatibility but will 
-		be moved to the "this tool is the old way of doing it" 
+	be moved to the "this tool is the old way of doing it" 
-		pile.</P
+	pile.</P
 ></LI
 ><LI
 ><P
 >If you install a Windows 9x driver for a printer 
-		on your Samba host (in the printing TDB), this information will 
+	on your Samba host (in the printing TDB), this information will 
-		take precedence and the three old printing parameters
+	take precedence and the three old printing parameters
-		will be ignored (including print driver location).</P
+	will be ignored (including print driver location).</P
 ></LI
 ><LI
 ><P
@@ -863,23 +975,22 @@ CLASS="COMMAND"
 CLASS="FILENAME"
 >printers.def</TT
 > 
-		file into the new setup, the current only 
+	file into the new setup, the current only solution is to use the Windows 
-		solution is to use the Windows NT APW to install the NT drivers 
+	NT APW to install the NT drivers and the 9x  drivers.  This can be scripted 
-		and the 9x  drivers.  This can be scripted using <B
+	using <B
 CLASS="COMMAND"
 >smbclient</B
-> 
+> and <B
-		and <B
 CLASS="COMMAND"
 >rpcclient</B
 >.  See the 
-		Imprints installation client at <A
+	Imprints installation client at <A
 HREF="http://imprints.sourceforge.net/"
 TARGET="_top"
 >http://imprints.sourceforge.net/</A
 > 
-		for an example.
+	for an example.
-		</P
+	</P
 ></LI
 ></UL
 ></DIV

docs/htmldocs/rpcclient.1.html

@@ -151,8 +151,9 @@ CLASS="PROGRAMLISTING"
 >-l logbasename</DT
 ><DD
 ><P
->File name for log/debug files. .client will be 
+>File name for log/debug files. The extension 
-		appended. The log file is never removed  by the client.
+		'.client' will be appended. The log file is never removed  
+		by the client.
 		</P
 ></DD
 ><DT
@@ -235,14 +236,8 @@ CLASS="COMMAND"
 ><DD
 ><P
 >Set the SMB domain of the username.   This 
-		overrides the default  domain which is the domain of the 
+		overrides the default domain which is the domain defined in 
-		server specified with the  <TT
+		smb.conf.  If the domain specified is the same as the server's NetBIOS name, 
-CLASS="PARAMETER"
-><I
->-S</I
-></TT
-> option.  
-		If the domain specified is the same as the server's NetBIOS name, 
 		it causes the client to log on using the  server's local SAM (as 
 		opposed to the Domain SAM). </P
 ></DD
@@ -252,7 +247,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91"
+NAME="AEN90"
 ></A
 ><H2
 >COMMANDS</H2
@@ -275,14 +270,18 @@ CLASS="COMMAND"
 ><B
 CLASS="COMMAND"
 >lookupsids</B
-></P
+> - Resolve a list 
+		of SIDs to usernames.
+		</P
 ></LI
 ><LI
 ><P
 ><B
 CLASS="COMMAND"
 >lookupnames</B
-></P
+> - Resolve s list 
+		of usernames to SIDs.
+		</P
 ></LI
 ><LI
 ><P
@@ -329,6 +328,34 @@ CLASS="COMMAND"
 >querygroupmem</B
 ></P
 ></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>queryaliasmem</B
+></P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>querydispinfo</B
+></P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>querydominfo</B
+></P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
+>enumdomgroups</B
+></P
+></LI
 ></UL
 ><P
 > </P
@@ -429,6 +456,17 @@ CLASS="COMMAND"
 ><P
 ><B
 CLASS="COMMAND"
+>deldriver</B
+> - Delete the 
+		specified printer driver for all architectures.  This
+		does not delete the actual driver files from the server,
+		only the entry from the server's list of drivers.
+		</P
+></LI
+><LI
+><P
+><B
+CLASS="COMMAND"
 >enumdata</B
 > - Enumerate all 
 		printer setting data stored on the server. On Windows NT  clients, 
@@ -603,7 +641,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN196"
+NAME="AEN210"
 ></A
 ><H2
 >BUGS</H2
@@ -644,7 +682,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN206"
+NAME="AEN220"
 ></A
 ><H2
 >VERSION</H2
@@ -655,7 +693,7 @@ NAME="AEN206"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN209"
+NAME="AEN223"
 ></A
 ><H2
 >AUTHOR</H2

docs/htmldocs/smbcontrol.1.html

@@ -14,7 +14,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="FINDSMB"
+NAME="SMBCONTROL"
 >smbcontrol</A
 ></H1
 ><DIV

docs/htmldocs/smbspool.8.html

@@ -14,7 +14,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="FINDSMB"
+NAME="SMBSPOOL"
 >smbspool</A
 ></H1
 ><DIV
@@ -24,7 +24,7 @@ NAME="AEN5"
 ></A
 ><H2
 >Name</H2
->nmblookup&nbsp;--&nbsp;send print file to an SMB printer</DIV
+>smbspool&nbsp;--&nbsp;send print file to an SMB printer</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A

docs/htmldocs/smbstatus.1.html

@@ -14,7 +14,7 @@ VLINK="#840084"
 ALINK="#0000FF"
 ><H1
 ><A
-NAME="FINDSMB"
+NAME="SMBSTATUS"
 >smbstatus</A
 ></H1
 ><DIV

docs/htmldocs/swat.8.html

@@ -35,7 +35,7 @@ NAME="AEN8"
 ><P
 ><B
 CLASS="COMMAND"
->nmblookup</B
+>swat</B
 >  [-s &#60;smb config file&#62;] [-a]</P
 ></DIV
 ><DIV

docs/manpages/make_smbcodepage.1

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "MAKE_SMBCODEPAGE" "1" "24 April 2001" "" ""
+.TH "MAKE_SMBCODEPAGE" "1" "01 June 2001" "" ""
 .SH NAME
 make_smbcodepage \- construct a codepage file for Samba
 .SH SYNOPSIS
@@ -29,11 +29,11 @@ This is the codepage we are processing (a
 number, e.g. 850). 
 .TP
 \fBinputfile\fR
-This is the input file to process. In t
+This is the input file to process. In 
-he '\fIc\fR' case this will be a text 
+the \fIc\fR case this will be a text 
 codepage definition file such as the ones found in the Samba 
 \fIsource/codepages\fR directory. In
-the '\fId\fR' case this will be the 
+the \fId\fR case this will be the 
 binary format codepage definition file normally found in 
 the \fIlib/codepages\fR directory in the 
 Samba install directory path.

docs/manpages/make_unicodemap.1

@@ -1,100 +1,97 @@
-.TH MAKE_UNICODEMAP 1 "24 Mar 2001" "make_unicodemap 2.2.0-alpha3"
+.\" This manpage has been automatically generated by docbook2man-spec
-.PP 
+.\" from a DocBook document.  docbook2man-spec can be found at:
-.SH "NAME" 
+.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
-make_unicodemap \- Construct a unicode map file for Samba
+.\" Please send any bug reports, improvements, comments, patches, 
-.PP 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.SH "SYNOPSIS" 
+.TH "MAKE_UNICODEMAP" "1" "01 June 2001" "" ""
-.PP 
+.SH NAME
-\fBmake_unicodemap\fP codepage inputfile outputfile
+make_unicodemap \- construct a unicode map file for Samba
-.PP 
+.SH SYNOPSIS
-.SH "DESCRIPTION" 
+.sp
-.PP 
+\fBmake_unicodemap\fR \fBcodepage\fR \fBinputfile\fR \fBoutputfile\fR
-This program is part of the \fBSamba\fP suite\&.
+.SH "DESCRIPTION"
-.PP 
+.PP
-\fBmake_unicodemap\fP compiles text unicode map files into binary unicode
+This tool is part of the Sambasuite.
-map files for use with the internationalization features of Samba 2\&.0
+.PP
-.PP 
+\fBmake_unicodemap\fR compiles text unicode map 
-.SH "OPTIONS" 
+files into binary unicodef map files for use with the 
-.PP 
+internationalization features of Samba 2.2.
-.IP 
+.SH "OPTIONS"
-.IP "codepage" 
+.TP
-This is the codepage or UNIX character set we are processing (a number, e\&.g\&. 850)\&.
+\fBcodepage\fR
-.IP 
+This is the codepage or UNIX character 
-.IP "inputfile" 
+set we are processing (a number, e.g. 850).
-This is the input file to process\&. This is a text unicode map file
+.TP
-such as the ones found in the Samba \fIsource/codepages\fP directory\&.
+\fBinputfile\fR
-.IP 
+This is the input file to process. This is a 
-.IP "outputfile" 
+text unicode map file such as the ones found in the Samba
-This is the binary output file to produce\&.
+\fIsource/codepages\fR directory. 
-.IP 
+.TP
-.PP 
+\fBoutputfile\fR
-.SH "Samba Unicode Map Files" 
+This is the binary output file to produce. 
-.PP 
+.SH "SAMBA UNICODE MAP FILES"
-A text Samba unicode map file is a description that tells
+.PP
-Samba how to map characters from a specified DOS code page or UNIX character
+A text Samba unicode map file is a description that tells Samba 
-set to 16 bit unicode\&.
+how to map characters from a specified DOS code page or UNIX character 
-.PP 
+set to 16 bit unicode.
-A binary Samba unicode map file is a binary representation of
+.PP
-the same information, including a value that specifies what codepage
+A binary Samba unicode map file is a binary representation 
-or UNIX character set this file is describing\&.
+of the same information, including a value that specifies what 
-.PP 
+codepage or UNIX character set this file is describing. 
-.SH "FILES" 
+.SH "FILES"
-.PP 
+.PP
-\fBCP<codepage>\&.TXT\fP
+\fICP<codepage>.TXT\fR
-.PP 
+.PP
-These are the input (text) unicode map files provided in the Samba
+These are the input (text) unicode map files provided 
-\fIsource/codepages\fP directory\&.
+in the Samba \fIsource/codepages\fR 
-.PP 
+directory. 
-A text unicode map file consists of multiple lines
+.PP
-containing two fields\&. These fields are : 
+A text unicode map file consists of multiple lines 
-.PP 
+containing two fields. These fields are : 
-.IP 
+.TP 0.2i
-.IP o 
+\(bu
-\fBcharacter\fP: which is the (hex) character mapped on this
+\fIcharacter\fR - which is 
-line\&.
+the (hex) character mapped on this line.
-.IP 
+.TP 0.2i
-.IP o 
+\(bu
-\fBunicode\fP: which is the (hex) 16 bit unicode character that the
+\fIunicode\fR - which 
-character will map to\&.
+is the (hex) 16 bit unicode character that the character
-.IP 
+will map to. 
-.PP 
+.PP
-\fBunicode_map\&.<codepage>\fP These are the output (binary) unicode map files
+\fIunicode_map.<codepage>\fR - These are 
-produced and placed in the Samba destination \fIlib/codepage\fP
+the output (binary) unicode map files produced and placed in 
-directory\&.
+the Samba destination \fIlib/codepage\fR 
-.PP 
+directory.
-.SH "INSTALLATION" 
+.PP
-.PP 
+.SH "INSTALLATION"
-The location of the server and its support files is a matter for
+.PP
-individual system administrators\&. The following are thus suggestions
+The location of the server and its support files is a matter
-only\&.
+for individual system administrators. The following are thus 
-.PP 
+suggestions only. 
-It is recommended that the \fBmake_unicodemap\fP program be installed
+.PP
-under the \fI/usr/local/samba\fP hierarchy, in a directory readable by
+It is recommended that the \fBmake_unicodemap\fR 
-all, writeable only by root\&. The program itself should be executable
+program be installed under the 
-by all\&.  The program should NOT be setuid or setgid!
+\fI$prefix/samba\fR hierarchy, 
-.PP 
+in a directory readable by all, writeable only by root. The 
-.SH "VERSION" 
+program itself should be executable by all. The program
-.PP 
+should NOT be setuid or setgid! 
-This man page is correct for version 2\&.0 of the Samba suite\&.
+.SH "VERSION"
-.PP 
+.PP
-.SH "SEE ALSO" 
+This man page is correct for version 2.2 of 
-.PP 
+the Samba suite.
-\fBsmb\&.conf(5)\fP, \fBsmbd (8)\fP
+.SH "SEE ALSO"
-.PP 
+.PP
-.SH "AUTHOR" 
+\fBsmbd(8)\fR, 
-.PP 
+smb.conf(5).SH "AUTHOR"
-The original Samba software and related utilities were created by
+.PP
-Andrew Tridgell samba@samba\&.org\&. Samba is now developed
+The original Samba software and related utilities 
-by the Samba Team as an Open Source project similar to the way the
+were created by Andrew Tridgell. Samba is now developed
-Linux kernel is developed\&.
+by the Samba Team as an Open Source project similar 
-.PP 
+to the way the Linux kernel is developed.
-The original Samba man pages were written by Karl Auer\&. The man page
+.PP
-sources were converted to YODL format (another excellent piece of Open
+The original Samba man pages were written by Karl Auer. 
-Source software, available at
+The man page sources were converted to YODL format (another 
-\fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
+excellent piece of Open Source software, available at
-and updated for the Samba2\&.0 release by Jeremy Allison\&.
+ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
-samba@samba\&.org\&.
+release by Jeremy Allison. The conversion to DocBook for 
-.PP 
+Samba 2.2 was done by Gerald Carter
-See \fBsamba (7)\fP to find out how to get a full
-list of contributors and details on how to submit bug reports,
-comments etc\&.

docs/manpages/rpcclient.1

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RPCCLIENT" "1" "24 April 2001" "" ""
+.TH "RPCCLIENT" "1" "01 June 2001" "" ""
 .SH NAME
 rpcclient \- tool for executing client side  MS-RPC functions
 .SH SYNOPSIS
@@ -56,8 +56,9 @@ planning on submitting a bug report to the Samba team (see BUGS.txt).
 Print a summary of command line options.
 .TP
 \fB-l logbasename\fR
-File name for log/debug files. .client will be 
+File name for log/debug files. The extension 
-appended. The log file is never removed by the client.
+\&'.client' will be appended. The log file is never removed 
+by the client.
 .TP
 \fB-N\fR
 instruct \fBrpcclient\fR not to ask 
@@ -93,9 +94,8 @@ it in directly.
 .TP
 \fB-W domain\fR
 Set the SMB domain of the username. This 
-overrides the default domain which is the domain of the 
+overrides the default domain which is the domain defined in 
-server specified with the \fI-S\fR option. 
+smb.conf. If the domain specified is the same as the server's NetBIOS name, 
-If the domain specified is the same as the server's NetBIOS name, 
 it causes the client to log on using the server's local SAM (as 
 opposed to the Domain SAM). 
 .SH "COMMANDS"
@@ -106,10 +106,12 @@ opposed to the Domain SAM).
 \fBlsaquery\fR
 .TP 0.2i
 \(bu
-\fBlookupsids\fR
+\fBlookupsids\fR - Resolve a list 
+of SIDs to usernames.
 .TP 0.2i
 \(bu
-\fBlookupnames\fR
+\fBlookupnames\fR - Resolve s list 
+of usernames to SIDs.
 .TP 0.2i
 \(bu
 \fBenumtrusts\fR
@@ -130,6 +132,18 @@ opposed to the Domain SAM).
 .TP 0.2i
 \(bu
 \fBquerygroupmem\fR
+.TP 0.2i
+\(bu
+\fBqueryaliasmem\fR
+.TP 0.2i
+\(bu
+\fBquerydispinfo\fR
+.TP 0.2i
+\(bu
+\fBquerydominfo\fR
+.TP 0.2i
+\(bu
+\fBenumdomgroups\fR
 .PP
 .PP
 .PP
@@ -180,6 +194,12 @@ and the \fIport\fRmust be a valid port name (see
 \fBenumports\fR.
 .TP 0.2i
 \(bu
+\fBdeldriver\fR - Delete the 
+specified printer driver for all architectures. This
+does not delete the actual driver files from the server,
+only the entry from the server's list of drivers.
+.TP 0.2i
+\(bu
 \fBenumdata\fR - Enumerate all 
 printer setting data stored on the server. On Windows NT clients, 
 these values are stored in the registry, while Samba servers 

docs/manpages/smb.conf.5

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "24 April 2001" "" ""
+.TH "SMB.CONF" "5" "01 June 2001" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -503,10 +503,13 @@ Here is a list of all global parameters. See the section of
 each parameter for details. Note that some are synonyms.
 .TP 0.2i
 \(bu
-\fIadd user script\fR
+\fIadd printer command\fR
 .TP 0.2i
 \(bu
-\fIaddprinter command\fR
+\fIadd share command\fR
+.TP 0.2i
+\(bu
+\fIadd user script\fR
 .TP 0.2i
 \(bu
 \fIallow trusted domains\fR
@@ -530,6 +533,9 @@ each parameter for details. Note that some are synonyms.
 \fIchange notify timeout\fR
 .TP 0.2i
 \(bu
+\fIchange share command\fR
+.TP 0.2i
+\(bu
 \fIcharacter set\fR
 .TP 0.2i
 \(bu
@@ -569,10 +575,13 @@ each parameter for details. Note that some are synonyms.
 \fIdefault service\fR
 .TP 0.2i
 \(bu
-\fIdelete user script\fR
+\fIdelete printer command\fR
 .TP 0.2i
 \(bu
-\fIdeleteprinter command\fR
+\fIdelete share command\fR
+.TP 0.2i
+\(bu
+\fIdelete user script\fR
 .TP 0.2i
 \(bu
 \fIdfree command\fR
@@ -584,18 +593,9 @@ each parameter for details. Note that some are synonyms.
 \fIdomain admin group\fR
 .TP 0.2i
 \(bu
-\fIdomain admin users\fR
-.TP 0.2i
-\(bu
-\fIdomain groups\fR
-.TP 0.2i
-\(bu
 \fIdomain guest group\fR
 .TP 0.2i
 \(bu
-\fIdomain guest users\fR
-.TP 0.2i
-\(bu
 \fIdomain logons\fR
 .TP 0.2i
 \(bu
@@ -755,6 +755,9 @@ each parameter for details. Note that some are synonyms.
 \fInull passwords\fR
 .TP 0.2i
 \(bu
+\fIobey pam restrictions\fR
+.TP 0.2i
+\(bu
 \fIoplock break wait time\fR
 .TP 0.2i
 \(bu
@@ -764,6 +767,9 @@ each parameter for details. Note that some are synonyms.
 \fIos2 driver map\fR
 .TP 0.2i
 \(bu
+\fIpam password change\fR
+.TP 0.2i
+\(bu
 \fIpanic action\fR
 .TP 0.2i
 \(bu
@@ -1332,6 +1338,118 @@ each parameter for details. Note that some are synonyms.
 \fIwriteable\fR
 .SH "EXPLANATION OF EACH PARAMETER"
 .TP
+\fBadd printer command (G)\fR
+With the introduction of MS-RPC based printing
+support for Windows NT/2000 clients in Samba 2.2, The MS Add
+Printer Wizard (APW) icon is now also available in the 
+"Printers..." folder displayed a share listing. The APW
+allows for printers to be add remotely to a Samba or Windows 
+NT/2000 print server.
+
+For a Samba host this means that the printer must be 
+physically added to underlying printing system. The \fIadd 
+printer command\fR defines a script to be run which 
+will perform the necessary operations for adding the printer
+to the print system and to add the appropriate service definition 
+to the \fIsmb.conf\fR file in order that it can be 
+shared by \fBsmbd(8)\fR
+.
+
+The \fIadd printer command\fR is
+automatically invoked with the following parameter (in 
+order:
+.RS
+.TP 0.2i
+\(bu
+\fIprinter name\fR
+.TP 0.2i
+\(bu
+\fIshare name\fR
+.TP 0.2i
+\(bu
+\fIport name\fR
+.TP 0.2i
+\(bu
+\fIdriver name\fR
+.TP 0.2i
+\(bu
+\fIlocation\fR
+.TP 0.2i
+\(bu
+\fIWindows 9x driver location\fR
+.RE
+.PP
+All parameters are filled in from the PRINTER_INFO_2 structure sent 
+by the Windows NT/2000 client with one exception. The "Windows 9x
+driver location" parameter is included for backwards compatibility
+only. The remaining fields in the structure are generated from answers
+to the APW questions.
+.PP
+.PP
+Once the \fIadd printer command\fR has 
+been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to determine if the share defined by the APW
+exists. If the sharename is still invalid, then \fBsmbd
+\fRwill return an ACCESS_DENIED error to the client.
+.PP
+.PP
+See also \fI delete printer command\fR, \fIprinting\fR,
+\fIshow add
+printer wizard\fR
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBaddprinter command = /usr/bin/addprinter
+\fR.PP
+.TP
+\fBadd share command (G)\fR
+Samba 2.2.0 introduced the ability to dynamically 
+add and delete shares via the Windows NT 4.0 Server Manager. The 
+\fIadd share command\fR is used to define an 
+external program or script which will add a new service definition 
+to \fIsmb.conf\fR. In order to successfully 
+execute the \fIadd share command\fR, \fBsmbd\fR
+requires that the administrator be connected using a root account (i.e. 
+uid == 0).
+
+When executed, \fBsmbd\fR will automatically invoke the 
+\fIadd share command\fR with four parameters.
+.RS
+.TP 0.2i
+\(bu
+\fIconfigFile\fR - the location 
+of the global \fIsmb.conf\fR file. 
+.TP 0.2i
+\(bu
+\fIshareName\fR - the name of the new 
+share.
+.TP 0.2i
+\(bu
+\fIpathName\fR - path to an **existing**
+directory on disk.
+.TP 0.2i
+\(bu
+\fIcomment\fR - comment string to associate 
+with the new share.
+.RE
+.PP
+This parameter is only used for add file shares. To add printer shares, 
+see the \fIadd printer 
+command\fR.
+.PP
+.PP
+See also \fIchange share 
+command\fR, \fIdelete share
+command\fR.
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBadd share command = /usr/local/bin/addshare\fR
+.PP
+.TP
 \fBadd user script (G)\fR
 This is the full pathname to a script that will 
 be run \fBAS ROOT\fR by smbd(8)
@@ -1373,70 +1491,6 @@ Default: \fBadd user script = <empty string>
 Example: \fBadd user script = /usr/local/samba/bin/add_user 
 %u\fR
 .TP
-\fBaddprinter command (G)\fR
-With the introduction of MS-RPC based printing
-support for Windows NT/2000 clients in Samba 2.2, The MS Add
-Printer Wizard (APW) icon is now also available in the 
-"Printers..." folder displayed a share listing. The APW
-allows for printers to be add remotely to a Samba or Windows 
-NT/2000 print server.
-
-For a Samba host this means that the printer must be 
-physically added to underlying printing system. The \fI addprinter command\fR defines a script to be run which 
-will perform the necessary operations for adding the printer
-to the print system and to add the appropriate service definition 
-to the \fIsmb.conf\fR file in order that it can be 
-shared by \fBsmbd(8)\fR
-.
-
-The \fIaddprinter command\fR is
-automatically invoked with the following parameter (in 
-order:
-.RS
-.TP 0.2i
-\(bu
-\fIprinter name\fR
-.TP 0.2i
-\(bu
-\fIshare name\fR
-.TP 0.2i
-\(bu
-\fIport name\fR
-.TP 0.2i
-\(bu
-\fIdriver name\fR
-.TP 0.2i
-\(bu
-\fIlocation\fR
-.TP 0.2i
-\(bu
-\fIWindows 9x driver location\fR
-.RE
-.PP
-All parameters are filled in from the PRINTER_INFO_2 structure sent 
-by the Windows NT/2000 client with one exception. The "Windows 9x
-driver location" parameter is included for backwards compatibility
-only. The remaining fields in the structure are generated from answers
-to the APW questions.
-.PP
-.PP
-Once the \fIaddprinter command\fR has 
-been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to determine if the share defined by the APW
-exists. If the sharename is still invalid, then \fBsmbd
-\fRwill return an ACCESS_DENIED error to the client.
-.PP
-.PP
-See also \fI deleteprinter command\fR, \fIprinting\fR,
-\fIshow add
-printer wizard\fR
-.PP
-.PP
-Default: \fBnone\fR
-.PP
-.PP
-Example: \fBaddprinter command = /usr/bin/addprinter
-\fR.PP
-.TP
 \fBadmin users (S)\fR
 This is a list of users who will be granted 
 administrative privileges on the share. This means that they 
@@ -1621,6 +1675,52 @@ Example: \fBchange notify timeout = 300\fR
 
 Would change the scan time to every 5 minutes.
 .TP
+\fBchange share command (G)\fR
+Samba 2.2.0 introduced the ability to dynamically 
+add and delete shares via the Windows NT 4.0 Server Manager. The 
+\fIchange share command\fR is used to define an 
+external program or script which will modify an existing service definition 
+in \fIsmb.conf\fR. In order to successfully 
+execute the \fIchange share command\fR, \fBsmbd\fR
+requires that the administrator be connected using a root account (i.e. 
+uid == 0).
+
+When executed, \fBsmbd\fR will automatically invoke the 
+\fIchange share command\fR with four parameters.
+.RS
+.TP 0.2i
+\(bu
+\fIconfigFile\fR - the location 
+of the global \fIsmb.conf\fR file. 
+.TP 0.2i
+\(bu
+\fIshareName\fR - the name of the new 
+share.
+.TP 0.2i
+\(bu
+\fIpathName\fR - path to an **existing**
+directory on disk.
+.TP 0.2i
+\(bu
+\fIcomment\fR - comment string to associate 
+with the new share.
+.RE
+.PP
+This parameter is only used modify existing file shares definitions. To modify 
+printer shares, use the "Printers..." folder as seen when browsing the Samba host.
+.PP
+.PP
+See also \fIadd share
+command\fR, \fIdelete 
+share command\fR.
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBchange share command = /usr/local/bin/addshare\fR
+.PP
+.TP
 \fBcharacter set (G)\fR
 This allows a smbd to map incoming filenames 
 from a DOS Code page (see the client 
@@ -1898,6 +1998,10 @@ create mode\fR parameter for forcing particular mode
 bits to be set on created files. See also the  \fIdirectory mode"\fR parameter for masking 
 mode bits on created directories. See also the  \fIinherit permissions\fR parameter.
 
+Note that this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+a mask on access control lists also, they need to set the \fIsecurity mask\fR.
+
 Default: \fBcreate mask = 0744\fR
 
 Example: \fBcreate mask = 0775\fR
@@ -1970,15 +2074,7 @@ effect.
 Default: \fBdebug uid = no\fR
 .TP
 \fBdebuglevel (G)\fR
-The value of the parameter (an integer) allows 
+Synonym for \fI log level\fR.
-the debug level (logging level) to be specified in the 
-\fIsmb.conf\fR file. This is to give greater 
-flexibility in the configuration of the system.
-
-The default will be the debug level specified on 
-the command line or level zero if none was specified.
-
-Example: \fBdebug level = 3\fR
 .TP
 \fBdefault (G)\fR
 A synonym for \fI default service\fR.
@@ -2022,6 +2118,33 @@ Example:
 .sp
 .fi
 .TP
+\fBdelete printer command (G)\fR
+With the introduction of MS-RPC based printer
+support for Windows NT/2000 clients in Samba 2.2, it is now 
+possible to delete printer at run time by issuing the 
+DeletePrinter() RPC call.
+
+For a Samba host this means that the printer must be 
+physically deleted from underlying printing system. The \fI deleteprinter command\fR defines a script to be run which 
+will perform the necessary operations for removing the printer
+from the print system and from \fIsmb.conf\fR.
+
+The \fIdelete printer command\fR is 
+automatically called with only one parameter: \fI "printer name"\fR.
+
+Once the \fIdelete printer command\fR has 
+been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to associated printer no longer exists. 
+If the sharename is still valid, then \fBsmbd
+\fRwill return an ACCESS_DENIED error to the client.
+
+See also \fI add printer command\fR, \fIprinting\fR,
+\fIshow add
+printer wizard\fR
+
+Default: \fBnone\fR
+
+Example: \fBdeleteprinter command = /usr/bin/removeprinter
+\fR.TP
 \fBdelete readonly (S)\fR
 This parameter allows readonly files to be deleted. 
 This is not normal DOS semantics, but is allowed by UNIX.
@@ -2032,6 +2155,45 @@ permissions, and DOS semantics prevent deletion of a read only file.
 
 Default: \fBdelete readonly = no\fR
 .TP
+\fBdelete share command (G)\fR
+Samba 2.2.0 introduced the ability to dynamically 
+add and delete shares via the Windows NT 4.0 Server Manager. The 
+\fIdelete share command\fR is used to define an 
+external program or script which will remove an existing service 
+definition from \fIsmb.conf\fR. In order to successfully 
+execute the \fIdelete share command\fR, \fBsmbd\fR
+requires that the administrator be connected using a root account (i.e. 
+uid == 0).
+
+When executed, \fBsmbd\fR will automatically invoke the 
+\fIdelete share command\fR with two parameters.
+.RS
+.TP 0.2i
+\(bu
+\fIconfigFile\fR - the location 
+of the global \fIsmb.conf\fR file. 
+.TP 0.2i
+\(bu
+\fIshareName\fR - the name of 
+the existing service.
+.RE
+.PP
+This parameter is only used to remove file shares. To delete printer shares, 
+see the \fIdelete printer 
+command\fR.
+.PP
+.PP
+See also \fIdelete share
+command\fR, \fIchange 
+share\fR.
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBdelete share command = /usr/local/bin/delshare\fR
+.PP
+.TP
 \fBdelete user script (G)\fR
 This is the full pathname to a script that will 
 be run \fBAS ROOT\fR by  \fBsmbd(8)\fRunder special circumstances 
@@ -2085,33 +2247,6 @@ Default: \fBdelete user script = <empty string>
 Example: \fBdelete user script = /usr/local/samba/bin/del_user 
 %u\fR
 .TP
-\fBdeleteprinter command (G)\fR
-With the introduction of MS-RPC based printer
-support for Windows NT/2000 clients in Samba 2.2, it is now 
-possible to delete printer at run time by issuing the 
-DeletePrinter() RPC call.
-
-For a Samba host this means that the printer must be 
-physically deleted from underlying printing system. The \fI deleteprinter command\fR defines a script to be run which 
-will perform the necessary operations for removing the printer
-from the print system and from \fIsmb.conf\fR.
-
-The \fIdeleteprinter command\fR is 
-automatically called with only one parameter: \fI "printer name"\fR.
-
-Once the \fIdeleteprinter command\fR has 
-been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to associated printer no longer exists. 
-If the sharename is still valid, then \fBsmbd
-\fRwill return an ACCESS_DENIED error to the client.
-
-See also \fI addprinter command\fR, \fIprinting\fR,
-\fIshow add
-printer wizard\fR
-
-Default: \fBnone\fR
-
-Example: \fBdeleteprinter command = /usr/bin/removeprinter
-\fR.TP
 \fBdelete veto files (S)\fR
 This option is used when Samba is attempting to 
 delete a directory that contains one or more vetoed directories 
@@ -2220,6 +2355,10 @@ created from this parameter with the value of the \fIforce directory mode
 \fRparameter. This parameter is set to 000 by 
 default (i.e. no extra mode bits are added).
 
+Note that this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+a mask on access control lists also, they need to set the \fIdirectory security mask\fR.
+
 See the \fIforce 
 directory mode\fR parameter to cause particular mode 
 bits to always be set on created directories.
@@ -2250,26 +2389,23 @@ this mask from being modified. Essentially, zero bits in this
 mask may be treated as a set of bits the user is not allowed 
 to change.
 
-If not set explicitly this parameter is set to the same 
+If not set explicitly this parameter is set to 0777
-value as the \fIdirectory 
+meaning a user is allowed to modify all the user/group/world
-mask\fR parameter. To allow a user to
+permissions on a directory.
-modify all the user/group/world permissions on a directory, set 
-this parameter to 0777.
 
 \fBNote\fR that users who can access the 
 Samba server through other means can easily bypass this restriction, 
 so it is primarily useful for standalone "appliance" systems. 
-Administrators of most normal systems will probably want to set 
+Administrators of most normal systems will probably want to leave
-it to 0777.
+it as the default of 0777.
 
 See also the \fI force directory security mode\fR, \fIsecurity mask\fR, 
 \fIforce security mode
 \fRparameters.
 
-Default: \fBdirectory security mask = <same as 
+Default: \fBdirectory security mask = 0777\fR
-directory mask>\fR
 
-Example: \fBdirectory security mask = 0777\fR
+Example: \fBdirectory security mask = 0700\fR
 .TP
 \fBdns proxy (G)\fR
 Specifies that nmbd(8)when acting as a WINS server and finding that a NetBIOS name has not 
@@ -2290,44 +2426,38 @@ See also the parameter \fI wins support\fR.
 Default: \fBdns proxy = yes\fR
 .TP
 \fBdomain admin group (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter 
+This parameter is intended as a temporary solution
-that is part of the unfinished Samba NT Domain Controller Code. It may 
+to enable users to be a member of the "Domain Admins" group when 
-be removed in a later release. To work with the latest code builds 
+a Samba host is acting as a PDC. A complete solution will be provided
-that may have more support for Samba NT Domain Controller functionality 
+by a system for mapping Windows NT/2000 groups onto UNIX groups.
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by 
+Please note that this parameter has a somewhat confusing name. It 
-visiting the web page at  http://lists.samba.org/ <URL:http://lists.samba.org/>.
+accepts a list of usernames and of group names in standard 
-.TP
+\fIsmb.conf\fR notation.
-\fBdomain admin users (G)\fR
+
-This is an \fBEXPERIMENTAL\fR parameter 
+See also \fIdomain
-that is part of the unfinished Samba NT Domain Controller Code. It may 
+guest group\fR, \fIdomain
-be removed in a later release. To work with the latest code builds 
+logons\fR
-that may have more support for Samba NT Domain Controller functionality 
+
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by 
+Default: \fBno domain administrators\fR
-visiting the web page at  http://lists.samba.org/ <URL:http://lists.samba.org/>.
+
-.TP
+Example: \fBdomain admin group = root @wheel\fR
-\fBdomain groups (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter 
-that is part of the unfinished Samba NT Domain Controller Code. It may 
-be removed in a later release. To work with the latest code builds 
-that may have more support for Samba NT Domain Controller functionality 
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by 
-visiting the web page at  http://lists.samba.org/ <URL:http://lists.samba.org/>.
 .TP
 \fBdomain guest group (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter 
+This parameter is intended as a temporary solution
-that is part of the unfinished Samba NT Domain Controller Code. It may 
+to enable users to be a member of the "Domain Guests" group when 
-be removed in a later release. To work with the latest code builds 
+a Samba host is acting as a PDC. A complete solution will be provided
-that may have more support for Samba NT Domain Controller functionality 
+by a system for mapping Windows NT/2000 groups onto UNIX groups.
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by 
+Please note that this parameter has a somewhat confusing name. It 
-visiting the web page at  http://lists.samba.org/ <URL:http://lists.samba.org/>.
+accepts a list of usernames and of group names in standard 
-.TP
+\fIsmb.conf\fR notation.
-\fBdomain guest users (G)\fR
+
-This is an \fBEXPERIMENTAL\fR parameter 
+See also \fIdomain
-that is part of the unfinished Samba NT Domain Controller Code. It may 
+admin group\fR, \fIdomain
-be removed in a later release. To work with the latest code builds 
+logons\fR
-that may have more support for Samba NT Domain Controller functionality 
+
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by 
+Default: \fBno domain guests\fR
-visiting the web page at  http://lists.samba.org/ <URL:http://lists.samba.org/>.
+
+Example: \fBdomain guest group = nobody @guest\fR
 .TP
 \fBdomain logons (G)\fR
 If set to true, the Samba server will serve 
@@ -2574,6 +2704,11 @@ permissions changed. The default for this parameter is (in octal)
 mode after the mask set in the \fIcreate mask\fR 
 parameter is applied.
 
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with 
+mask\fR to true.
+
 See also the parameter \fIcreate 
 mask\fR for details on masking mode bits on files.
 
@@ -2598,6 +2733,11 @@ bits to a created directory. This operation is done after the mode
 mask in the parameter \fIdirectory mask\fR is 
 applied.
 
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with 
+mask\fR to true.
+
 See also the parameter \fI directory mask\fR for details on masking mode bits 
 on created directories.
 
@@ -2622,26 +2762,23 @@ the user may have modified to be on. Essentially, one bits in this
 mask may be treated as a set of bits that, when modifying security 
 on a directory, the user has always set to be 'on'.
 
-If not set explicitly this parameter is set to the same 
+If not set explicitly this parameter is 000, which 
-value as the \fIforce 
+allows a user to modify all the user/group/world permissions on a 
-directory mode\fR parameter. To allow
+directory without restrictions.
-a user to modify all the user/group/world permissions on a 
-directory without restrictions, set this parameter to 000.
 
 \fBNote\fR that users who can access the 
 Samba server through other means can easily bypass this restriction, 
 so it is primarily useful for standalone "appliance" systems. 
-Administrators of most normal systems will probably want to set 
+Administrators of most normal systems will probably want to leave
-it to 0000.
+it set as 0000.
 
 See also the \fI directory security mask\fR,  \fIsecurity mask\fR, 
 \fIforce security mode
 \fRparameters.
 
-Default: \fBforce directory security mode = <same as 
+Default: \fBforce directory security mode = 0\fR
-force directory mode>\fR
 
-Example: \fBforce directory security mode = 0\fR
+Example: \fBforce directory security mode = 700\fR
 .TP
 \fBforce group (S)\fR
 This specifies a UNIX group name that will be 
@@ -2689,26 +2826,23 @@ the user may have modified to be on. Essentially, one bits in this
 mask may be treated as a set of bits that, when modifying security 
 on a file, the user has always set to be 'on'.
 
-If not set explicitly this parameter is set to the same 
+If not set explicitly this parameter is set to 0,
-value as the \fIforce 
+and allows a user to modify all the user/group/world permissions on a file,
-create mode\fR parameter. To allow a user to 
+with no restrictions.
-modify all the user/group/world permissions on a file, with no 
-restrictions set this parameter to 000.
 
 \fBNote\fR that users who can access 
 the Samba server through other means can easily bypass this restriction, 
 so it is primarily useful for standalone "appliance" systems. 
-Administrators of most normal systems will probably want to set 
+Administrators of most normal systems will probably want to leave
-it to 0000.
+this set to 0000.
 
 See also the \fI force directory security mode\fR,
 \fIdirectory security
 mask\fR, \fI security mask\fR parameters.
 
-Default: \fBforce security mode = <same as force 
+Default: \fBforce security mode = 0\fR
-create mode>\fR
 
-Example: \fBforce security mode = 0\fR
+Example: \fBforce security mode = 700\fR
 .TP
 \fBforce user (S)\fR
 This specifies a UNIX user name that will be 
@@ -3287,7 +3421,15 @@ you to have separate log files for each user or machine.
 Example: \fBlog file = /usr/local/samba/var/log.%m
 \fR.TP
 \fBlog level (G)\fR
-Synonym for \fI debug level\fR.
+The value of the parameter (an integer) allows 
+the debug level (logging level) to be specified in the 
+\fIsmb.conf\fR file. This is to give greater 
+flexibility in the configuration of the system.
+
+The default will be the log level specified on 
+the command line or level zero if none was specified.
+
+Example: \fBlog level = 3\fR
 .TP
 \fBlogon drive (G)\fR
 This parameter specifies the local path to 
@@ -4295,6 +4437,18 @@ See also smbpasswd (5).
 
 Default: \fBnull passwords = no\fR
 .TP
+\fBobey pam restrictions (G)\fR
+When Samba 2.2 is configure to enable PAM support
+(i.e. --with-pam), this parameter will control whether or not Samba
+should obey PAM's account and session management directives. The 
+default behavior is to use PAM for clear text authentication only
+and to ignore any account or session management. Note that Samba
+always ignores PAM for authentication in the case of \fIencrypt passwords = yes\fR
+\&. The reason is that PAM modules cannot support the challenge/response
+authentication mechanism needed in the presence of SMB password encryption.
+
+Default: \fBobey pam restrictions = no\fR
+.TP
 \fBonly user (S)\fR
 This is a boolean option that controls whether 
 connections with usernames not in the \fIuser\fR 
@@ -4317,18 +4471,6 @@ parameter.
 
 Default: \fBonly user = no\fR
 .TP
-\fBole locking compatibility (G)\fR
-This parameter allows an administrator to turn 
-off the byte range lock manipulation that is done within Samba to 
-give compatibility for OLE applications. Windows OLE applications 
-use byte range locking as a form of inter-process communication, by 
-locking ranges of bytes around the 2^32 region of a file range. This 
-can cause certain UNIX lock managers to crash or otherwise cause 
-problems. Setting this parameter to no means you 
-trust your UNIX lock manager to handle such cases correctly.
-
-Default: \fBole locking compatibility = yes\fR
-.TP
 \fBonly guest (S)\fR
 A synonym for \fI guest only\fR.
 .TP
@@ -4423,6 +4565,15 @@ containing in the Samba documentation.
 
 Default: \fBos2 driver map = <empty string>
 \fR.TP
+\fBpam password change (G)\fR
+With the addition of better PAM support in Samba 2.2, 
+this parameter, it is possible to use PAM's password change control 
+flag for Samba. If enabled, then PAM will be used for password
+changes when requested by an SMB client, and the \fIpasswd chat\fR must be
+be changed to work with the pam prompts.
+
+Default: \fBpam password change = no\fR
+.TP
 \fBpanic action (G)\fR
 This is a Samba developer option that allows a 
 system command to be called when either  smbd(8)crashes. This is usually used to draw attention to the fact that 
@@ -4468,8 +4619,17 @@ in the smbpasswd file is being changed, without access to the old
 password cleartext. In this case the old password cleartext is set 
 to "" (the empty string).
 
+Also, if the \fIpam
+password change\fR parameter is set to true, then the
+chat sequence should consist of three elements. The first element should
+match the pam prompt for the old password, the second element should match
+the pam prompt for the first request for the new password, and the final
+element should match the pam prompt for the second request for the new password.
+These matches are done case insentively. Under most conditions this change
+is done as root so the prompt for the old password will never be matched.
+
 See also \fIunix password 
-sync\fR, \fI passwd program\fR and  \fIpasswd chat debug\fR.
+sync\fR, \fI passwd program\fR , \fIpasswd chat debug\fR and  \fIpam password change\fR.
 
 Default: \fBpasswd chat = *new*password* %n\\n 
 *new*password* %n\\n *changed*\fR
@@ -5230,6 +5390,27 @@ is in fact the browse master on it's segment.
 
 Default: \fBremote browse sync = <empty string>
 \fR.TP
+\fBrestrict acl with mask (S)\fR
+This is a boolean parameter. If set to false (default), then 
+Creation of files with access control lists (ACLS) and modification of ACLs
+using the Windows NT/2000 ACL editor will be applied directly to the file
+or directory.
+
+If set to True, then all requests to set an ACL on a file will have the
+parameters \fIcreate mask\fR,
+\fIforce create mode\fR
+applied before setting the ACL, and all requests to set an ACL on a directory will
+have the parameters \fIdirectory 
+mask\fR, \fIforce 
+directory mode\fR applied before setting the ACL.
+
+See also \fIcreate mask\fR,
+\fIforce create mode\fR,
+\fIdirectory mask\fR,
+\fIforce directory mode\fR
+
+Default: \fBrestrict acl with mask = no\fR
+.TP
 \fBrestrict anonymous (G)\fR
 This is a boolean parameter. If it is true, then 
 anonymous access to the server will be restricted, namely in the 
@@ -5562,25 +5743,22 @@ this mask from being modified. Essentially, zero bits in this
 mask may be treated as a set of bits the user is not allowed 
 to change.
 
-If not set explicitly this parameter is set to the same
+If not set explicitly this parameter is 0777, allowing
-value as the \fIcreate mask
+a user to modify all the user/group/world permissions on a file.
-\fRparameter. To allow a user to modify all the 
-user/group/world permissions on a file, set this parameter to 
-0777.
 
 \fBNote\fR that users who can access the 
 Samba server through other means can easily bypass this 
 restriction, so it is primarily useful for standalone 
 "appliance" systems. Administrators of most normal systems will 
-probably want to set it to 0777.
+probably want to leave it set to 0777.
 
 See also the  \fIforce directory security mode\fR, 
 \fIdirectory 
 security mask\fR,  \fIforce security mode\fR parameters.
 
-Default: \fBsecurity mask = <same as create mask>
+Default: \fBsecurity mask = 0777\fR
-\fR
+
-Example: \fBsecurity mask = 0777\fR
+Example: \fBsecurity mask = 0770\fR
 .TP
 \fBserver string (G)\fR
 This controls what string will show up in the 

docs/manpages/smbcontrol.1

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBCONTROL" "1" "24 April 2001" "" ""
+.TH "SMBCONTROL" "1" "01 June 2001" "" ""
 .SH NAME
 smbcontrol \- send messages to smbd or nmbd processes
 .SH SYNOPSIS

docs/manpages/smbspool.8

@@ -3,9 +3,9 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBSPOOL" "8" "24 April 2001" "" ""
+.TH "SMBSPOOL" "8" "01 June 2001" "" ""
 .SH NAME
-nmblookup \- send print file to an SMB printer
+smbspool \- send print file to an SMB printer
 .SH SYNOPSIS
 .sp
 \fBsmbspool\fR [ \fBjob\fR ]  [ \fBuser\fR ]  [ \fBtitle\fR ]  [ \fBcopies\fR ]  [ \fBoptions\fR ]  [ \fBfilename\fR ] 

docs/manpages/smbstatus.1

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBSTATUS" "1" "24 April 2001" "" ""
+.TH "SMBSTATUS" "1" "01 June 2001" "" ""
 .SH NAME
 smbstatus \- report on current Samba connections
 .SH SYNOPSIS

docs/manpages/swat.8

@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SWAT" "8" "24 April 2001" "" ""
+.TH "SWAT" "8" "01 June 2001" "" ""
 .SH NAME
 swat \- Samba Web Administration Tool
 .SH SYNOPSIS
 .sp
-\fBnmblookup\fR [ \fB-s <smb config file>\fR ]  [ \fB-a\fR ] 
+\fBswat\fR [ \fB-s <smb config file>\fR ]  [ \fB-a\fR ] 
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.

docs/textdocs/CVS_ACCESS.txt

@@ -1,124 +0,0 @@
-!==
-!== CVS_ACCESS.txt for Samba release 2.0.4 18 May 1999
-!==
-Contributor:    Modified from the Web pages by Jeremy Allison.
-Date:           23 Dec 1997
-Status:         Current
-
-How to get access to Samba source code via cvs.
-===============================================
-
-CVS Access to samba.org
-------------------------------
-
-The machine samba.org runs a publicly accessible CVS 
-repository for access to the source code of several packages, 
-including samba, rsync and jitterbug. This document describes 
-how to get anonymous read-only access to this source code. 
-
-Access via cvsweb
------------------
-
-You can access the source code via your favourite WWW browser. 
-This allows you to access the contents of individual files in 
-the repository and also to look at the revision history and 
-commit logs of individual files. You can also ask for a diff 
-listing between any two versions on the repository.
-
-Use the URL : http://samba.org/cgi-bin/cvsweb
-
-Access via cvs
---------------
-
-You can also access the source code via a normal cvs client. 
-This gives you much more control over you can do with the 
-repository and allows you to checkout whole source trees 
-and keep them uptodate via normal cvs commands. This is the 
-preferred method of access if you are a developer and not
-just a casual browser.
-
-To download the latest cvs source code, point your
-browser at the URL :
-
-http://www.cyclic.com/
-
-and click on the 'How to get cvs' link. CVS is free
-software under the GNU GPL (as is Samba).
-
-To gain access via anonymous cvs use the following steps. 
-For this example it is assumed that you want a copy of the 
-samba source code. For the other source code repositories 
-on this system just substitute the correct package name
-
-1. Install a recent copy of cvs. All you really need is a 
-  copy of the cvs client binary. 
-
-2. Run the command 
-
-  cvs -d :pserver:cvs@samba.org:/cvsroot login
-
-When it asks you for a password type 'cvs' (not including
-the quotes).
-
-3. Run the command 
-
-  cvs -d :pserver:cvs@samba.org:/cvsroot co samba
-
-This will create a directory called samba containing the 
-latest samba source code. This currently corresponds to the 
-1.9.18alpha development tree. 
-
-4. Whenever you want to merge in the latest code changes use 
-the following command from within the samba directory: 
-
-  cvs update -d -P
-
-NOTE: If you instead want the latest source code for the 
-1.9.17 stable tree then replace step 4 with the command: 
-
-  cvs -d :pserver:cvs@samba.org:/cvsroot co -r BRANCH_1_9_17 samba
-
-Access to the NT DOMAIN Controller code
----------------------------------------
-
-The Samba PDC code is being separately developed on a
-branch named BRANCH_NTDOM. To gain access to the latest
-source code (this changes daily) do the following:
-
-1). Log onto cvs 
-
-  cvs -d :pserver:cvs@samba.org:/cvsroot login          
-  
-When it asks you for a password type 'cvs' (not including
-the quotes).
-
-2). Check out the BRANCH_NTDOM by typing :
-
-  cvs -d :pserver:cvs@samba.org:/cvsroot co -r BRANCH_NTDOM samba
-
-This will create a directory called samba containing the
-latest snapshot of the domain controller code.
-
-3). To keep this code up to date after it has been
-changed in the cvs repository, cd into the samba
-directory you created above and type :
-
-  cvs update -d -P
-
-How it's done.
---------------
-
-If you are interested in how anonymous cvs access is set up and 
-want to set it up on your own system then you might like to checkout 
-the pserver source code using the the command :
-
- cvs -d :pserver:cvs@samba.org:/cvsroot co pserver
-
-You really have to know what you are doing to do this. Please don't 
-email samba-bugs with basic cvs or unix security questions. 
-
-Reporting problems.
--------------------
-
-If you have any problems with this system please email 
-samba-bugs@samba.org. 

docs/textdocs/DOMAIN.txt

@@ -1,381 +0,0 @@
-!==
-!== DOMAIN.txt for Samba release 2.0.4 18 May 1999
-!==
-Contributor:	Samba Team
-Updated:	December 4, 1998 (John H Terpstra)
-
-Subject:	Network Logons and Roaming (Roving) Profiles
-===========================================================================
-
-A domain and a workgroup are exactly the same thing in terms of network
-browsing.  The difference is that a distributable authentication
-database is associated with a domain, for secure login access to a
-network.  Also, different access rights can be granted to users if they
-successfully authenticate against a domain logon server (samba does not
-support this, but NT server and other systems based on NT server do).
-
-As of samba-2.0.0 this is now a work in progress that is expected to
-mature rapidly. Since this document pre-dates samba-2.0.0 it should be
-read from the perspective of it's origins but the reader should understand
-that the following details may NOT be up to date with current development.
-
-The SMB client logging on to a domain has an expectation that every other
-server in the domain should accept the same authentication information.
-However the network browsing functionality of domains and workgroups is
-identical and is explained in BROWSING.txt.
-
-Issues related to the single-logon network model are discussed in this
-document.  Samba supports domain logons, network logon scripts, and user
-profiles for MS Windows for workgroups and MS Windows 9X clients.
-
-Work is underway to support domain logon for MS Windows NT clients - this
-is mostly working but will undergo much change as the the behaviour of the
-new code matures and becomes easier to manage.
-
-Support is also not complete.  Samba does not yet support the sharing
-of the Windows NT-style SAM database with other systems.  However this is
-only one way of having a shared user database: exactly the same effect can
-be achieved by having all servers in a domain share a distributed NIS or
-Kerberos authentication database.
-
-When an SMB client in a domain wishes to logon it broadcast requests for a
-logon server.  The first one to reply gets the job, and validates its
-password using whatever mechanism the Samba administrator has installed.
-It is possible (but very stupid) to create a domain where the user
-database is not shared between servers, ie they are effectively workgroup
-servers advertising themselves as participating in a domain.  This
-demonstrates how authentication is quite different from but closely
-involved with domains.
-
-Another thing commonly associated with single-logon domains is remote
-administration over the SMB protocol.  Again, there is no reason why this
-cannot be implemented with an underlying username database which is
-different from the Windows NT SAM.  Support for the Remote Administration
-Protocol is planned for a future release of Samba.
-
-The domain support works for WfWg, and Win95 clients and NT 4.0 and 3.51.
-Domain support is currently at an early experimental stage for NT 4.0 and
-NT 3.51.  Support for Windows OS/2 clients is still being worked on and is
-still experimental.
-
-Support for profiles is confirmed as working for Win95, NT 4.0 and NT 3.51.
-It is possible to specify: the profile location; script file to be loaded
-on login; the user's home directory; and for NT a kick-off time could also
-now easily be supported.
-
-With NT Workstations, all this does not require the use or intervention of
-an NT 4.0 or NT 3.51 server: Samba can now replace the logon services
-provided by an NT server, to a limited and experimental degree (for example,
-running "User Manager for Domains" will not provide you with access to
-a domain created by a Samba Server).
-
-With Win95, the help of an NT server can be enlisted, both for profile storage
-and for user authentication.  For details on user authentication, see
-security_level.txt.  For details on profile storage, see below.
-
-
-Using these features you can make your clients verify their logon via
-the Samba server; make clients run a batch file when they logon to
-the network and download their preferences, desktop and start menu.
-
-
-Configuration Instructions:	Network Logons
-==============================================
-
-To use domain logons and profiles you need to do the following:
-
-
-1) Setup nmbd and smbd by configuring smb.conf so that Samba is
-   acting as the master browser. See <your OS>_INSTALL.txt and BROWSING.txt
-   for details.
-
-2) Setup a WINS server (see NetBIOS.txt) and configure all your clients
-   to use that WINS service.  
-
-3) Create a share called [netlogon] in your smb.conf. This share should
-   be readable by all users, and probably should not be writeable. This
-   share will hold your network logon scripts, and the CONFIG.POL file
-   (Note: for details on the CONFIG.POL file, how to use it, what it is,
-   refer to the Microsoft Windows NT Administration documentation.
-   The format of these files is not known, so you will need to use
-   Microsoft tools).
-
-For example I have used:
-
-   [netlogon]
-    path = /data/dos/netlogon
-    writeable = no
-    guest ok = no
-
-Note that it is important that this share is not writeable by ordinary
-users, in a secure environment: ordinary users should not be allowed
-to modify or add files that another user's computer would then download
-when they log in.
-
-4) in the [global] section of smb.conf set the following:
-
-   domain logons = yes
-   logon script = %U.bat
-
-The choice of batch file is, of course, up to you. The above would
-give each user a separate batch file as the %U will be changed to
-their username automatically. The other standard % macros may also be
-used. You can make the batch files come from a subdirectory by using
-something like:
-
-   logon script = scripts\%U.bat
-
-5) create the batch files to be run when the user logs in. If the batch
-   file doesn't exist then no batch file will be run. 
-
-In the batch files you need to be careful to use DOS style cr/lf line
-endings. If you don't then DOS may get confused. I suggest you use a
-DOS editor to remotely edit the files if you don't know how to produce
-DOS style files under unix.
-
-6) Use smbclient with the -U option for some users to make sure that
-   the \\server\NETLOGON share is available, the batch files are
-   visible and they are readable by the users.
-
-7) you will probabaly find that your clients automatically mount the
-   \\SERVER\NETLOGON share as drive z: while logging in. You can put
-   some useful programs there to execute from the batch files.
-
-NOTE: You must be using "security = user" or "security = server" for
-domain logons to work correctly.  Share level security won't work
-correctly.
-
-
-
-Configuration Instructions:	Setting up Roaming User Profiles
-================================================================
-
-In the [global] section of smb.conf set the following (for example):
-
-  logon path = \\profileserver\profileshare\profilepath\%U\moreprofilepath
-
-The default for this option is \\%N\%U\profile, namely
-\\sambaserver\username\profile.  The \\N%\%U service is created
-automatically by the [homes] service.
-
-If you are using a samba server for the profiles, you _must_ make the
-share specified in the logon path browseable.  Windows 95 appears to
-check that it can see the share and any subdirectories within that share
-specified by the logon path option, rather than just connecting straight
-away.  It also attempts to create the components of the full path for
-you.  If the creation of any component fails, or if it cannot see any
-component of the path, the profile creation / reading fails.
-
-[lkcl 26aug96 - we have discovered a problem where Windows clients can
-maintain a connection to the [homes] share in between logins.  The
-[homes] share must NOT therefore be used in a profile path.]
-
-
-Windows 95
-----------
-
-When a user first logs in on Windows 95, the file user.DAT is created,
-as are folders "Start Menu", "Desktop", "Programs" and "Nethood".  
-These directories and their contents will be merged with the local
-versions stored in c:\windows\profiles\username on subsequent logins,
-taking the most recent from each.  You will need to use the [global]
-options "preserve case = yes", "short case preserve = yes" and
-"case sensitive = no" in order to maintain capital letters in shortcuts
-in any of the profile folders.
-
-The user.DAT file contains all the user's preferences.  If you wish to
-enforce a set of preferences, rename their user.DAT file to user.MAN,
-and deny them write access to this file.
-
-2) On the Windows 95 machine, go to Control Panel | Passwords and
-   select the User Profiles tab.  Select the required level of
-   roaming preferences.  Press OK, but do _not_ allow the computer
-   to reboot.
-
-3) On the Windows 95 machine, go to Control Panel | Network |
-   Client for Microsoft Networks | Preferences.  Select 'Log on to
-   NT Domain'.  Then, ensure that the Primary Logon is 'Client for
-   Microsoft Networks'.  Press OK, and this time allow the computer
-   to reboot.
-
-Under Windows 95, Profiles are downloaded from the Primary Logon.
-If you have the Primary Logon as 'Client for Novell Networks', then
-the profiles and logon script will be downloaded from your Novell
-Server.  If you have the Primary Logon as 'Windows Logon', then the
-profiles will be loaded from the local machine - a bit against the
-concept of roaming profiles, if you ask me.
-
-You will now find that the Microsoft Networks Login box contains
-[user, password, domain] instead of just [user, password].  Type in
-the samba server's domain name (or any other domain known to exist,
-but bear in mind that the user will be authenticated against this
-domain and profiles downloaded from it, if that domain logon server
-supports it), user name and user's password.
-
-Once the user has been successfully validated, the Windows 95 machine
-will inform you that 'The user has not logged on before' and asks you
-if you wish to save the user's preferences?  Select 'yes'.
-
-Once the Windows 95 client comes up with the desktop, you should be able
-to examine the contents of the directory specified in the "logon path"
-on the samba server and verify that the "Desktop", "Start Menu",
-"Programs" and "Nethood" folders have been created.
-
-These folders will be cached locally on the client, and updated when
-the user logs off (if you haven't made them read-only by then :-).
-You will find that if the user creates further folders or short-cuts,
-that the client will merge the profile contents downloaded with the
-contents of the profile directory already on the local client, taking
-the newest folders and short-cuts from each set.
-
-If you have made the folders / files read-only on the samba server,
-then you will get errors from the w95 machine on logon and logout, as
-it attempts to merge the local and the remote profile.  Basically, if
-you have any errors reported by the w95 machine, check the unix file
-permissions and ownership rights on the profile directory contents,
-on the samba server.
-
-
-If you have problems creating user profiles, you can reset the user's
-local desktop cache, as shown below.  When this user then next logs in,
-they will be told that they are logging in "for the first time".
-
-
-1) instead of logging in under the [user, password, domain] dialog],
-   press escape.
-
-2) run the regedit.exe program, and look in:
-
-     HKEY_LOCAL_MACHINE\Windows\CurrentVersion\ProfileList
-
-   you will find an entry, for each user, of ProfilePath.  Note the
-   contents of this key (likely to be c:\windows\profiles\username),
-   then delete the key ProfilePath for the required user.
-
-   [Exit the registry editor].
-
-3) WARNING - before deleting the contents of the directory listed in
-   the ProfilePath (this is likely to be c:\windows\profiles\username),
-   ask them if they have any important files stored on their desktop
-   or in their start menu.  delete the contents of the directory
-   ProfilePath (making a backup if any of the files are needed).
-
-   This will have the effect of removing the local (read-only hidden
-   system file) user.DAT in their profile directory, as well as the
-   local "desktop", "nethood", "start menu" and "programs" folders.
-
-4) search for the user's .PWL password-cacheing file in the c:\windows
-   directory, and delete it.
-
-5) log off the windows 95 client.
-
-6) check the contents of the profile path (see "logon path" described
-   above), and delete the user.DAT or user.MAN file for the user,
-   making a backup if required.  
-
-
-If all else fails, increase samba's debug log levels to between 3 and 10,
-and / or run a packet trace program such as tcpdump or netmon.exe, and
-look for any error reports.
-
-If you have access to an NT server, then first set up roaming profiles
-and / or netlogons on the NT server.  Make a packet trace, or examine
-the example packet traces provided with NT server, and see what the
-differences are with the equivalent samba trace.
-
-
-Windows NT Workstation 4.0
---------------------------
-
-When a user first logs in to a Windows NT Workstation, the profile
-NTuser.DAT is created.  The profile location can be now specified
-through the "logon path" parameter, in exactly the same way as it
-can for Win95.  [lkcl 10aug97 - i tried setting the path to
-\\samba-server\homes\profile, and discovered that this fails because
-a background process maintains the connection to the [homes] share
-which does _not_ close down in between user logins.  you have to
-have \\samba-server\%L\profile, where user is the username created
-from the [homes] share].
-
-There is a parameter that is now available for use with NT Profiles:
-"logon drive".  This should be set to "h:" or any other drive, and
-should be used in conjunction with the new "logon home" parameter.
-
-The entry for the NT 4.0 profile is a _directory_ not a file.  The NT
-help on profiles mentions that a directory is also created with a .PDS
-extension.  The user, while logging in, must have write permission to
-create the full profile path (and the folder with the .PDS extension)
-[lkcl 10aug97 - i found that the creation of the .PDS directory failed,
-and had to create these manually for each user, with a shell script.
-also, i presume, but have not tested, that the full profile path must
-be browseable just as it is for w95, due to the manner in which they
-attempt to create the full profile path: test existence of each path
-component; create path component].
-
-In the profile directory, NT creates more folders than 95.  It creates
-"Application Data" and others, as well as "Desktop", "Nethood",
-"Start Menu" and "Programs".  The profile itself is stored in a file
-NTuser.DAT.  Nothing appears to be stored in the .PDS directory, and
-its purpose is currently unknown.
-
-You can use the System Control Panel to copy a local profile onto
-a samba server (see NT Help on profiles: it is also capable of firing
-up the correct location in the System Control Panel for you).  The
-NT Help file also mentions that renaming NTuser.DAT to NTuser.MAN
-turns a profile into a mandatory one.
-
-[lkcl 10aug97 - i notice that NT Workstation tells me that it is
-downloading a profile from a slow link.  whether this is actually the
-case, or whether there is some configuration issue, as yet unknown,
-that makes NT Workstation _think_ that the link is a slow one is a
-matter to be resolved].
-
-[lkcl 20aug97 - after samba digest correspondance, one user found, and
-another confirmed, that profiles cannot be loaded from a samba server
-unless "security = user" and "encrypt passwords = yes" (see the file
-ENCRYPTION.txt) or "security = server" and "password server = ip.address.
-of.yourNTserver" are used.  either of these options will allow the NT
-workstation to access the samba server using LAN manager encrypted
-passwords, without the user intervention normally required by NT
-workstation for clear-text passwords].
-
-[lkcl 25aug97 - more comments received about NT profiles: the case of
-the profile _matters_.  the file _must_ be called NTuser.DAT or, for
-a mandatory profile, NTuser.MAN].
-
-
-Windows NT Server
------------------
-
-There is nothing to stop you specifying any path that you like for the
-location of users' profiles.  Therefore, you could specify that the
-profile be stored on a samba server, or any other SMB server, as long as
-that SMB server supports encrypted passwords.
-
-
-
-Sharing Profiles between W95 and NT Workstation 4.0
----------------------------------------------------
-
-The default logon path is \\%N\U%.  NT Workstation will attempt to create
-a directory "\\samba-server\username.PDS" if you specify the logon path
-as "\\samba-server\username" with the NT User Manager.  Therefore, you
-will need to specify (for example) "\\samba-server\username\profile".
-NT 4.0 will attempt to create "\\samba-server\username\profile.PDS", which
-is more likely to succeed.
-
-If you then want to share the same Start Menu / Desktop with W95, you will
-need to specify "logon path = \\samba-server\username\profile" [lkcl 10aug97
-this has its drawbacks: i created a shortcut to telnet.exe, which attempts
-to run from the c:\winnt\system32 directory.  this directory is obviously
-unlikely to exist on a Win95-only host].
-
-If you have this set up correctly, you will find separate user.DAT and
-NTuser.DAT files in the same profile directory.
-
-[lkcl 25aug97 - there are some issues to resolve with downloading of
-NT profiles, probably to do with time/date stamps.  i have found that
-NTuser.DAT is never updated on the workstation after the first time that
-it is copied to the local workstation profile directory.  this is in
-contrast to w95, where it _does_ transfer / update profiles correctly].
-

docs/textdocs/MIRRORS.txt

@@ -1,6 +0,0 @@
-!==
-!== MIRRORS.txt for Samba release 2.0.4 18 May 1999
-!==
-
-For a list of web and ftp mirrors please see 
-http://samba.org/samba/

docs/textdocs/outdated/NTDOMAIN.txt

@@ -0,0 +1,51 @@
+!==
+!== NTDOMAIN.txt for Samba release 2.0.4 18 May 1999
+!==
+Contributor:	Luke Kenneth Casson Leighton (samba-bugs@samba.org)
+		Copyright (C) 1997 Luke Kenneth Casson Leighton
+Created:	October 20, 1997
+Updated:	February 25, 1999 (Jerry Carter)
+
+Subject:	NT Domain Logons
+===========================================================================
+
+As of 1.9.18alpha1, Samba supports logins for NT 3.51 and 4.0 Workstations,
+without the need, use or intervention of NT Server.  This document describes
+how to set this up.  Over the continued development of the 1.9.18alpha
+series, this process (and therefore this document) should become simpler.
+
+One useful thing to do is to get this version of Samba up and running
+with Win95 profiles, as you would for the current stable version of
+Samba (currently at 1.9.17p4), and is fully documented.  You will need
+to set up encrypted passwords.  Even if you don't have any Win95 machines,
+using your Samba Server to store the profile for one of your NT Workstation
+users is a good test that you have 1.9.18alpha1 correctly configured *prior*
+to attempting NT Domain Logons.
+
+The support is still experimental, so should be used at your own risk.
+
+NT is not as robust as you might have been led to believe: during the
+development of the Domain Logon Support, one person reported having to
+reinstall NT from scratch: their workstation had become totally unuseable.
+
+[further reports on ntsec@iss.net by independent administrators showing
+ similar symptoms lead us to believe that the SAM database file may be
+ corruptible.  this _is_ recoverable (or, at least the machine is accessible),
+ by deleting the SAM file, under which circumstances all user account details
+ are lost, but at least the Administrator can log in with a blank password.
+ this is *not* possible except if the NT system is installed in a FAT
+ partition.]
+
+This *has* been reported to the NTBUGTRAQ@LISTSERV.NTBUGTRAQ.COM digest.
+
+==========================================================================
+Please note that Samba 2.0 does not **officially** support domain logons
+for Windows NT clients.  Of course, domain logon support for Windows 9x
+clients is complete and official.  These are two different issues.
+
+Samba's capability to act as a Primary Domain Controller for Windows NT
+domains is not advertised as it is not completed yet.  For more information 
+regarding how to obtain the latest development (HEAD branch) source code
+and what features are available, please refer to the NT Domain FAQ on-line
+at the Samba web site under the documentation page.
+

docs/textdocs/outdated/PROJECTS

@@ -0,0 +1,88 @@
+                 Samba Projects Directory
+                 ========================
+
+
+>>>>> NOTE: THIS FILE IS NOW VERY OUT OF DATE <<<<<
+
+
+This is a list of who's working on what in Samba. It's not guaranteed
+to be uptodate or accurate but I hope it will help us getting
+coordinated.
+
+If you are working on something to do with Samba and you aren't here
+then please let me know! Also, if you are listed below and you have
+any corrections or updates then please let me know.
+
+Email contact:
+samba-bugs@samba.org
+
+========================================================================
+Documentation and FAQ
+
+Docs and FAQ files for the Samba suite of software.
+
+Contact samba-bugs@samba.org with the diffs. These are urgently 
+required. 
+
+The FAQ is being added to on an ad hoc basis, see the web pages for info.
+
+Mark Preston was working on a set of formatted docs for Samba. Is this
+still happening? Contact mpreston@sghms.ac.uk
+
+Status last updated 2nd October 1996
+========================================================================
+
+========================================================================
+Netbeui support
+
+This aimed to produce patches so that Samba can be used with clients
+that do not have TCP/IP. It will try to remain as portable as possible.
+Contact Brian.Onn@Canada.Sun.COM (Brian Onn) Unfortunately it died, and
+although a lot of people have expressed interest nobody has come forward
+to do it. The Novell port (see Samba web pages) includes NetBEUI 
+functionality in a proprietrary library which should still be helpful as 
+we have the interfaces. Alan Cox (a.cox@li.org) has the information 
+required to write the state machine if someone is going to do the work.
+
+Status last updated 2nd October 1996
+========================================================================
+
+========================================================================
+Smbfs
+
+A mountable smb filesystem for Linux using the userfs userspace filesystem
+
+Contact lendecke@namu01.gwdg.de (Volker Lendecke)
+
+This works really well, and is measurably more efficient than commercial
+client software. It is now part of the Linux kernel. Long filename support
+is in use.
+
+Status last updated June 1997
+========================================================================
+
+========================================================================
+Admin Tool
+
+Aims to produce a nice smb.conf editor and other useful tools for
+administering a Samba system.
+
+Contact: Steve Brown (steve@unicorn.dungeon.com)
+
+In the design phase.
+
+Status last updated 4th September 1994
+========================================================================
+
+
+========================================================================
+Lanman Client.
+
+Contact: john@amanda.xs4all.nl (John Stewart)
+
+Aims to produce a reliable LANMAN Client implementation for LINUX,
+and possibly other variations of UNIX. Project ably started by
+Tor Lillqvist; tml@hemuli.tte.vtt.fi
+
+Status last updated 17th January 1995
+========================================================================