[PATCH] Bug 11818

[Jeremy Allison]

On Thu, Mar 31, 2016 at 01:38:30PM +0100, Rowland Penny wrote:
> 
> Obvious bug in cmd_domain_demote in domain.py, line 943 is this:
> 
>         remove_dc.remove_sysvol_references(remote_samdb, dc_name)
> 
> 'remove_sysvol_references' expects 'samdb, logger, dc_name'

LGTM - pushed. Thanks !

> From a3bb3007ed6e44bb6c668b85e4209a5d9c88f580 Mon Sep 17 00:00:00 2001
> From: Rowland Penny <rpenny at samba.org>
> Date: Thu, 31 Mar 2016 13:24:28 +0100
> Subject: [PATCH 2/2] Bug 11818 : obvious missing word When trying to demote a
>  dc, 'remove_dc.remove_sysvol_references' is sent
>  'remote_samdb, dc_name' , it expects 'remote_samdb,
>  logger, dc_name'
> 
> Signed-off-by: Rowland Penny <rpenny at samba.org>
> ---
>  python/samba/netcmd/domain.py |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
> index 6357144..68775ec 100644
> --- a/python/samba/netcmd/domain.py
> +++ b/python/samba/netcmd/domain.py
> @@ -940,7 +940,7 @@ class cmd_domain_demote(Command):
>              else:
>                  raise CommandError("Error while sending a removeDsServer of %s: " % server_dsa_dn, e)
>  
> -        remove_dc.remove_sysvol_references(remote_samdb, dc_name)
> +        remove_dc.remove_sysvol_references(remote_samdb, logger, dc_name)
>  
>          # These are objects under the computer account that should be deleted
>          for s in ("CN=Enterprise,CN=NTFRS Subscriptions",
> -- 
> 1.7.10.4
>