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

Garming Sam garming at catalyst.net.nz
Sun Jan 26 17:48:23 MST 2014


> 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.


Cheers,

Garming Sam

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-script-Remove-unused-and-no-longer-working-extract_a.patch
Type: text/x-patch
Size: 847 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140127/f43c3630/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-s4-testparm-modify-dumping-of-parameters-to-use-the-.patch
Type: text/x-patch
Size: 3091 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140127/f43c3630/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-lib-param-fix-parameter-dumping-to-detect-share-and-.patch
Type: text/x-patch
Size: 841 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140127/f43c3630/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-param-fix-incorrect-file-error-handling-in-s4-pypara.patch
Type: text/x-patch
Size: 953 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140127/f43c3630/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-s4-param-add-error-messages-for-failure-to-dump-a-pa.patch
Type: text/x-patch
Size: 1732 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140127/f43c3630/attachment-0004.bin>


More information about the samba-technical mailing list