[PATCH] Improve samba-tool testparm and remove unused script

Andrew Bartlett abartlet at samba.org
Sun Jan 26 18:35:33 MST 2014


On Mon, 2014-01-27 at 01:07 +0000, Jelmer Vernooij wrote:
> On Mon, Jan 27, 2014 at 01:48:23PM +1300, Garming Sam wrote:
> > 
> > >OK.  Garming:  Can you look over Jelmer's concerns and patch both cases
> > >on Monday?
> > >
> > >Thanks,
> > >
> > >Andrew Bartlett
> > 
> > I just squashed the commit with the str(...) python call since
> > there's not really much point to it with the following patches. I
> > amended one of the commit messages as well, to say that the change
> > fixes the aforementioned error.
> > 
> > 
> > >Thanks Jelmer.  It looks like "[PATCH 4/4] lib/param: fix parameter
> > >dumping to detect share and global parameters" has a regression on
> > >running 'bin/samba-tool testparm --suppress-prompt
> > >--parameter-name="directory mask"' without also specifying a
> > >--section-name, so Garming and I will to look into that some more, and
> > >add a unit test.
> > >
> > >Andrew Bartlett
> > >
> > 
> > I believe the minor change to the third patch should allow this
> > behaviour now. I noticed that there was an extra related patch,
> > which wasn't in the ones attached, which added a couple error
> > messages. Notably one for when the section can't be found. I think I
> > tried to match the s3 messages. I've added it as well, although I
> > suppose it isn't entirely necessary. Thoughts on it? There's another
> > debug message which actually comes up in map_parameter to say a
> > parameter is unknown (which never comes in s3 though since it does
> > the dumping differently).
> > 
> > 
> > As for the PyErr handling, is all that needs to be done just
> > removing the SetString? The same line happens actually happens in
> > dump a service as well, and not just dump.
> Yep.
> 
> Thanks.
> 
> Reviewed-By: Jelmer Vernooij <jelmer at samba.org>

Thanks Jelmer, I've pushed those to autobuild.

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




More information about the samba-technical mailing list