From 8939efc8c700b46f53e336ef126c02e244c7f448 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 19 Apr 2001 21:41:48 +0000 Subject: merge from 2.2 (This used to be commit 6270765ed5d4e94d34af6d512f17f403b9624699) --- docs/docbook/Makefile.in | 172 +-- docs/docbook/configure | 36 + docs/docbook/configure.in | 10 +- docs/docbook/manpages/lmhosts.5.sgml | 4 +- docs/docbook/manpages/rpcclient.1.sgml | 443 +++---- docs/docbook/manpages/smb.conf.5.sgml | 1987 ++++++++++++++++++++------------ docs/docbook/manpages/smbcacls.1.sgml | 2 +- docs/docbook/manpages/smbclient.1.sgml | 4 +- docs/docbook/manpages/smbmnt.8.sgml | 27 +- docs/docbook/manpages/smbmount.8.sgml | 154 ++- docs/docbook/manpages/smbpasswd.8.sgml | 2 +- docs/docbook/manpages/smbumount.8.sgml | 8 +- 12 files changed, 1785 insertions(+), 1064 deletions(-) diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index d0a78355f4..bfde74ecde 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -15,6 +15,7 @@ NSGMLS = @NSGMLS@ ONSGMLS=@ONSGMLS@ SGMLSPL=@SGMLSPL@ HTMLDOC=@HTMLDOC@ +PERL=@PERL@ #CATALOG = @CATALOG@ MANDIR=../manpages HTMLDIR=../htmldocs @@ -34,7 +35,7 @@ MANPAGES=$(MANDIR)/findsmb.1 $(MANDIR)/smbclient.1 \ $(MANDIR)/smbmount.8 $(MANDIR)/swat.8 $(MANDIR)/rpcclient.1 \ $(MANDIR)/smbpasswd.5 $(MANDIR)/testparm.1 $(MANDIR)/samba.7 \ $(MANDIR)/smbpasswd.8 $(MANDIR)/testprns.1 \ - $(MANDIR)/smb.conf.5 $(MANDIR)/smbrun.1 $(MANDIR)/wbinfo.1 \ + $(MANDIR)/smb.conf.5 $(MANDIR)/wbinfo.1 \ $(MANDIR)/smbcacls.1 $(MANDIR)/smbsh.1 $(MANDIR)/winbindd.8 SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \ @@ -47,11 +48,15 @@ SGMLMANSRC=manpages/findsmb.1.sgml manpages/smbclient.1.sgml \ manpages/rpcclient.1.sgml manpages/smbpasswd.5.sgml \ manpages/testparm.1.sgml manpages/samba.7.sgml \ manpages/smbpasswd.8.sgml manpages/testprns.1.sgml \ - manpages/smb.conf.5.sgml manpages/smbrun.1.sgml \ + manpages/smb.conf.5.sgml \ manpages/wbinfo.1.sgml manpages/smbcacls.1.sgml \ manpages/smbsh.1.sgml manpages/winbindd.8.sgml -HOWTOSRC=howto/DOMAIN_MEMBER.sgml howto/NT_Security.sgml howto/samba-pdc-howto.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 + FAQSRC=faq/samba-pdc-faq.sgml @@ -79,15 +84,26 @@ HOWTO: $(HOWTOSRC) @(for i in $?; do \ htmlfile=`basename $$i | sed "s/\.sgml/\.html/g"`; \ echo "Making $$htmlfile"; \ + cat $$i | $(PERL) scripts/make-article.pl > /tmp/`basename $$i`; \ $(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl \ - -f /tmp/jade.log $$i > ../htmldocs/$$htmlfile; \ + -f /tmp/jade.log /tmp/`basename $$i` > ../htmldocs/$$htmlfile; \ cat /tmp/jade.log | grep -v DTDDECL; \ - /bin/rm -f /tmp/jade.log; \ + /bin/rm -f /tmp/jade.log /tmp/`basename $$i`; \ done) + +## I'm using htmldoc here to produc the PDF output. If you want +## Postscript output, you can run +## +## sgmltools -b ps projdoc/samba-doc.sgml +## proj-doc: + echo Building Samba-HOWTO-Collections... @(cd projdoc; $(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl samba-doc.sgml > ../samba-doc.html) - @$(HTMLDOC) -f samba-doc.pdf samba-doc.html + @$(HTMLDOC) -f ../Samba-HOWTO-Collection.pdf samba-doc.html + @/bin/mv -f samba-doc.html ../htmldocs/Samba-HOWTO-Collection.html + + @@ -113,11 +129,12 @@ man-all: $(SGMLMANSRC) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl; \ cat /tmp/docbook2x.log | grep -v DTDDECL; \ /bin/rm -f /tmp/docbook2x.log; \ - /bin/mv -f $$manfile $(MANDIR)/$$manfile; \ + cat $$manfile | $(PERL) scripts/strip-links.pl > $(MANDIR)/$$manfile; \ + /bin/rm -f $$manfile; \ done) - + ## ## these rules are for building individual files @@ -125,191 +142,210 @@ man-all: $(SGMLMANSRC) $(MANDIR)/findsmb.1: manpages/findsmb.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` - + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + $(MANDIR)/smbclient.1: manpages/smbclient.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbspool.8: manpages/smbspool.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/lmhosts.5: manpages/lmhosts.5.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbcontrol.1: manpages/smbcontrol.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbstatus.1: manpages/smbstatus.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/make_smbcodepage.1: manpages/make_smbcodepage.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbd.8: manpages/smbd.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbtar.1: manpages/smbtar.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/nmbd.8: manpages/nmbd.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbmnt.8: manpages/smbmnt.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbumount.8: manpages/smbumount.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/nmblookup.1: manpages/nmblookup.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbmount.8: manpages/smbmount.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/swat.8: manpages/swat.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/rpcclient.1: manpages/rpcclient.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbpasswd.5: manpages/smbpasswd.5.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/testparm.1: manpages/testparm.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/samba.7: manpages/samba.7.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbpasswd.8: manpages/smbpasswd.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/testprns.1: manpages/testprns.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smb.conf.5: manpages/smb.conf.5.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) - @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` - -$(MANDIR)/smbrun.1: manpages/smbrun.1.sgml - @echo "Making $@" - @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/wbinfo.1: manpages/wbinfo.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbcacls.1: manpages/smbcacls.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/smbsh.1 : manpages/smbsh.1.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` $(MANDIR)/winbindd.8: manpages/winbindd.8.sgml @echo "Making $@" @$(ONSGMLS) $< | $(SGMLSPL) $(SGML_SHARE)/docbook2X/docbook2man-spec.pl - @/bin/mv `basename $@` $(MANDIR) + @cat `basename $@` | $(PERL) scripts/strip-links.pl > $@ + @/bin/rm -f `basename $@` @echo "Making HTML version of $@" - @$(JADE) -t sgml -V nochunks -d $$SGML_SHARE/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` + @$(JADE) -t sgml -V nochunks -d $(SGML_SHARE)/dsssl/docbook/html/docbook.dsl $< > $(HTMLDIR)/`basename $< | sed "s/\.sgml/\.html/g"` ## Clean Rule diff --git a/docs/docbook/configure b/docs/docbook/configure index 5745489fdb..b2403428a2 100755 --- a/docs/docbook/configure +++ b/docs/docbook/configure @@ -739,6 +739,41 @@ else echo "$ac_t""no" 1>&6 fi +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:746: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PERL="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +PERL="$ac_cv_path_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + SGML_SHARE="/usr/local/share/sgml" @@ -915,6 +950,7 @@ s%@NSGMLS@%$NSGMLS%g s%@HTMLDOC@%$HTMLDOC%g s%@ONSGMLS@%$ONSGMLS%g s%@SGMLSPL@%$SGMLSPL%g +s%@PERL@%$PERL%g s%@SGML_SHARE@%$SGML_SHARE%g s%@DOC_BUILD_DATE@%$DOC_BUILD_DATE%g diff --git a/docs/docbook/configure.in b/docs/docbook/configure.in index c115fd88c0..92e98d3e82 100644 --- a/docs/docbook/configure.in +++ b/docs/docbook/configure.in @@ -11,12 +11,13 @@ AC_PATH_PROG(NSGMLS, nsgmls) AC_PATH_PROG(HTMLDOC, htmldoc) AC_PATH_PROG(ONSGMLS, onsgmls) AC_PATH_PROG(SGMLSPL, sgmlspl) +AC_PATH_PROG(PERL, perl) dnl ---------------------------------------------------------------- dnl --with-sgml-share SGML_SHARE="/usr/local/share/sgml" -AC_ARG_WITH(SGML_SHARE, +AC_ARG_WITH(sgml-share, [ --with-sgml-share=DIR change the default location of SGML stylesheets], [case "$withval" in no) SGML_SHARE="" @@ -32,9 +33,12 @@ AC_ARG_WITH(SGML_SHARE, esac ])dnl -AC_SUBST(SGML_SHARE)dnl - +# The Makefile requires docbook2X in the share/sgml directory +if [ ! test -f $SGML_SHARE/docbook2X/docbook2man-spec.pl ]; then + AC_MSG_ERROR("Unable to find dockbook2X. Make sure it is installed and that the sgml-share path is correct.") +fi +AC_SUBST(SGML_SHARE)dnl DOC_BUILD_DATE=`date '+%d-%m-%Y'` AC_SUBST(DOC_BUILD_DATE) diff --git a/docs/docbook/manpages/lmhosts.5.sgml b/docs/docbook/manpages/lmhosts.5.sgml index a003569698..32ed13f043 100644 --- a/docs/docbook/manpages/lmhosts.5.sgml +++ b/docs/docbook/manpages/lmhosts.5.sgml @@ -1,5 +1,5 @@ - + lmhosts @@ -56,7 +56,7 @@ # -#Sample Samba lmhosts file. +# Sample Samba lmhosts file. # 192.9.200.1 TESTPC 192.9.200.20 NTSERVER#20 diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml index f45c4e8bb1..c02f935d82 100644 --- a/docs/docbook/manpages/rpcclient.1.sgml +++ b/docs/docbook/manpages/rpcclient.1.sgml @@ -9,27 +9,24 @@ rpcclient - developer's tool to testing client side + tool for executing client side MS-RPC functions - nmblookup - -d debuglevel - -S server - -U username - -W workgroup - -n <netbios name> + rpcclient + server -A authfile - -N - -l logfile - -I destinationIP - -E <terminal code> -c <command string> - -i scope - -O <socket options> + -d debuglevel + -h + -l logfile + -N -s <smb config file> + -U username[%password] + -W workgroup + -N @@ -39,10 +36,10 @@ This tool is part of the Samba suite. - rpcclient is a utility for developers for - executing various MS-RPC functions. It's primary use is for testing - Samba's own MS-RPC server implementation, however many administrators - have written scripts around it to manage Windows NT clients from + rpcclient is a utility initially developed + to test MS-RPC functionality in Samba itself. It has undergone + several stages of development and stability. Many system administrators + have now written scripts around it to manage Windows NT clients from their UNIX workstation. @@ -51,23 +48,62 @@ OPTIONS + + server + NetBIOS name of Server to which to connect. + The server can be any SMB/CIFS server. The name is + resolved using the + name resolve order line from + smb.conf(5). + + + + + -A filenameThis option allows + you to specify a file from which to read the username and + password used in the connection. The format of the file is + + + + username = <value> + password = <value> + domain = <value> + + + Make certain that the permissions on the file restrict + access from unwanted users. + + + + + + -c 'command string' + execute semicolon separated commands (listed + below)) + + + + + -d debuglevel set the debuglevel. Debug level 0 is the lowest and 100 being the highest. This should be set to 100 if you are - planning on submitting a bug report to the Samba team - (see BUGS.txt). + planning on submitting a bug report to the Samba team (see BUGS.txt). + - + + + - -S server - NetBIOS name of Server to which you wish to - connect. The server can be any SMB/CIFS server. The name is - resolved using either the name resolve order - line or by using the -R option. + -h + Print a summary of command line options. + - + + + -l logbasename @@ -77,53 +113,33 @@ - - -n netbios nameNetBIOS name of the - local machine. This option is only needed if your Samba client - cannot find it automatically. Samba should use the uppercase - of the machine's hostname. - -N - tells rpcclient not to ask for a password. - rpcclient will prompt the user by default. - + instruct rpcclient not to ask + for a password. By default, rpcclient will prompt + for a password. See also the -U option. - + - -I destinationIP - The IP address of the server specified with - the -S option. Only needed when the server's NetBIOS name cannot - be resolved using WINS or broadcast and isn't found in the LMHOSTS - file. + -s smb.conf + Specifies the location of the all important + smb.conf file. + - -E - causes rpcclient to write - messages to stderr instead of stdout. - - - - - -U username[%pass] - Sets the SMB username or username and password. - If %pass is not specified, The user will be prompted. The client - will first check the USER environment variable, then the - $LOGNAME variable and if either exist, the - string is uppercased. Anything in these variables following a '%' - sign will be treated as the password. If these environmental - variables are not found, the username GUEST - is used. - - If the password is not included in these environment - variables (using the %pass syntax), rpcclient will look for - a $PASSWD environment variable from which - to read the password. + -U username[%password] + Sets the SMB username or username and password. + If %password is not specified, The user will be prompted. The + client will first check the USER environment variable, then the + LOGNAME variable and if either exist, the + string is uppercased. If these environmental variables are not + found, the username GUEST is used. + A third option is to use a credentials file which contains the plaintext of the username and password. This option is mainly provided for scripts where the admin doesn't @@ -132,30 +148,14 @@ on the file restrict access from unwanted users. See the -A for more details. - Be cautious about including passwords in scripts or in - the $PASSWD environment variable. Also, on + Be cautious about including passwords in scripts. Also, on many systems the command line of a running process may be seen - via the ps command to be safe always allow + via the ps command. To be safe always allow rpcclient to prompt for a password and type it in directly. - - -A filenameThis option allows - you to specify a file from which to read the username and - password used in the connection. The format of the file is - - - -username = <value> -password = <value> - - - - Make certain that the permissions on the file restrict - access from unwanted users. - @@ -168,55 +168,7 @@ password = <value> opposed to the Domain SAM). - - - -P - operate in promptless mode. Without this - mode (the default) rpcclient displays a - prompt of the form '[domain\username@host]$' - - - - - - -c 'command string' - execute semicolon separated commands (listed - below)) - - - - - -t terminalcode - This tells the Samba client how to interpret - the incoming filenames, in regards to character sets. The list - here is not complete. For a complete list see your local Samba - source. Some valid options are sjis, euc, jis7, jis8, junet - and hex. - - - - - -O socket options - These socket options are the same as in - smb.conf (under the socket options - section). - - - - - -s smb.conf - Specifies the location of the all important - smb.conf file. - - - - - - -i scope - Defines the NetBIOS scope. For more - information on NetBIOS scopes, see rfc1001 and rfc1002. NetBIOS - scopes are rarely used. - + @@ -224,78 +176,50 @@ password = <value> COMMANDS - SPOOLSS Commands + LSARPC + + lsaquery + lookupsids + lookupnames + enumtrusts + + + + + SAMR - spoolenum - Execute an EnumPrinters() - call. This lists the various installed and share printers. Refer - to the MS Platform SDK documentation for more details of the various - flags and calling options. - - spoolenumports level - - Executes an EnumPorts() call using the specified - info level. Currently only info level 1 and 2 are supported. - + queryuser + querygroup + queryusergroups + querygroupmem + + - spoolenumdata - Enumerate all - printer setting data stored on the server. On Windows NT clients, - these values are stored in the registry, while Samba servers - store them in the printers TDB. This command corresponds - to the MS Platform SDK GetPrinterData() function. - spooljobs printer - List the jobs - and status of a given printer. - This command corresponds to the MS Platform SDK EnumJobs() - function. - - spoolopen printer - - Execute an OpenPrinterEx() and ClosePrinter() RPC - against a given printer. - - spoolgetdata printer - - Retrieve the data for a given printer setting. See - the spoolenumdata command for more information. - This command corresponds to the GetPrinterData() MS Platform - SDK function. - - spoolgetprinter printer - - Retrieve the current printer information. This command - corresponds to the GetPrinter() MS Platform SDK function. - - - spoolgetprinterdriver - printer - Retrieve the printer driver information - (such as driver file, config file, dependent files, etc...) for - the given printer. This command corresponds to the GetPrinterDriver() - MS Platform SDK function. - - spoolgetprinterdriverdir - arch - Execute a GetPrinterDriverDirectory() - RPC to retreive the SMB share name and subdirectory for - storing printer driver files for a given architecture. Possible - values for arch are "Windows 4.0" - (for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows - Alpha_AXP", and "Windows NT R4000". - - spooladdprinterdriver - arch config - Execute an - AddPrinterDriver() RPC to install the printer driver information - on the server. Note that the driver files should already exist - in the directory returned by spoolgetprinterdriverdir. Possible - values for arch are the same as those for - the spooolgetprintedriverdir command. + + SPOOLSS + + + adddriver <arch> <config> + - Execute an AddPrinterDriver() RPC to install the printer driver + information on the server. Note that the driver files should + already exist in the directory returned by + getdriverdir. Possible values for + arch are the same as those for + the getdriverdir command. The config parameter is defined as follows: -Long Printer Name:\ -Driver File Name:\ -Data File Name:\ -Config File Name:\ -Help File Name:\ -Language Monitor Name:\ -Default Data Type:\ -Comma Separated list of Files + Long Printer Name:\ + Driver File Name:\ + Data File Name:\ + Config File Name:\ + Help File Name:\ + Language Monitor Name:\ + Default Data Type:\ + Comma Separated list of Files Any empty fields should be enter as the string "NULL". @@ -306,37 +230,123 @@ Comma Separated list of Files be "NULL". On a remote NT print server, the Print Monitor for a driver must already be installed prior to adding the driver or else the RPC will fail. + + - spooladdprinter printername - sharename drivername port - - Add a printer on the remote server. This printer + addprinter <printername> + <sharename> <drivername> <port> + - Add a printer on the remote server. This printer will be automatically shared. Be aware that the printer driver - must already be installed on the server (see addprinterdriver) - and the portmust be a valid port name. + must already be installed on the server (see adddriver) + and the portmust be a valid port name (see + enumports. + + enumdata - Enumerate all + printer setting data stored on the server. On Windows NT clients, + these values are stored in the registry, while Samba servers + store them in the printers TDB. This command corresponds + to the MS Platform SDK GetPrinterData() function (* This + command is currently unimplemented). + + + + enumjobs <printer> + - List the jobs and status of a given printer. + This command corresponds to the MS Platform SDK EnumJobs() + function (* This command is currently unimplemented). + + + + + enumports [level] + - Executes an EnumPorts() call using the specified + info level. Currently only info levels 1 and 2 are supported. + + + + + enumdrivers [level] + - Execute an EnumPrinterDrivers() call. This lists the various installed + printer drivers for all architectures. Refer to the MS Platform SDK + documentation for more details of the various flags and calling + options. Currently supported info levels are 1, 2, and 3. + + + + enumprinters [level] + - Execute an EnumPrinters() call. This lists the various installed + and share printers. Refer to the MS Platform SDK documentation for + more details of the various flags and calling options. Currently + supported info levels are 0, 1, and 2. + + + + + getdata <printername> + - Retrieve the data for a given printer setting. See + the enumdata command for more information. + This command corresponds to the GetPrinterData() MS Platform + SDK function (* This command is currently unimplemented). + + + + getdriver <printername> + - Retrieve the printer driver information (such as driver file, + config file, dependent files, etc...) for + the given printer. This command corresponds to the GetPrinterDriver() + MS Platform SDK function. Currently info level 1, 2, and 3 are supported. + + + + getdriverdir <arch> + - Execute a GetPrinterDriverDirectory() + RPC to retreive the SMB share name and subdirectory for + storing printer driver files for a given architecture. Possible + values for arch are "Windows 4.0" + (for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows + Alpha_AXP", and "Windows NT R4000". + + + + getprinter <printername> + - Retrieve the current printer information. This command + corresponds to the GetPrinter() MS Platform SDK function. + + + + + openprinter <printername> + - Execute an OpenPrinterEx() and ClosePrinter() RPC + against a given printer. + + + setdriver <printername> <drivername> + - Execute a SetPrinter() command to update the printer driver associated + with an installed printer. The printer driver must already be correctly + installed on the print server. + + See also the enumprinters and + enumdrivers commands for obtaining a list of + of installed printers and drivers. + - General Commands + GENERAL OPTIONS - set - Set miscellaneous - rpcclient command line options during a - running session. - - use - Connect to a rmeote SMB - server. rpcclient has the ability to - maintain connections to multiple server simulaneously. + debuglevel - Set the current debug level + used to log information. - help - Print a listing of all + help (?) - Print a listing of all known commands or extended help on a particular command. - quit - Exit rpcclient - - + quit (exit) - Exit rpcclient + . @@ -361,7 +371,7 @@ Comma Separated list of Files The development of Samba's implementation is also a bit rough, and as more of the services are understood, it can even result in - versions of smbd(8) and rpcclient + versions of smbd(8) and rpcclient(1) that are incompatible for some commands or services. Additionally, the developers are sending reports to Microsoft, and problems found or reported to Microsoft are fixed in Service Packs, which may @@ -372,8 +382,8 @@ Comma Separated list of Files VERSION - This man page is correct for version 2.2 of - the Samba suite. + This man page is correct for version 2.2 of the Samba + suite. @@ -384,9 +394,10 @@ Comma Separated list of Files by the Samba Team as an Open Source project similar to the way the Linux kernel is developed. - The original rpcclient man page was written by Matthew Geddes, - Luke Kenneth Casson, and Gerald Carter. The conversion to - DocBook for Samba 2.2 was done by Gerald Carter + The original rpcclient man page was written by Matthew + Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter. + The conversion to DocBook for Samba 2.2 was done by Gerald + Carter. diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index a00ca178db..04b464e5ef 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -79,7 +79,7 @@ to the user of the service. Some housekeeping options are also specifiable. - Sections are either filespace services (used by the + Sections are either file share services (used by the client as an extension of their native file systems) or printable services (used by the client to access print services on the host running the server). @@ -140,7 +140,7 @@ parameters in this section apply to the server as a whole, or are defaults for sections which do not specifically define certain items. See the notes - under paraMETERS for more information. + under PARAMETERS for more information. @@ -297,7 +297,7 @@ - paraMETRS + PARAMETERS parameters define the specific attributes of sections. @@ -380,7 +380,7 @@ %h - the internet hostname that Samba is running + the Internet hostname that Samba is running on. @@ -399,7 +399,7 @@ %M - the internet name of the client machine. + the Internet name of the client machine. @@ -532,10 +532,10 @@ NOTE ABOUT USERNAME/PASSWORD VALIDATION There are a number of ways in which a user can connect - to a service. The server follows the following steps in determining + to a service. The server uses the following steps in determining if it will allow a connection to a specified service. If all the - steps fail then the connection request is rejected. If one of the - steps pass then the following steps are not checked. + steps fail, then the connection request is rejected. However, if one of the + steps succeeds, then the following steps are not checked. If the service is marked "guest only = yes" then steps 1 to 5 are skipped. @@ -586,157 +586,164 @@ each parameter for details. Note that some are synonyms. - add user script - allow trusted domains - announce as - announce version - auto services - bind interfaces only - browse list - change notify timeout - character set - client code page - coding system - config file - deadtime - debug hires timestamp - debug pid - debug timestamp - debug uid - debug level - default - default service - delete user script - dfree command - dns proxy - domain admin group - domain admin users - domain groups - domain guest group - domain guest users - domain logons - domain master - encrypt passwords - getwd cache - hide local users - homedir map - hosts equiv - interfaces - keepalive - kernel oplocks - lm announce - lm interval - load printers - local master - lock dir - lock directory - log file - log level - logon drive - logon home - logon path - logon script - lpq cache time - machine password timeout - mangled stack - map to guest - max disk size - max log size - max mux - max open files - max packet - max ttl - max wins ttl - max xmit - message command - min passwd length - min password length - min wins ttl - name resolve order - netbios aliases - netbios name - netbios scope - nis homedir - nt acl support - nt pipe support - nt smb support - null passwords - ole locking compatibility - oplock break wait time - os level - panic action - passwd chat - passwd chat debug - passwd program - password level - password server - prefered master - preferred master - preload - printcap - printcap name - printer driver file - private dir - protocol - read bmpx - read prediction - read raw - read size - remote announce - remote browse sync - restrict anonymous - root - root dir - root directory - security - server string - shared mem size - smb passwd file - smbrun - socket address - socket options - source environment - ssl - ssl CA certDir - ssl CA certFile - ssl ciphers - ssl client cert - ssl client key - ssl compatibility - ssl hosts - ssl hosts resign - ssl require clientcert - ssl require servercert - ssl server cert - ssl server key - ssl version - stat cache - stat cache size - strip dot - syslog - syslog only - template homedir - template shell - time offset - time server - timestamp logs - unix password sync - unix realname - update encrypted - use rhosts - username level - username map - utmp directory - valid chars - winbind cache time - winbind gid - winbind uid - wins hook - wins proxy - wins server - wins support - workgroup - write raw + add user script + addprinter command + allow trusted domains + announce as + announce version + auto services + bind interfaces only + browse list + change notify timeout + character set + client code page + code page directory + coding system + config file + deadtime + debug hires timestamp + debug pid + debug timestamp + debug uid + debuglevel + default + default service + delete user script + deleteprinter command + dfree command + dns proxy + domain admin group + domain admin users + domain groups + domain guest group + domain guest users + domain logons + domain master + encrypt passwords + enhanced browsing + enumports command + getwd cache + hide local users + homedir map + host msdfs + hosts equiv + interfaces + keepalive + kernel oplocks + lanman auth + lm announce + lm interval + load printers + local master + lock dir + lock directory + log file + log level + logon drive + logon home + logon path + logon script + lpq cache time + machine password timeout + mangled stack + map to guest + max disk size + max log size + max mux + max open files + max protocol + max smbd processes + max ttl + max wins ttl + max xmit + message command + min passwd length + min password length + min protocol + min wins ttl + name resolve order + netbios aliases + netbios name + netbios scope + nis homedir + nt acl support + nt pipe support + nt smb support + null passwords + oplock break wait time + os level + os2 driver map + panic action + passwd chat + passwd chat debug + passwd program + password level + password server + prefered master + preferred master + preload + printcap + printcap name + printer driver file + protocol + read bmpx + read raw + read size + remote announce + remote browse sync + restrict anonymous + root + root dir + root directory + security + server string + show add printer wizard + smb passwd file + socket address + socket options + source environment + ssl + ssl CA certDir + ssl CA certFile + ssl ciphers + ssl client cert + ssl client key + ssl compatibility + ssl hosts + ssl hosts resign + ssl require clientcert + ssl require servercert + ssl server cert + ssl server key + ssl version + stat cache + stat cache size + strip dot + syslog + syslog only + template homedir + template shell + time offset + time server + timestamp logs + total print jobs + unix password sync + update encrypted + use rhosts + username level + username map + utmp directory + valid chars + winbind cache time + winbind gid + winbind separator + winbind uid + wins hook + wins proxy + wins server + wins support + workgroup + write raw @@ -744,123 +751,127 @@ COMPLETE LIST OF SERVICE PARAMETERS - Here is a list of all service parameters. See the section of + Here is a list of all service parameters. See the section on each parameter for details. Note that some are synonyms. - admin users - allow hosts - alternate permissions - available - blocking locks - browsable - browseable - case sensitive - casesignames - comment - copy - create mask - create mode - default case - delete readonly - delete veto files - deny hosts - directory - directory mask - directory mode - directory security mask - dont descend - dos filetime resolution - dos filetimes - exec - fake directory create times - fake oplocks - follow symlinks - force create mode - force directory mode - force directory security mode - force group - force security mode - force user - fstype - group - guest account - guest ok - guest only - hide dot files - hide files - hosts allow - hosts deny - include - inherit permissions - invalid users - level2 oplocks - locking - lppause command - lpq command - lpresume command - lprm command - magic output - magic script - mangle case - mangle locks - mangled map - mangled names - mangling char - map archive - map hidden - map system - max connections - min print space - only guest - only user - oplock contention limit - oplocks - path - postexec - postscript - preexec - preexec close - preserve case - print command - print ok - printable - printer - printer admin - printer driver - printer driver location - printer name - printing - public - queuepause command - queueresume command - read list - read only - root postexec - root preexec - root preexec close - security mask - set directory - share modes - short preserve case - status - strict locking - strict sync - sync always - user - username - users - utmp - valid users - veto files - veto oplock files - volume - wide links - writable - write cache size - write list - write ok - writeable + admin users + allow hosts + available + blocking locks + browsable + browseable + case sensitive + casesignames + comment + copy + create mask + create mode + default case + delete readonly + delete veto files + deny hosts + directory + directory mask + directory mode + directory security mask + dont descend + dos filemode + dos filetime resolution + dos filetimes + exec + fake directory create times + fake oplocks + follow symlinks + force create mode + force directory mode + force directory security mode + force group + force security mode + force user + fstype + group + guest account + guest ok + guest only + hide dot files + hide files + hosts allow + hosts deny + include + inherit permissions + invalid users + level2 oplocks + locking + lppause command + lpq command + lpresume command + lprm command + magic output + magic script + mangle case + mangled map + mangled names + mangling char + map archive + map hidden + map system + max connections + max print jobs + min print space + msdfs root + only guest + only user + oplock contention limit + oplocks + path + posix locking + postexec + postscript + preexec + preexec close + preserve case + print command + print ok + printable + printer + printer admin + printer driver + printer driver location + printer name + printing + public + queuepause command + queueresume command + read list + read only + root postexec + root preexec + root preexec close + security mask + set directory + share modes + short preserve case + status + strict locking + strict sync + sync always + user + username + users + utmp + valid users + veto files + veto oplock files + vfs object + vfs options + volume + wide links + writable + write cache size + write list + write ok + writeable @@ -874,7 +885,7 @@ add user script (G) This is the full pathname to a script that will be run AS ROOT by smbd(8) - under special circumstances decribed below. + under special circumstances described below. Normally, a Samba server requires that UNIX users are created for all users accessing files on this server. For sites @@ -895,23 +906,23 @@ at login (session setup in the SMB protocol) time, smbd contacts the password server and attempts to authenticate the given user with the given password. If the - authentication succeeds then smbd + authentication succeeds then smbd attempts to find a UNIX user in the UNIX password database to map the Windows user into. If this lookup fails, and add user script - is set then smbd will + is set then smbd will call the specified script AS ROOT, expanding any %u argument to be the user name to create. - If this script successfully creates the user then smbd will continue on as though the UNIX user + If this script successfully creates the user then smbd + will continue on as though the UNIX user already existed. In this way, UNIX users are dynamically created to match existing Windows NT accounts. - See also - security, - password server, delete user - script. + See also + security, + password server, + delete user + script. Default: add user script = <empty string> @@ -920,7 +931,64 @@ %u + + + + + addprinter command (G) + 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 + addprinter command 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 smb.conf file in order that it can be + shared by smbd(8) + . + + The addprinter command is + automatically invoked with the following parameter (in + order: + + + printer name + share name + port name + driver name + location + Windows 9x driver location + + + + 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. + Once the addprinter command has + been executed, smbd will reparse the + smb.conf to determine if the share defined by the APW + exists. If the sharename is still invalid, then smbd + will return an ACCESS_DENIED error to the client. + + See also + deleteprinter command, printing, + show add + printer wizard + + Default: none + Example: addprinter command = /usr/bin/addprinter + + + @@ -943,17 +1011,17 @@ allow hosts (S) - Synonym for - hosts allow. + Synonym for + hosts allow. allow trusted domains (G) - This option only takes effect when the security option is set to - server or domain. + This option only takes effect when the security option is set to + server or domain. If it is set to no, then attempts to connect to a resource from a domain or workgroup other than the one which smbd is running in will fail, even if that domain is trusted by the remote server @@ -981,7 +1049,7 @@ nmbd will announce itself as, to a network neighborhood browse list. By default this is set to Windows NT. The valid options - are : "NT" (which is a synonym for "NT Server"), "NT Server", + are : "NT Server" (which can also be written as "NT"), "NT Workstation", "Win95" or "WfW" meaning Windows NT Server, Windows NT Workstation, Windows 95 and Windows for Workgroups respectively. Do not change this parameter unless you have a @@ -998,7 +1066,7 @@ - annouce version (G) + annouce version (G) This specifies the major and minor version numbers that nmbd will use when announcing itself as a server. The default is 4.2. Do not change this parameter unless you have a specific @@ -1014,18 +1082,8 @@ auto services (G) - This is a list of services that you want to be - automatically added to the browse lists. This is most useful - for homes and printers services that would otherwise not be - visible. - - Note that if you just want all printers in your - printcap file loaded then the - load printers option is easier. - - Default: no auto services - - Example: auto services = fred lp colorlp + This is a synonym for the + preload. @@ -1174,7 +1232,10 @@ case sensitive (S) See the discussion in the section NAME MANGLING. + linkend="NAMEMANGLINGSECT">NAME MANGLING. + + Default: case sensitive = no + @@ -1271,7 +1332,7 @@ and type the command chcp. This will output the code page. The default for USA MS-DOS, Windows 95, and Windows NT releases is code page 437. The default for western - european releases of the above operating systems is code page 850. + European releases of the above operating systems is code page 850. This parameter tells smbd(8) which of the codepage.XXX @@ -1317,13 +1378,35 @@ to 850. See also : valid - chars + chars, + code page directory Default: client code page = 850 Example: client code page = 936 + + + + + code page directory (G) + Define the location of the various client code page + files. + + See also client + code page + + Default: code page directory = ${prefix}/lib/codepages + + Example: code page directory = /usr/share/samba/codepages + + + + + + + codingsystem (G) @@ -1349,8 +1432,7 @@ JUNET, JUBB, JUBH, JU@B, JU@J, JU@H - Convert from incoming Shift-JIS to JUNET code with different shift-in, shift out codes. - - + EUC - Convert an incoming Shift-JIS character to EUC code. @@ -1363,6 +1445,9 @@ the Columbia AppleTalk Program (CAP), i.e. :AB. This is used for compatibility between Samba and CAP. + + Default: coding system = <empty value> + @@ -1421,7 +1506,7 @@ copied must occur earlier in the configuration file than the service doing the copying. - Default: none + Default: no value Example: copy = otherservice @@ -1515,19 +1600,6 @@ - - - - debug timestamp (G) - Samba 2.2 debug log messages are timestamped - by default. If you are running at a high - debug level these timestamps - can be distracting. This boolean parameter allows timestamping - to be turned off. - - Default: debug timestamp = yes - - @@ -1545,6 +1617,18 @@ + + debug timestamp (G) + Samba 2.2 debug log messages are timestamped + by default. If you are running at a high + debug level these timestamps + can be distracting. This boolean parameter allows timestamping + to be turned off. + + Default: debug timestamp = yes + + + debug uid (G) @@ -1563,7 +1647,7 @@ - debug level (G) + debuglevel (G) The value of the parameter (an integer) allows the debug level (logging level) to be specified in the smb.conf file. This is to give greater @@ -1588,8 +1672,10 @@ default case (S) See the section on - NAME MANGLING". Also note the + NAME MANGLING. Also note the short preserve case" parameter. + + Default: default case = lower @@ -1622,15 +1708,31 @@ Example: - - default service = pub + +[global] + default service = pub - [pub] - path = /%S - +[pub] + path = /%S + + + + + delete readonly (S) + This parameter allows readonly files to be deleted. + This is not normal DOS semantics, but is allowed by UNIX. + + This option may be useful for running applications such + as rcs, where UNIX file ownership prevents changing file + permissions, and DOS semantics prevent deletion of a read only file. + + Default: delete readonly = no + + + @@ -1638,7 +1740,7 @@ This is the full pathname to a script that will be run AS ROOT by smbd(8) under special circumstances - decribed below. + described below. Normally, a Samba server requires that UNIX users are created for all users accessing files on this server. For sites @@ -1694,20 +1796,48 @@ + - delete readonly (S) - This parameter allows readonly files to be deleted. - This is not normal DOS semantics, but is allowed by UNIX. + deleteprinter command (G) + 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. - This option may be useful for running applications such - as rcs, where UNIX file ownership prevents changing file - permissions, and DOS semantics prevent deletion of a read only file. - - Default: delete readonly = no + For a Samba host this means that the printer must be + physically deleted from underlying printing system. The + deleteprinter command defines a script to be run which + will perform the necessary operations for removing the printer + from the print system and from smb.conf. + + + The deleteprinter command is + automatically called with only one parameter: + "printer name". + + + Once the deleteprinter command has + been executed, smbd will reparse the + smb.conf to associated printer no longer exists. + If the sharename is still valid, then smbd + will return an ACCESS_DENIED error to the client. + + See also + addprinter command, printing, + show add + printer wizard + + Default: none + Example: deleteprinter command = /usr/bin/removeprinter + + + + delete veto files (S) This option is used when Samba is attempting to @@ -1736,11 +1866,13 @@ + deny hosts (S) Synonym for hosts deny. + @@ -1761,7 +1893,7 @@ The external program will be passed a single parameter indicating a directory in the filesystem being queried. This will typically consist of the string ./. The script should return two - integers in ascii. The first should be the total disk space in blocks, + integers in ASCII. The first should be the total disk space in blocks, and the second should be the number of available blocks. An optional third return value can give the block size in bytes. The default blocksize is 1024 bytes. @@ -2026,12 +2158,19 @@ the special name for a workgroup before a Windows NT PDC is able to do so then cross subnet browsing will behave strangely and may fail. + + If domain logons = yes + , then the default behavior is to enable the domain + master parameter. If domain logons is + not enabled (the default setting), then neither will domain + master be enabled by default. - Default: domain master = no + Default: domain master = auto + dont descend (S) There are certain directories on some systems @@ -2051,6 +2190,25 @@ + + + + dos filemode (S) + The default behavior in Samba is to provide + UNIX-like behavor where only the owner of a file/directory is + able to change the permissions on it. However, this behavior + is often confusing to DOS/Windows users. Enabling this parameter + allows a user who has write access to the file (by whatever + means) to modify the permissions on it. Note that a user + belonging to the group owning the file will not be allowed to + change permissions if the group is only granted read access. + Ownership of the file/directory is not changed, only the permissions + are modified. + + Default: dos filemode = no + + + @@ -2116,8 +2274,57 @@ Default: encrypt passwords = no + + + + enhanced browsing (G) + This option enables a couple of enhancements to + cross-subnet browse propogation that have been added in Samba + but which are not standard in Microsoft implementations. + These enhancements are currently only available in + the HEAD Samba CVS tree (not Samba 2.2.x). + + The first enhancement to browse propogation consists of a regular + wildcard query to a Samba WINS server for all Domain Master Browsers, + followed by a browse synchronisation with each of the returned + DMBs. The second enhancement consists of a regular randomised browse + synchronisation with all currently known DMBs. + + You may wish to disable this option if you have a problem with empty + workgroups not disappearing from browse lists. Due to the restrictions + of the browse protocols these enhancements can cause a empty workgroup + to stay around forever which can be annoying. + + In general you should leave this option enabled as it makes + cross-subnet browse propogation much more reliable. + + Default: enhanced browsing = yes + + + + + + enumports command (G) + The concept of a "port" is fairly foreign + to UNIX hosts. Under Windows NT/2000 print servers, a port + is associated with a port monitor and generally takes the form of + a local port (i.e. LPT1:, COM1:, FILE:) or a remote port + (i.e. LPD Port Monitor, etc...). By default, Samba has only one + port defined--"Samba Printer Port". Under + Windows NT/2000, all printers must have a valid port name. + If you wish to have a list of ports displayed (smbd + does not use a port name for anything) other than + the default "Samba Printer Port", you + can define enumports command to point to + a program which should generate a list of ports, one per line, + to standard output. This listing will then be used in response + to the level 1 and 2 EnumPorts() RPC. - + Default: no enumports command + Example: enumports command = /usr/bin/listports + + + exec (S) @@ -2147,9 +2354,11 @@ However, Unix time semantics mean that the create time reported by Samba will be updated whenever a file is created or - deleted in the directory. NMAKE therefore finds all object files - in the object directory bar the last one built are out of date - compared to the directory and rebuilds them. Enabling this option + or deleted in the directory. NMAKE finds all object files in + the object directory. The timestamp of the last one built is then + compared to the timestamp of the object dircetory. If the + directory's timestamp if newer, then all object files + will be rebuilt. Enabling this option ensures directories always predate their contents and an NMAKE build will proceed as expected. @@ -2215,7 +2424,7 @@ force create mode (S) This parameter specifies a set of UNIX mode bit permissions that will always be set on a - file by Samba. This is done by bitwise 'OR'ing these bits onto + file created by Samba. This is done by bitwise 'OR'ing these bits onto the mode bits of a file that is being created or having its permissions changed. The default for this parameter is (in octal) 000. The modes in this parameter are bitwise 'OR'ed onto the file @@ -2269,7 +2478,8 @@ - force directory security mode (S) + force directory + security mode (S) This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a directory using the native NT security dialog box. @@ -2284,7 +2494,7 @@ value as the force directory mode parameter. To allow a user to modify all the user/group/world permissions on a - directory, with restrictions set this parameter to 000. + directory without restrictions, set this parameter to 000. Note that users who can access the Samba server through other means can easily bypass this restriction, @@ -2395,9 +2605,7 @@ Thus clients still need to connect as a valid user and supply a valid password. Once connected, all file operations will be performed as the "forced user", no matter what username the client connected - as. - - This can be very useful. + as. This can be very useful. In Samba 2.0.5 and above this parameter also causes the primary group of the forced user to be used as the primary group @@ -2439,7 +2647,7 @@ when the wide links parameter is set to False. - Default: getwd cache = No + Default: getwd cache = yes @@ -2458,7 +2666,7 @@ This is a username which will be used for access to services which are specified as guest ok (see below). Whatever privileges this - ser has will be available to any client connecting to the guest service. + user has will be available to any client connecting to the guest service. Typically this user will exist in the password file, but will not have a valid login. The user account "ftp" is often a good choice for this parameter. If a username is specified in a given service, @@ -2482,7 +2690,7 @@ guest ok (S) If this parameter is yes for - a service, then no password is equired to connect to the service. + a service, then no password is required to connect to the service. Privileges will be those of the guest account. @@ -2499,7 +2707,7 @@ guest only (S) If this parameter is yes for a service, then only guest connections to the service are permitted. - This parameter will have no affect if + This parameter will have no effect if guest ok is not set for the service. See the section below on @@ -2593,12 +2801,33 @@ , domain logons . - Default: homedir map = auto.home + Default: homedir map = <empty string> Example: homedir map = amd.homedir + + + + + host msdfs (G) + This boolean parameter is only available + if Samba has been configured and compiled with the + --with-msdfs option. If set to yes, + Samba will act as a Dfs server, and allow Dfs-aware clients + to browse Dfs trees hosted on the server. + + See also the + msdfs root share level parameter. For + more information on setting up a Dfs tree on Samba, + refer to msdfs_setup.html. + + + Default: host msdfs = no + + + hosts allow (S) @@ -2795,11 +3024,11 @@ The "mask" parameters can either be a bit length (such as 24 for a C class network) or a full netmask in dotted - decmal form. + decimal form. The "IP" parameters above can either be a full dotted decimal IP address or a hostname which will be looked up via - the OSes normal hostname resolution mechanisms. + the OS's normal hostname resolution mechanisms. For example, the following line: @@ -2811,7 +3040,11 @@ The netmasks of the latter two interfaces would be set to 255.255.255.0. See also bind - interfaces only. + interfaces only. + + Default: all active interfaces except 127.0.0.1 + that are broadcast capable + @@ -2865,8 +3098,8 @@ linkend="SOCKETOPTIONS">socket options). Basically you should only use this option if you strike difficulties. - Default: keepalive = 0 - Example: keepalive = 60 + Default: keepalive = 300 + Example: keepalive = 600 @@ -2874,7 +3107,7 @@ kernel oplocks (G) - For UNIXs that support kernel based For UNIXes that support kernel based oplocks (currently only IRIX and the Linux 2.4 kernel), this parameter allows the use of them to be turned on or off. @@ -2898,6 +3131,22 @@ + + + + + lanman auth (G) + This parameter determines whether or not smbd will + attempt to authentication users using the LANMAN password hash. + If disabled, only clients which support NT password hashes (e.g. Windows + NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS + network client) will be able to connect to the Samba host. + + Default : lanman auth = yes + + + + @@ -2912,7 +3161,7 @@ exclusive oplocks). This allows all openers of the file that support level2 oplocks to cache the file for read-ahead only (ie. they may not cache writes or lock requests) and increases performance - for many acesses of files that are not commonly written (such as + for many accesses of files that are not commonly written (such as application .EXE files). Once one of the clients which have a read-only oplock @@ -2921,8 +3170,7 @@ delete any read-ahead caches. It is recommended that this parameter be turned on - to speed access to shared executables (and also to test - the code :-). + to speed access to shared executables. For more discussions on level2 oplocks see the CIFS spec. @@ -2937,12 +3185,14 @@ and kernel oplocks parameters. - Default: level2 oplocks = False + Default: level2 oplocks = yes + + lm announce (G) This parameter determines if @@ -2964,7 +3214,7 @@ . Default: lm announce = auto - Example: lm announce = true + Example: lm announce = yes @@ -3039,8 +3289,8 @@ max connections option. - Default: lock directory = /tmp/samba - Example: lock directory = /usr/local/samba/var/locks + Default: lock directory = ${prefix}/var/locks + Example: lock directory = /var/run/samba/locks @@ -3052,9 +3302,9 @@ performed by the server in response to lock requests from the client. - If locking = no, all lock and unlock requests - will appear to succeed and all lock queries will indicate that the - queried lock is clear. + If locking = no, all lock and unlock + requests will appear to succeed and all lock queries will report + that the file in question is available for locking. If locking = yes, real locking will be performed by the server. @@ -3076,7 +3326,7 @@ log file (G) - This options allows you to override the name + This option allows you to override the name of the Samba log file (also known as the debug file). This option takes the standard substitutions, allowing @@ -3132,7 +3382,7 @@ that roaming profiles are stored in a subdirectory of the user's home directory. This is done in the following way: - logon home = \\%L\%U\profile + logon home = \\%N\%U\profile This tells Samba to return the above string, with substitutions made when a client requests the info, generally @@ -3345,8 +3595,8 @@ command. Note that it is good practice to include the absolute path - in the lpq command as the PATH may not be - available to the server. + in the lpq command as the $PATH + may not be available to the server. See also the printing parameter. @@ -3354,7 +3604,7 @@ Default: depends on the setting of printing - Example: lpq command = /usr/bin/lpq %p + Example: lpq command = /usr/bin/lpq -P%p @@ -3478,14 +3728,15 @@ executed on behalf of the connected user. Scripts executed in this way will be deleted upon - completion, permissions permitting. + completion assuming that the user has the appripriate level + of priviledge and the ile permissions allow the deletion. If the script generates output, output will be sent to the file specified by the magic output parameter (see above). Note that some shells are unable to interpret scripts - containing carriage-return-linefeed instead of linefeed as + containing CR/LF instead of CR as the end-of-line marker. Magic scripts must be executable as is on the host, which for some hosts and some shells will require filtering at the DOS end. @@ -3504,6 +3755,8 @@ mangle case (S) See the section on NAME MANGLING + + Default: mangle case = no @@ -3525,7 +3778,7 @@ One very useful case is to remove the annoying ;1 off the ends of filenames on some CDROMS (only visible - under some UNIXs). To do this use a map of (*;1 *;). + under some UNIXes). To do this use a map of (*;1 *;). Default: no mangled map Example: mangled map = (*;1 *;) @@ -3593,21 +3846,6 @@ - - - mangling char (S) - This controls what character is used as - the magic character in name mangling. The default is a '~' - but this may interfere with some software. Use this option to set - it to whatever you prefer. - - Default: mangling char = ~ - Example: mangling char = ^ - - - - mangled stack (G) @@ -3635,6 +3873,24 @@ + + + mangling char (S) + This controls what character is used as + the magic character in name mangling. The default is a '~' + but this may interfere with some software. Use this option to set + it to whatever you prefer. + + Default: mangling char = ~ + Example: mangling char = ^ + + + + + + + map archive (S) This controls whether the DOS archive attribute @@ -3713,7 +3969,7 @@ with an invalid password are treated as a guest login and mapped into the guest account. Note that this can cause problems as it means that any user incorrectly typing - their password will be silently logged on as a "guest" - and + their password will be silently logged on as "guest" - and will not know the reason they cannot access files they think they should - there will have been no message given to them that they got their password wrong. Helpdesk services will @@ -3833,6 +4089,80 @@ + + max print jobs (S) + This parameter limits the maximum number of + jobs allowable in a Samba printer queue at any given moment. + If this number is exceeded, + smbd(8) will remote "Out of Space" to the client. + See all total + print jobs. + + + Default: max print jobs = 1000 + Example: max print jobs = 5000 + + + + + + max protocol (G) + The value of the parameter (a string) is the highest + protocol level that will be supported by the server. + + Possible values are : + + CORE: Earliest version. No + concept of user names. + + COREPLUS: Slight improvements on + CORE for efficiency. + + LANMAN1: First + modern version of the protocol. Long filename + support. + + LANMAN2: Updates to Lanman1 protocol. + + + NT1: Current up to date version of + the protocol. Used by Windows NT. Known as CIFS. + + + Normally this option should not be set as the automatic + negotiation phase in the SMB protocol takes care of choosing + the appropriate protocol. + + See also min + protocol + + Default: max protocol = NT1 + Example: max protocol = LANMAN1 + + + + + + + max smbd processes (G) + This parameter limits the maximum number of + smbd(8) + processes concurrently running on a system and is intended + as a stop gap to prevent degrading service to clients in the event + that the server has insufficient resources to handle more than this + number of connections. Remember that under normal operating + conditions, each user will have an smbd associated with him or her + to handle connections to all shares from a given host. + + + Default: max smbd processes = 0 ## no limit + Example: max smbd processes = 1000 + + + + + + max ttl (G) This option tells nmbd(8) @@ -3948,22 +4278,6 @@ - - min print space (S) - This sets the minimum amount of free disk - space that must be available before a user will be able to spool - a print job. It is specified in kilobytes. The default is 0, which - means a user can always spool a print job. - - See also the printing - parameter. - - Default: min print space = 0 - Example: min print space = 2000 - - - - min passwd length (G) @@ -3977,7 +4291,7 @@ min password length (G) This option sets the minimum length in characters - of a plaintext password than smbd will accept when performing + of a plaintext password that smbd will accept when performing UNIX password changing. See also unix @@ -3991,6 +4305,49 @@ + + + min print space (S) + This sets the minimum amount of free disk + space that must be available before a user will be able to spool + a print job. It is specified in kilobytes. The default is 0, which + means a user can always spool a print job. + + See also the printing + parameter. + + Default: min print space = 0 + Example: min print space = 2000 + + + + + + + + min protocol (G) + The value of the parameter (a string) is the + lowest SMB protocol dialect than Samba will support. Please refer + to the max protocol + parameter for a list of valid protocol names and a brief description + of each. You may also wish to refer to the C source code in + source/smbd/negprot.c for a listing of known protocol + dialects supported by clients. + + If you are viewing this parameter as a security measure, you should + also refer to the lanman + auth parameter. Otherwise, you should never need + to change this parameter. + + Default : min protocol = CORE + Example : min protocol = NT1 # disable DOS + clients + + + + + + min wins ttl (G) This option tells nmbd(8) @@ -4005,13 +4362,35 @@ - + + + msdfs root (S) + This boolean parameter is only available if + Samba is configured and compiled with the + --with-msdfs option. If set to yes>, + Samba treats the share as a Dfs root and allows clients to browse + the distributed file system tree rooted at the share directory. + Dfs links are specified in the share directory by symbolic + links of the form msdfs:serverA\shareA,serverB\shareB + and so on. For more information on setting up a Dfs tree + on Samba, refer to msdfs_setup.html + . + + See also host msdfs + + + Default: msdfs root = no + + + + + name resolve order (G) This option is used by the programs in the Samba - suite to determine what naming services and in what order to resolve - host names to IP addresses. The option takes a space separated - string of different name resolution options. + suite to determine what naming services to use and in what order + to resolve host names to IP addresses. The option takes a space + separated string of name resolution options. The options are :"lmhosts", "host", "wins" and "bcast". They cause names to be resolved as follows : @@ -4179,8 +4558,10 @@ exactly the same SMB calls that versions prior to Samba 2.0 offered. This information may be of use if any users are having problems with NT SMB support. + + You should not need to ever disable this parameter. - Default: nt support = yes + Default: nt smb support = yes @@ -4198,38 +4579,17 @@ - - ole locking compatibility (G) - 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: ole locking compatibility = yes - - - - - - - only guest (S) - A synonym for - guest only. - - - - only user (S) This is a boolean option that controls whether connections with usernames not in the user - list will be allowed. By default this option is disabled so a client - can supply a username to be used by the server. + list will be allowed. By default this option is disabled so that a + client can supply a username to be used by the server. Enabling + this parameter will force the server to only user the login + names from the user list and is only really + useful in shave level + security. Note that this also means Samba won't try to deduce usernames from the service name. This can be annoying for @@ -4247,31 +4607,29 @@ + + - oplocks (S) - This boolean option tells smbd whether to - issue oplocks (opportunistic locks) to file open requests on this - share. The oplock code can dramatically (approx. 30% or more) improve - the speed of access to files on Samba servers. It allows the clients - to aggressively cache files ocally and you may want to disable this - option for unreliable network environments (it is turned on by - default in Windows NT Servers). For more information see the file - Speed.txt in the Samba docs/ - directory. + ole locking compatibility (G) + 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. - Oplocks may be selectively turned off on certain files on - a per share basis. See the - veto oplock files parameter. On some systems - oplocks are recognized by the underlying operating system. This - allows data synchronization between all access to oplocked files, - whether it be via Samba or NFS or a local UNIX process. See the - kernel oplocks parameter for details. + Default: ole locking compatibility = yes + + - See also the kernel - oplocks and - level2 oplocks parameters. - Default: oplocks = yes + + + only guest (S) + A synonym for + guest only. @@ -4282,7 +4640,7 @@ This is a tuning parameter added due to bugs in both Windows 9x and WinNT. If Samba responds to a client too quickly when that client issues an SMB that can cause an oplock - break request, then the client redirector can fail and not respond + break request, then the network client can fail and not respond to the break request. This tuning parameter (which is set in milliseconds) is the amount of time Samba will wait before sending an oplock break request to such (broken) clients. @@ -4290,7 +4648,7 @@ DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA OPLOCK CODE. - Default: oplock break wait time = 10 + Default: oplock break wait time = 0 @@ -4316,16 +4674,54 @@ + + + + + oplocks (S) + This boolean option tells smbd whether to + issue oplocks (opportunistic locks) to file open requests on this + share. The oplock code can dramatically (approx. 30% or more) improve + the speed of access to files on Samba servers. It allows the clients + to aggressively cache files locally and you may want to disable this + option for unreliable network environments (it is turned on by + default in Windows NT Servers). For more information see the file + Speed.txt in the Samba docs/ + directory. + + Oplocks may be selectively turned off on certain files with a + share. See the + veto oplock files parameter. On some systems + oplocks are recognized by the underlying operating system. This + allows data synchronization between all access to oplocked files, + whether it be via Samba or NFS or a local UNIX process. See the + kernel oplocks parameter for details. + + See also the kernel + oplocks and + level2 oplocks parameters. + + Default: oplocks = yes + + + + + os level (G) This integer value controls what level Samba advertises itself as for browse elections. The value of this parameter determines whether nmbd(8) has a chance of becoming a local master browser for the - WORKGROUP in the local broadcast area. The default is - zero, which means nmbd will lose elections to - Windows machines. See BROWSING.txt in the - Samba docs/ directory for details. + WORKGROUP in the local broadcast area. + + Note :By default, Samba will win + a local master browsing election over all Microsoft operating + systems except a Windows NT 4.0/2000 Domain Controller. This + means that a misconfigured Samba host can effectively isolate + a subnet for browsing purposes. See BROWSING.txt + in the Samba docs/ directory + for details. Default: os level = 20 Example: os level = 65 @@ -4334,6 +4730,32 @@ + + os2 driver map (G) + The parameter is used to define the absolute + path to a file containing a mapping of Windows NT printer driver + names to OS/2 printer driver names. The format is: + + <nt driver name> = <os2 driver + name>.<device name> + + For example, a valid entry using the HP LaserJet 5 + printer driver woudl appear as HP LaserJet 5L = LASERJET.HP + LaserJet 5L. + + The need for the file is due to the printer driver namespace + problem described in the Samba + Printing HOWTO. For more details on OS/2 clients, please + refer to the OS2-Client-HOWTO + containing in the Samba documentation. + + Default: os2 driver map = <empty string> + + + + + + panic action (G) This is a Samba developer option that allows a @@ -4379,7 +4801,7 @@ If the send string in any part of the chat sequence is a fullstop ".", then no string is sent. Similarly, - is the expect string is a fullstop then no string is expected. + if the expect string is a fullstop then no string is expected. Note that if the unix password sync parameter is set to true, then this @@ -4393,8 +4815,8 @@ passwd program and passwd chat debug. - Default: passwd chat = *old*password* %o\n *new* - password* %n\n *new*password* %n\n *changed* + Default: passwd chat = *new*password* %n\n + *new*password* %n\n *changed* Example: passwd chat = "*Enter OLD password*" %o\n "*Enter NEW password*" %n\n "*Reenter NEW password*" %n\n "*Password changed*" @@ -4422,7 +4844,6 @@ . Default: passwd chat debug = no - Example: passwd chat debug = yes @@ -4472,7 +4893,10 @@ with mixed-case passwords. One offending client is Windows for Workgroups, which for some reason forces passwords to upper case when using the LANMAN1 protocol, but leaves them alone when - using COREPLUS! + using COREPLUS! Another problem child is the Windows 95/98 + family of operating systems. These clients upper case clear + text passwords even when NT LM 0.12 selected by the protocol + negotiation request/response. This parameter defines the maximum number of characters that may be upper case in passwords. @@ -4513,9 +4937,9 @@ or security = server you can get Samba to do all its username/password validation via a remote server. - This options sets the name of the password server to use. + This option sets the name of the password server to use. It must be a NetBIOS name, so if the machine's NetBIOS name is - different from its internet name then you may have to add its NetBIOS + different from its Internet name then you may have to add its NetBIOS name to the lmhosts file which is stored in the same directory as the smb.conf file. @@ -4525,7 +4949,7 @@ by any method and order described in that parameter. The password server much be a machine capable of using - the "LM1.2X002" or the "LM NT 0.12" protocol, and it must be in + the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in user level security mode. NOTE: Using a password server @@ -4540,14 +4964,14 @@ The name of the password server takes the standard substitutions, but probably the only useful one is %m , which means the Samba server will use the incoming - client as the passwordserver. If you use this then you better - trust your clients, and you better restrict them with hosts allow! + client as the password server. If you use this then you better + trust your clients, and you had better restrict them with hosts allow! If the security parameter is set to domain, then the list of machines in this option must be a list of Primary or Backup Domain controllers for the - Domain or the character '*', as the Samba server is cryptographicly - in that domain, and will use cryptographicly authenticated RPC calls + Domain or the character '*', as the Samba server is effectively + in that domain, and will use cryptographically authenticated RPC calls to authenticate the user logging on. The advantage of using security = domain is that if you list several hosts in the password server option then smbd @@ -4625,6 +5049,24 @@ + + + posix locking (S) + The smbd(8) + daemon maintains an database of file locks obtained by SMB clients. + The default behavior is to map this internal database to POSIX + locks. This means that file locks obtained by SMB clients are + consistent with those seen by POSIX compliant applications accessing + the files via a non-SMB method (e.g. NFS or local file access). + You should never need to disable this parameter. + + Default: posix locking = yes + + + + + + postexec (S) This option specifies a command to be run @@ -4726,7 +5168,7 @@ See also os level . - Default: preferred master = no + Default: preferred master = auto @@ -4743,8 +5185,18 @@ preload - Synonym for - auto services. + This is a list of services that you want to be + automatically added to the browse lists. This is most useful + for homes and printers services that would otherwise not be + visible. + + Note that if you just want all printers in your + printcap file loaded then the + load printers option is easier. + + Default: no preloaded services + + Example: preload = fred lp colorlp @@ -4753,13 +5205,13 @@ preserve case (S) This controls if new filenames are created with the case that the client passes, or if they are forced to - be the derault case + be the default case . Default: preserve case = yes See the section on NAME - MANGLING" for a fuller discussion. for a fuller discussion. @@ -4798,7 +5250,7 @@ printable service nor a global print command, spool files will be created but not processed and (most importantly) not removed. - Note that printing may fail on some UNIXs from the + Note that printing may fail on some UNIXes from the nobody account. If this happens then create an alternative guest account that can print and set the guest account @@ -4872,24 +5324,6 @@ - - printer admin (S) - This is a list of users that can do anything to - printers via the remote administration interfaces offered by MSRPC - (usually using a NT workstation). Note that the root user always - has admin rights. - - Default: printer admin = <empty string> - - Example: printer admin = admin, @staff - - - - - - - - printcap name (G) This parameter may be used to override the @@ -4933,29 +5367,38 @@ - - printer (S) - This parameter specifies the name of the printer - to which print jobs spooled through a printable service will be sent. - If specified in the [global] section, the printer - name given will be used for any printable service that does - not have its own printer name specified. - Default: none (but may be lp - on many systems) + + printer admin (S) + This is a list of users that can do anything to + printers via the remote administration interfaces offered by MS-RPC + (usually using a NT workstation). Note that the root user always + has admin rights. - Example: printer name = laserwriter + Default: printer admin = <empty string> + + Example: printer admin = admin, @staff - + + + printer driver (S) - This option allows you to control the string + Note :This is a depreciated + parameter and will be removed in the next major release + following version 2.2. Please see the instructions in + PRINTER_DRIVER2.txt in the docs + of the Samba distribution for more information + on the new method of loading printer drivers onto a Samba server. + + + This option allows you to control the string that clients receive when they ask the server for the printer driver - associated with a printer. If you are using Windows95 or WindowsNT + associated with a printer. If you are using Windows95 or Windows NT then you can use this to automate the setup of printers on your system. @@ -4965,7 +5408,7 @@ first try with no printer driver option set and the client will give you a list of printer drivers. The appropriate strings are - shown in a scrollbox after you have chosen the printer manufacturer. + shown in a scroll box after you have chosen the printer manufacturer. See also printer driver file. @@ -4978,7 +5421,15 @@ printer driver file (G) - This parameter tells Samba where the printer driver + Note :This is a depreciated + parameter and will be removed in the next major release + following version 2.2. Please see the instructions in + PRINTER_DRIVER2.txt in the docs + of the Samba distribution for more information + on the new method of loading printer drivers onto a Samba server. + + + This parameter tells Samba where the printer driver definition file, used when serving drivers to Windows 95 clients, is to be found. If this is not set, the default is : @@ -5006,7 +5457,15 @@ printer driver location (S) - This parameter tells clients of a particular printer + Note :This is a depreciated + parameter and will be removed in the next major release + following version 2.2. Please see the instructions in + PRINTER_DRIVER2.txt in the docs + of the Samba distribution for more information + on the new method of loading printer drivers onto a Samba server. + + + This parameter tells clients of a particular printer share where to find the printer driver files for the automatic installation of drivers for Windows 95 machines. If Samba is set up to serve printer drivers to Windows 95 machines, this should be set to @@ -5032,8 +5491,25 @@ printer name (S) - Synonym for - printer. + This parameter specifies the name of the printer + to which print jobs spooled through a printable service will be sent. + + If specified in the [global] section, the printer + name given will be used for any printable service that does + not have its own printer name specified. + + Default: none (but may be lp + on many systems) + + Example: printer name = laserwriter + + + + + + printer (S) + Synonym for + printer name. @@ -5067,58 +5543,16 @@ - - - - private dir(G) - The private dir parameter - allows an administator to define a directory path used to hold the - various databases Samba will use to store things like a the machine - trust account information when acting as a domain member (i.e. where - the secrets.tdb file will be located), where the passdb.tbd file - will stored in the case of using the experiemental tdbsam support, - etc... - - Default: private dir = <compile time location - of smbpasswd> - Example: private dir = /etc/smbprivate - - - + protocol (G) - The value of the parameter (a string) is the highest - protocol level that will be supported by the server. - - Possible values are : - - CORE: Earliest version. No - concept of user names. - - COREPLUS: Slight improvements on - CORE for efficiency. - - LANMAN1: First - modern version of the protocol. Long filename - support. - - LANMAN2: Updates to Lanman1 protocol. - - - NT1: Current up to date version of - the protocol. Used by Windows NT. Known as CIFS. - + Synonym for + max protocol. + - Normally this option should not be set as the automatic - negotiation phase in the SMB protocol takes care of choosing - the appropriate protocol. - Default: protocol = NT1 - Example: protocol = LANMAN1 - - @@ -5372,10 +5806,10 @@ but it doesn't. Setting it to true will force these anonymous connections to be denied, and the client will be required to always supply a username and password when connecting. Use of this parameter - is only recommened for homogenous NT client environments. + is only recommended for homogeneous NT client environments. This parameter makes the use of macro expansions that rely - on the username (%U, %G, etc) consistant. NT 4.0 + on the username (%U, %G, etc) consistent. NT 4.0 likes to use anonymous connections when refreshing the share list, and this is a way to work around that. @@ -5453,6 +5887,9 @@ See also postexec. + + Default: root postexec = <empty string> + @@ -5460,12 +5897,15 @@ root preexec (S) This is the same as the preexec parameter except that the command is run as root. This - is useful for mounting filesystems - (such as cdroms) after a connection is closed. + is useful for mounting filesystems (such as cdroms) after a + connection is closed. See also preexec and preexec close. + + Default: root preexec = <empty string> + @@ -5479,6 +5919,8 @@ See also preexec and preexec close. + + Default: root preexec close = no @@ -5536,7 +5978,7 @@ The different settings will now be explained. - SECURITY = SHARE + SECURITY = SHARE When clients connect to a share level security server then @@ -5605,7 +6047,7 @@ See also the section NOTE ABOUT USERNAME/PASSWORD VALIDATION. - SECURIYT = USER + SECURIYT = USER This is the default security setting in Samba 2.2. @@ -5632,7 +6074,7 @@ See also the section NOTE ABOUT USERNAME/PASSWORD VALIDATION. - SECURITY = SERVER + SECURITY = SERVER In this mode Samba will try to validate the username/password @@ -5830,29 +6272,6 @@ - - shared mem size (G) - It specifies the size of the shared memory (in - bytes) to use between smbd(8) - processes. This parameter defaults to one megabyte of shared - memory. It is possible that if you have a large erver with many - files open simultaneously that you may need to increase this - parameter. Signs that this parameter is set too low are users - reporting strange problems trying to save files (locking errors) - and error messages in the smbd log looking like ERROR - smb_shm_alloc : alloc of XX bytes failed. - - If your OS refuses the size that Samba asks for then - Samba will try a smaller size, reducing by a factor of 0.8 until - the OS accepts it. - - Default: shared mem size = 1048576 - Example: shared mem size = 5242880 ; Set to 5mb for a - large number of files. - - - - short preserve case (S) @@ -5875,43 +6294,58 @@ - smb passwd file (G) - This option sets the path to the encrypted - smbpasswd file. By default the path to the smbpasswd file - is compiled into Samba. + show add printer wizard (G) + With the introduction of MS-RPC based printing support + for Windows NT/2000 client in Samba 2.2, a "Printers..." folder will + appear on Samba hosts in the share listing. Normally this folder will + contain an icon for the MS Add Printer Wizard (APW). However, it is + possible to disable this feature regardless of the level of privilege + of the connected user. - Default: smb passwd file= <compiled - default> - - Example: smb passwd file = /usr/samba/private/smbpasswd - + Under normal circumstances, the Windows NT/2000 client will + open a handle on the printer server with OpenPrinterEx() asking for + Administrator privileges. If the user does not have administrative + access on the print server (i.e is not root or a member of the + printer admin group), the OpenPrinterEx() + call fails and the clients another open call with a request for + a lower privilege level. This should succeed, however the APW + icon will not be displayed. + + Disabling the show add printer wizard + parameter will always cause the OpenPrinterEx() on the server + to fail. Thus the APW icon will never be displayed. + Note :This does not prevent the same user from having + administrative privilege on an individual printer. + + See also addprinter + command, + deleteprinter command, printer admin + + Default :show add printer wizard = yes - - smbrun (G) - This sets the full path to the smbrun - binary. This defaults to the value in the - Makefile. - - You must get this path right for many services - to work correctly. - - You should not need to change this parameter so - long as Samba is installed correctly. - Default: smbrun=<compiled default> + + smb passwd file (G) + This option sets the path to the encrypted + smbpasswd file. By default the path to the smbpasswd file + is compiled into Samba. + + Default: smb passwd file = ${prefix}/private/smbpasswd - Example: smbrun = /usr/local/samba/bin/smbrun + Example: smb passwd file = /etc/samba/smbpasswd + socket address (G) This option allows you to control what @@ -6485,7 +6919,7 @@ maps onto LOG_INFO. All higher levels are mapped to LOG_DEBUG. - This paramter sets the threshold for sending messages + This parameter sets the threshold for sending messages to syslog. Only messages with debug level less than this value will be sent to syslog. @@ -6576,6 +7010,28 @@ + + + total print jobs (G) + This parameter accepts an integer value which defines + a limit on the maximum number of print jobs that will be accepted + system wide at any given time. If a print job is submitted + by a client which will exceed this number, then smbd will return an + error indicating that no space is available on the server. The + default value of 0 means that no such limit exists. This parameter + can be used to prevent a server from exceeding its capacity and is + designed as a printing throttle. See also + max print jobs. + + + Default: total print jobs = 0 + Example: total print jobs = 5000 + + + + + + unix password sync (G) This boolean parameter controls whether Samba @@ -6597,19 +7053,6 @@ - - unix realname (G) - This boolean parameter when set causes samba - to supply the real name field from the unix password file to - the client. This isuseful for setting up mail clients and WWW - browsers on systems used by more than one person. - - Default: unix realname = no - - - - - update encrypted (G) This boolean parameter allows a user logging @@ -6727,7 +7170,7 @@ of all users in the netgroup group of that name. Note that searching though a groups database can take - quite some time, snd some clients may time out during the + quite some time, and some clients may time out during the search. See the section NOTE ABOUT @@ -6735,7 +7178,7 @@ this parameter determines access to the services. Default: The guest account if a guest service, - else the name of the service. + else <empty string>. Examples:username = fred, mary, jack, jane, @users, @pcgroup @@ -6754,7 +7197,7 @@ If this parameter is set to non-zero the behavior changes. This parameter is a number that specifies the number of uppercase - combinations to try whilst trying to determine the UNIX user name. The + combinations to try while trying to determine the UNIX user name. The higher the number the more combinations will be tried, but the slower the discovery of usernames will be. Use this parameter when you have strange usernames on your UNIX machine, such as AstrangeUser @@ -6896,63 +7339,6 @@ - - winbind cache time - NOTE: this parameter is only - available in Samba 3.0. - - This parameter specifies the number of seconds the - winbindd(8) daemon will cache - user and group information before querying a Windows NT server - again. - - Default: winbind cache type = 15 - - - - - - - - winbind gid - NOTE: this parameter is only - available in Samba 3.0. - - The winbind gid parameter specifies the range of group - ids that are allocated by the - winbindd(8) daemon. This range of group ids should have no - existing local or nis groups within it as strange conflicts can - occur otherwise. - - Default: winbind gid = <empty string> - - - Example: winbind gid = 10000-20000 - - - - - - - winbind uid - NOTE: this parameter is only - available in Samba 3.0. - - The winbind gid parameter specifies the range of group - ids that are allocated by the - winbindd(8) daemon. This range of ids should have no - existing local or nis users within it as strange conflicts can - occur otherwise. - - Default: winbind uid = <empty string> - - - Example: winbind uid = 10000-20000 - - - - - valid chars (G) The option allows you to specify additional @@ -7117,6 +7503,35 @@ + + vfs object (S) + This parameter specifies a shared object file that + is used for Samba VFS I/O operations. By default, normal + disk I/O operations are used but these can be overloaded + with a VFS object. The Samba VFS layer is new to Samba 2.2 and + must be enabled at compile time with --with-vfs. + + Default : no value + + + + + + + + vfs options (S) + This parameter allows parameters to be passed + to the vfs layer at initialisation time. The Samba VFS layer + is new to Samba 2.2 and must be enabled at compile time + with --with-vfs. See also + vfs object. + + Default : no value + + + + + volume (S) This allows you to override the volume label @@ -7147,44 +7562,85 @@ + - wins proxy (G) - This is a boolean that controls if nmbd(8) will respond to broadcast name - queries on behalf of other hosts. You may need to set this - to yes for some older clients. + winbind cache time + NOTE: this parameter is only + available in Samba 3.0. + + This parameter specifies the number of seconds the + winbindd(8) daemon will cache + user and group information before querying a Windows NT server + again. - Default: wins proxy = no + Default: winbind cache type = 15 + + + winbind gid + NOTE: this parameter is only + available in Samba 3.0. + + The winbind gid parameter specifies the range of group + ids that are allocated by the + winbindd(8) daemon. This range of group ids should have no + existing local or nis groups within it as strange conflicts can + occur otherwise. + + Default: winbind gid = <empty string> + + + Example: winbind gid = 10000-20000 + + + - wins server (G) - This specifies the IP address (or DNS name: IP - address for preference) of the WINS server that - nmbd(8) should register with. If you have a WINS server on - your network then you should set this to the WINS server's IP. + winbind separator + NOTE: this parameter is only + available in Samba 3.0. - You should point this at your WINS server if you have a - multi-subnetted network. + This parameter allows an admin to define the character + used when listing a username of the form of DOMAIN + \user. This parameter + is only applicable when using the pam_winbind.so + and nss_winbind.so modules for UNIX services. + - NOTE. You need to set up Samba to point - to a WINS server if you have multiple subnets and wish cross-subnet - browsing to work correctly. + Example: winbind separator = \ + Example: winbind separator = + + + - See the documentation file BROWSING.txt - in the docs/ directory of your Samba source distribution. - Default: not enabled - Example: wins server = 192.9.200.1 + + + + winbind uid + NOTE: this parameter is only + available in Samba 3.0. + + The winbind gid parameter specifies the range of group + ids that are allocated by the + winbindd(8) daemon. This range of ids should have no + existing local or nis users within it as strange conflicts can + occur otherwise. + + Default: winbind uid = <empty string> + + + Example: winbind uid = 10000-20000 + + wins hook (G) When Samba is running as a WINS server this @@ -7231,6 +7687,46 @@ + + + + wins proxy (G) + This is a boolean that controls if nmbd(8) will respond to broadcast name + queries on behalf of other hosts. You may need to set this + to yes for some older clients. + + Default: wins proxy = no + + + + + + + + wins server (G) + This specifies the IP address (or DNS name: IP + address for preference) of the WINS server that + nmbd(8) should register with. If you have a WINS server on + your network then you should set this to the WINS server's IP. + + You should point this at your WINS server if you have a + multi-subnetted network. + + NOTE. You need to set up Samba to point + to a WINS server if you have multiple subnets and wish cross-subnet + browsing to work correctly. + + See the documentation file BROWSING.txt + in the docs/ directory of your Samba source distribution. + + Default: not enabled + Example: wins server = 192.9.200.1 + + + + + wins support (G) This boolean controls if the @@ -7251,7 +7747,7 @@ This controls what workgroup your server will appear to be in when queried by clients. Note that this parameter also controls the Domain name used with the security=domain + linkend="SECURITYEQUALSDOMAIN">security=domain setting. Default: set at compile time to WORKGROUP @@ -7271,36 +7767,11 @@ - - write list (S) - This is a list of users that are given read-write - access to a service. If the connecting user is in this list then - they will be given write access, no matter what the writeable - option is set to. The list can include group names using the - @group syntax. - - Note that if a user is in both the read list and the - write list then they will be given write access. - - See also the read list - option. - - Default: write list = <empty string> - - - Example: write list = admin, root, @staff - - - - - - write cache size (S) - This integer parameter (new with Samba 2.0.7) - if set to non-zero causes Samba to create an in-memory cache for - each oplocked file (it does not do this for + If this integer parameter is set to non-zero value, + Samba will create an in-memory cache for each oplocked file + (it does not do this for non-oplocked files). All writes that the client does not request to be flushed directly to disk will be stored in this cache if possible. The cache is flushed onto disk when a write comes in whose offset @@ -7328,6 +7799,32 @@ + + write list (S) + This is a list of users that are given read-write + access to a service. If the connecting user is in this list then + they will be given write access, no matter what the writeable + option is set to. The list can include group names using the + @group syntax. + + Note that if a user is in both the read list and the + write list then they will be given write access. + + See also the read list + option. + + Default: write list = <empty string> + + + Example: write list = admin, root, @staff + + + + + + + write ok (S) diff --git a/docs/docbook/manpages/smbcacls.1.sgml b/docs/docbook/manpages/smbcacls.1.sgml index 9561099851..3aa9920254 100644 --- a/docs/docbook/manpages/smbcacls.1.sgml +++ b/docs/docbook/manpages/smbcacls.1.sgml @@ -14,7 +14,7 @@ - nmblookup + smbcacls //server/share filename -U username diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml index 7618ad451c..f82d59d29c 100644 --- a/docs/docbook/manpages/smbclient.1.sgml +++ b/docs/docbook/manpages/smbclient.1.sgml @@ -17,6 +17,7 @@ smbclient servicename + password -b <buffer size> -d debuglevel -D Directory @@ -38,7 +39,6 @@ -R <name resolve order> -s <smb config file> -T<c|x>IXFqgbNan - password @@ -128,7 +128,7 @@ - name resolve order (G) + -R <name resolve order> This option is used by the programs in the Samba suite to determine what naming services and in what order to resolve host names to IP addresses. The option takes a space separated diff --git a/docs/docbook/manpages/smbmnt.8.sgml b/docs/docbook/manpages/smbmnt.8.sgml index e25c73d092..9527a19144 100644 --- a/docs/docbook/manpages/smbmnt.8.sgml +++ b/docs/docbook/manpages/smbmnt.8.sgml @@ -1,5 +1,5 @@ - + smbmnt @@ -14,7 +14,7 @@ - smbumount + smbmnt mount-point -s <share> -r @@ -22,6 +22,7 @@ -g <gid> -f <mask> -d <mask> + -o <options> @@ -50,7 +51,6 @@ - -u uid specify the uid that the files will @@ -63,21 +63,26 @@ owned by - - -f mask specify the octal file mask applied - - -d mask specify the octal directory mask applied + + + -o options + + list of options that are passed as-is to smbfs, if this + command is run on a 2.4 or higher linux kernel. + + + @@ -85,10 +90,16 @@ AUTHOR + Volker Lendecke, Andrew Tridgell, Michael H. Warfield + and others. + The current maintainer of smbfs and the userspace tools smbmount, smbumount, and smbmnt is Urban Widmark. + url="mailto:urban@teststation.com">Urban Widmark. + The SAMBA Mailing list + is the preferred place to ask questions regarding these programs. + The conversion of this manpage for Samba 2.2 was performed by Gerald Carter diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml index a1a510ecd7..391d7d6882 100644 --- a/docs/docbook/manpages/smbmount.8.sgml +++ b/docs/docbook/manpages/smbmount.8.sgml @@ -9,7 +9,7 @@ smbmount - mount and smbfs filesystem + mount an smbfs filesystem @@ -29,8 +29,17 @@ the mount(8) command when using the "-t smb" option. The kernel must support the smbfs filesystem. - Options to smbmount are specified as a comma separated list - of key=value pairs. + Options to smbmount are specified as a comma separated + list of key=value pairs. It is possible to send options other + than those listed here, assuming that smbfs supports them. If + you get mount failures, check your kernel log for errors on + unknown options. + + smbmount is a daemon. After mounting it keeps running until + the mounted smbfs is umounted. It will log things that happen + when in daemon mode using the "machine name" smbmount, so + typically this output will end up in log.smbmount. The + smbmount process may also be called mount.smbfs. NOTE: smbmount calls smbmnt(8) to do the actual mount. You @@ -46,22 +55,40 @@ username=<arg> specifies the username to connect as. If - this is not given then the environment variable - $USER is used. This option can also take the - form "user%password" or "user/workgroup" or - "user/workgroup%password" to allow the password and workgroup + this is not given, then the environment variable + USER is used. This option can also take the + form "user%password" or "user/workgroup" or + "user/workgroup%password" to allow the password and workgroup to be specified as part of the username. - password=<arg> - specifies the SMB password. If not given then - smbmount will prompt for a passeword, unless - the guest option is given. + specifies the SMB password. If this + option is not given then the environment variable + PASSWD is used. If it can find + no password smbmount will prompt + for a passeword, unless the guest option is + given. - + + credentials=<filename> + specifies a file that contains a username + and/or password. The format of the file is: + + + + username = <value> + password = <value> + + + + This is preferred over having passwords in plaintext in a + shared file, such as /etc/fstab. Be sure to protect any + credentials file properly. + + netbiosname=<arg> @@ -69,11 +96,10 @@ to the local hostname. - - uid=<arg> - sets the uid that files will be mounted as. + sets the uid that will own all files on + the mounted filesystem. It may be specified as either a username or a numeric uid. @@ -81,7 +107,8 @@ gid=<arg> - sets the gid that files will be mounted as. + sets the gid that will own all files on + the mounted filesystem. It may be specified as either a groupname or a numeric gid. @@ -160,19 +187,112 @@ rwmount read-write + + + iocharset=<arg> + + sets the charset used by the linux side for codepage + to charset translations (NLS). Argument should be the + name of a charset, like iso8859-1. (Note: only kernel + 2.4.0 or later) + + + + + codepage=<arg> + + sets the codepage the server uses. See the iocharset + option. Example value cp850. (Note: only kernel 2.4.0 + or later) + + + + + ttl=<arg> + + how long a directory listing is cached in milliseconds + (also affects visibility of file size and date + changes). A higher value means that changes on the + server take longer to be noticed but it can give + better performance on large directories, especially + over long distances. Default is 1000ms but something + like 10000ms (10 seconds) is probably more reasonable + in many cases. + (Note: only kernel 2.4.2 or later) + + + + + ENVIRONMENT VARIABLES + + The variable USER may contain the username of the + person using the client. This information is used only if the + protocol level is high enough to support session-level + passwords. The variable can be used to set both username and + password by using the format username%password. + + The variable PASSWD may contain the password of the + person using the client. This information is used only if the + protocol level is high enough to support session-level + passwords. + + The variable PASSWD_FILE may contain the pathname of + a file to read the password from. A single line of input is + read and used as password. + + + + + BUGS + + Not many known smbmount bugs. But one smbfs bug is + important enough to mention here anyway: + + + + Mounts sometimes stop working. This is usually + caused by smbmount terminating. Since smbfs needs smbmount to + reconnect when the server disconnects, the mount will go + dead. A re-mount normally fixes this. At least 2 ways to + trigger this bug are known. + + + + Note that the typical response to a bugreport is suggestion + to try the latest version first. So please try doing that first, + and always include which versions you use of relevant software + when reporting bugs (minimum: samba, kernel, distribution) + + + + + + SEE ALSO + + Documentation/filesystems/smbfs.txt in the kernel source tree + may contain additional options and information. + + + AUTHOR + Volker Lendecke, Andrew Tridgell, Michael H. Warfield + and others. + The current maintainer of smbfs and the userspace tools smbmount, smbumount, and smbmnt is Urban Widmark + url="mailto:urban@teststation.com">Urban Widmark. + The SAMBA Mailing list + is the preferred place to ask questions regarding these programs. + The conversion of this manpage for Samba 2.2 was performed by Gerald Carter diff --git a/docs/docbook/manpages/smbpasswd.8.sgml b/docs/docbook/manpages/smbpasswd.8.sgml index 7f7783425a..8233234d35 100644 --- a/docs/docbook/manpages/smbpasswd.8.sgml +++ b/docs/docbook/manpages/smbpasswd.8.sgml @@ -221,7 +221,7 @@ -R name resolve order - This option allows the user of smbclient to determine + This option allows the user of smbpasswd to determine what name resolution services to use when looking up the NetBIOS name of the host being connected to. diff --git a/docs/docbook/manpages/smbumount.8.sgml b/docs/docbook/manpages/smbumount.8.sgml index be7e929e06..15e20a2e70 100644 --- a/docs/docbook/manpages/smbumount.8.sgml +++ b/docs/docbook/manpages/smbumount.8.sgml @@ -55,10 +55,16 @@ AUTHOR + Volker Lendecke, Andrew Tridgell, Michael H. Warfield + and others. + The current maintainer of smbfs and the userspace tools smbmount, smbumount, and smbmnt is Urban Widmark. + url="mailto:urban@teststation.com">Urban Widmark. + The SAMBA Mailing list + is the preferred place to ask questions regarding these programs. + The conversion of this manpage for Samba 2.2 was performed by Gerald Carter -- cgit