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

[jelmer at samba.org]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256



On January 30, 2014 6:58:59 PM GMT+00:00, Andrew Bartlett <abartlet at samba.org> 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?
That seems reasonable to me.

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: APG v1.0.9 beta 00

iQJABAEBCAAqBQJS6qppIxxKZWxtZXIgVmVybm9vaWogPGplbG1lckBzYW1iYS5v
cmc+AAoJEFxI7PewzrUMFboQAI4/sE1WYMiACyf6cjWwMdhOswCOYrOcBUFKI141
rCgej0lkZoSmhMZDB4oSCVF6reagNfVzN+cJQaGdegiihnNwGZCkUBvi766bXqIp
TFFU1zly0jL/KLAxeRTxLWICtKfqyy6iuZIWvV5Onw96dc86JHPXlewZGna6W8ox
GNpi7G6nFrVCI5aVDGlBVzKtPQ6cd2uJYfJK//Lo9lTWJ6T+HRt3JSyMVcJPsJNw
4wW2aDHE1tnMPcTTCGNb46pNrzVGaPLcFMQeqJIE4+JprXJo8h/CpVEl6IcjGAmZ
AyNc1IqKhtXGNB79DF19W43DkAr8IL8858LhunTkrFJmFkitFraFtOBcHGsuOf2p
NfdqTvlrLRmlmh41ifVSzMNHsg2CoS6Xd3KGKSD1CzN3+mZuZAZFDTrGERYWRTe8
Xo3gmHPVg1i6iKw4SkMaF7/SbBz8fGD7mMK92J5PtK0ouSiDoaBSoOJMNcq9lTbE
RftKbNjwJJ95oOdcPH5ZnepH1StqOqTcRLeoK3UyXfXIIFDC7MvxePgKnx2DRdWf
GSCEnuFmq4FXjPanSAIu6CdTK4yXoeR29C6ebWTSjRcmOu/vVlfJ53UGZ4KJh9/a
NeZqmYjWceetnmp1Qh49n05S+6076HnFFZSQF2QNMmZW1TLwE/olFmM058tHtncm
q7AI
=6Exm
-----END PGP SIGNATURE-----