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

Thu Jan 30 15:06:46 MST 2014

On 31/01/14 07:58, Andrew Bartlett wrote:
> On Thu, 2014-01-30 at 13:26 +0100, Jelmer Vernooij wrote:
>> On Thu, Jan 30, 2014 at 09:09:00AM +1300, Andrew Bartlett wrote:
>>> diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
>>> index 68b2abe..e612a6e 100755
>>> --- a/docs-xml/smbdotconf/generate-file-list.sh
>>> +++ b/docs-xml/smbdotconf/generate-file-list.sh
>>> @@ -1,4 +1,20 @@
>>>   #!/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 "<!DOCTYPE section [
>>> +<!ENTITY dynconfig.SCRIPTSBINDIR       '\${prefix}/sbin'>
>>> +<!ENTITY dynconfig.LOCKDIR             '\${prefix}/var/lock'>
>>> +<!ENTITY dynconfig.NCALRPCDIR          '\${prefix}/var/run/ncalrpc'>
>>> +<!ENTITY dynconfig.PIDDIR              '\${prefix}/var/run'>
>>> +<!ENTITY dynconfig.STATEDIR            '\${prefix}/var/locks'>
>>> +<!ENTITY dynconfig.PRIVATE_DIR         '\${prefix}/private'>
>>> +<!ENTITY dynconfig.SMB_PASSWD_FILE     '\${prefix}/private/smbpasswd'>
>>> +<!ENTITY dynconfig.WINBINDD_SOCKET_DIR '\${prefix}/var/run/ncalrpc'>
>>> +]>"
>> W00t! This is neat.
> Thanks :-)
>
>> dynconfig is a confusing name here, as there is nothing dynamic about these paths anymore.
> So perhaps we should change it to pathconfig?  I chose the dynconfig
> name because that's still where the rest of the stuff is configured
> from, and until I get the attached patch reviewed it is still dynamic in
> some source3 binaries.
>
> (I put this to the list as "Remove the 'dynconfig' command line options
> for 4.2 or 4.3?" 3 weeks ago, and only got a reply from metze that he
> saw no reason to keep these options).
>
> Perhaps get the attached in and then globally rename dynconfig ->
> pathconfig?
>
> Andrew Bartlett
>

I just renamed dynconfig to pathconfig for the new entities.

Cheers,

Garming Sam
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-docs-define-and-include-entities-for-the-docs.patch
Type: text/x-patch
Size: 6184 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0016.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: 1880 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0017.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: 884 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0018.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: 970 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0019.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: 932 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0020.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: 1119 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0021.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: 981 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0022.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: 918 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0023.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: 904 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0024.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: 862 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0025.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: 914 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0026.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: 946 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0027.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: 901 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0028.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: 993 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0029.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: 864 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0030.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: 850 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/e4c049b9/attachment-0031.bin>