[PATCH] Change smb.conf.5 build to use XML entities to get always-correct default paths

Andrew Bartlett abartlet at samba.org
Wed Jan 29 13:09:00 MST 2014


This patch set, inspired by the desire to check all parameter defaults
in an improved docs.py test, makes the defaults in our 'man smb.conf'
always correct for paths.

Because the defaults for some parameters depend on configure options,
this provides these options to the XML generation by the means of XML
entities - the CPP macros of the XML world. 

Because XInclude only works for full, compliant XML documents, we also
have to change the code to manually concatenate the per-parameter XML
documents into one big parameters.all.xml. 

This means that no matter what --prefix you put to configure, the
smb.conf manpage will list the correct defaults for your platform.  This
will also avoid distributions needing to patch the docs to correct the
paths. 

Please review/push.

Andrew Bartlett
-- 
Andrew Bartlett                       http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-docs-define-and-include-entities-for-the-docs.patch
Type: text/x-patch
Size: 6179 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-docs-Allow-smb.conf.5-to-still-be-generated-outside-.patch
Type: text/x-patch
Size: 1872 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-docs-change-default-in-pid-directory-to-use-an-entit.patch
Type: text/x-patch
Size: 883 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-docs-change-default-in-dns-update-command-to-use-an-.patch
Type: text/x-patch
Size: 969 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-docs-change-default-in-smb-passwd-file-to-use-an-ent.patch
Type: text/x-patch
Size: 931 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0004.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-docs-change-default-in-ncalrpc-dir-to-use-an-entity.patch
Type: text/x-patch
Size: 1118 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0005.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-docs-change-default-in-winbindd-socket-directory-to-.patch
Type: text/x-patch
Size: 980 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0006.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-docs-change-default-in-state-directory-to-use-an-ent.patch
Type: text/x-patch
Size: 917 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0007.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-docs-change-default-in-lock-directory-to-use-an-enti.patch
Type: text/x-patch
Size: 903 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0008.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0010-docs-change-default-in-private-directory-to-use-an-e.patch
Type: text/x-patch
Size: 861 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0009.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0011-docs-change-default-of-spn-update-command-to-use-an-.patch
Type: text/x-patch
Size: 913 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0010.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0012-docs-change-default-of-ntp-signd-socket-directory-to.patch
Type: text/x-patch
Size: 945 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0011.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0013-docs-change-default-of-samba-kcc-command-to-use-an-e.patch
Type: text/x-patch
Size: 900 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0012.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0014-docs-change-default-of-winbindd-privileged-socket-di.patch
Type: text/x-patch
Size: 992 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0013.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0015-docs-change-default-of-cache-directory-to-use-an-ent.patch
Type: text/x-patch
Size: 863 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0014.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0016-docs-change-default-of-usershare-path-to-use-an-enti.patch
Type: text/x-patch
Size: 849 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140130/29ed7c18/attachment-0015.bin>


More information about the samba-technical mailing list