On 30/04/16 20:31, Andrew Bartlett wrote:> On Sat, 2016-04-30 at 16:35 +0100, Miguel Medalha wrote: >>> In any case, I found and fixed the issue you hit last week, the >>> patch is at https://bugzilla.samba.org/show_bug.cgi?id=11882 The >>> syntax error should then go away (bug I have a patch for that as >>> well, it is on samba-technical if you are curious). >> I found this on a post by Rowland penny ( >> https://lists.samba.org/archive/samba/2016-March/198662.html): >> >> HI, it would seem you have found a bug, line 943 in 'domain.py' sends >> this: >> >> remove_dc.remove_sysvol_references(remote_samdb, dc_name) >> >> to 'remove_dc.py' , which expects to receive this: >> >> def remove_sysvol_references(samdb, logger, dc_name): >> >> Definitely a bug, logger is set earlier in the 'cmd_domain_demote' >> class. >> >> >> Would this still apply after the patches you did? (By the way, I >> already found the one on samba.technical) > Yes, that still applies. > > Andrew Bartlett >The fix for bug 11818 is in master, so I suppose it will eventually make its way to a Samba release. Rowland
The attachment "https://bugzilla.samba.org/attachment.cgi?id=11953" that you submitted to "https://bugzilla.samba.org/show_bug.cgi?id=11818" contains the following: - remove_dc.remove_sysvol_references(remote_samdb, dc_name) + remove_dc.remove_sysvol_references(remote_samdb, logger, dc_name) Yet, on a post to "https://lists.samba.org/archive/samba/2016-March/198662.html" you wrote: HI, it would seem you have found a bug, line 943 in 'domain.py' sends this: remove_dc.remove_sysvol_references(remote_samdb, dc_name) to 'remove_dc.py' , which expects to receive this: def remove_sysvol_references(samdb, logger, dc_name): Looking at the code in 'remove_dc.py' (line 37), it looks like the correct patch would be: - remove_dc.remove_sysvol_references(remote_samdb, dc_name) + remove_dc.remove_sysvol_references(samdb, logger, dc_name) Is this correct?
On 30/04/16 22:25, Miguel Medalha wrote:> The attachment "https://bugzilla.samba.org/attachment.cgi?id=11953" > that you submitted to > "https://bugzilla.samba.org/show_bug.cgi?id=11818" contains the > following: > > - remove_dc.remove_sysvol_references(remote_samdb, dc_name) > + remove_dc.remove_sysvol_references(remote_samdb, logger, > dc_name) > > > Yet, on a post to > "https://lists.samba.org/archive/samba/2016-March/198662.html" you wrote: > > > HI, it would seem you have found a bug, line 943 in 'domain.py' sends > this: > > remove_dc.remove_sysvol_references(remote_samdb, dc_name) > > to 'remove_dc.py' , which expects to receive this: > > def remove_sysvol_references(samdb, logger, dc_name): > > Looking at the code in 'remove_dc.py' (line 37), it looks like the > correct patch would be: > > - remove_dc.remove_sysvol_references(remote_samdb, dc_name) > + remove_dc.remove_sysvol_references(samdb, logger, dc_name) > > > Is this correct? >No, read the lines above 943 in domain.py Rowland