From: Andrew Bartlett Date: Mon, 20 Jun 2022 02:35:19 +0000 (+1200) Subject: docs-xml: Use &pathconfig.WINBINDD_SOCKET_DIR; to avoid reference to old /tmp/.winbindd X-Git-Tag: tevent-0.13.0~341 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45094bd891318f650ac5f0a1bb88e9cbb08729fd;p=thirdparty%2Fsamba.git docs-xml: Use &pathconfig.WINBINDD_SOCKET_DIR; to avoid reference to old /tmp/.winbindd We can now write docs that follow how the software on this system was built, which is much less confusing for users. Also /tmp/.winbindd has not been used for a long time. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15101 Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- diff --git a/docs-xml/Makefile b/docs-xml/Makefile index c614097f6c0..ae50b14d79a 100644 --- a/docs-xml/Makefile +++ b/docs-xml/Makefile @@ -17,7 +17,7 @@ DBLATEX_OPTIONS = -p xslt/latex.xsl -i xslt/latex DATETIME := $(shell date +%Y%m%d%H%M%S) -XSLTPROC_DEPS = build/catalog.xml build/DTD/samba.build.version +XSLTPROC_DEPS = build/catalog.xml build/DTD/samba.build.version build/DTD/samba.build.pathconfig ifeq ($(PROFILE), Y) XSLTPROC += --profile --load-trace --timing @@ -57,6 +57,7 @@ clean:: rm -f xslt/figures/*pdf rm -f $(SMBDOTCONFDOC)/parameters.*.xml rm -f build/catalog.xml + rm -f DTD/samba.build.pathconfig # Output format targets pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS)) @@ -177,13 +178,18 @@ $(MANPAGEDIR)/smb.conf.5.xml: parameters # the parameters xml files. Otherwise, when parameters.*.xml does not exist # yet, the parameters are not generated when smb.conf.5.xml is newer than # any smbdotconf/*/*.xml file ... -.PHONY: parameters +.PHONY: parameters pathconf parameters: $(SMBDOTCONFDOC)/parameters.all.xml +pathconf: build/DTD/samba.build.pathconfig + $(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@ +build/DTD/samba.build.pathconfig: generate-pathconf-entities.sh + ./generate-pathconf-entities.sh > $@ + $(OUTPUTDIR): test -d $@ || mkdir $@ diff --git a/docs-xml/generate-pathconf-entities.sh b/docs-xml/generate-pathconf-entities.sh new file mode 100755 index 00000000000..cb3a346561a --- /dev/null +++ b/docs-xml/generate-pathconf-entities.sh @@ -0,0 +1,20 @@ + +# This is the fallback table for when we use the docs-xml build +# system. When build as part of the main waf build, these are set to +# the full correct path for the system. +# +echo " + + + + + + + + + + + + + +" diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml index 7a643b8879c..e60bd655ec0 100644 --- a/docs-xml/manpages/winbindd.8.xml +++ b/docs-xml/manpages/winbindd.8.xml @@ -432,28 +432,36 @@ auth required /lib/security/pam_unix.so \ - /tmp/.winbindd/pipe + &pathconfig.WINBINDD_SOCKET_DIR;/pipe The UNIX pipe over which clients communicate with the winbindd program. For security reasons, the winbind client will only attempt to connect to the winbindd daemon - if both the /tmp/.winbindd directory - and /tmp/.winbindd/pipe file are owned by - root. + if both the &pathconfig.WINBINDD_SOCKET_DIR; directory + and &pathconfig.WINBINDD_SOCKET_DIR;/pipe file are owned by + root. + + + overrides this default. + + - $LOCKDIR/winbindd_privileged/pipe + $STATEDIR/winbindd_privileged/pipe The UNIX pipe over which 'privileged' clients communicate with the winbindd program. For security reasons, access to some winbindd functions - like those needed by the ntlm_auth utility - is restricted. By default, only users in the 'root' group will get this access, however the administrator - may change the group permissions on $LOCKDIR/winbindd_privileged to allow + may change the group permissions on $STATEDIR/winbindd_privileged to allow programs like 'squid' to use ntlm_auth. Note that the winbind client will only attempt to connect to the winbindd daemon - if both the $LOCKDIR/winbindd_privileged directory - and $LOCKDIR/winbindd_privileged/pipe file are owned by - root. + if both the $STATEDIR/winbindd_privileged directory + and $STATEDIR/winbindd_privileged/pipe file are owned by + root. + controls what + $STATEDIR refers to. + @@ -463,11 +471,12 @@ auth required /lib/security/pam_unix.so \ - $LOCKDIR/winbindd_idmap.tdb + $STATEDIR/winbindd_idmap.tdb Storage for the Windows NT rid to UNIX user/group - id mapping. The lock directory is specified when Samba is initially - compiled using the --with-lockdir option. - This directory is by default /usr/local/samba/var/locks + id mapping. The directory is specified when Samba is initially + compiled using the + --with-statedir option or . + The default directory in this installation is &pathconfig.STATEDIR; . diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh index 27c9c5b753e..dd981b3c472 100755 --- a/docs-xml/smbdotconf/generate-file-list.sh +++ b/docs-xml/smbdotconf/generate-file-list.sh @@ -1,24 +1,10 @@ #!/bin/sh # -# This is the fallback table for when we use the docs-xml build -# system. When build as part of the main waf build, these are set to -# the full correct path for the system. -# -echo " - - - - - - - - - - - - -]>" +set -e +echo "" DIR=. if [ "x$1" != "x" ]; then