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

[Andrew Bartlett]

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

-- 
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-cmdline-Remove-dynconfig-hooks-in-command-line-proce.patch
Type: text/x-patch
Size: 5152 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140131/d7b46d61/attachment.bin>