Attachment 10346 Details for Bug 10871 – Patch for master

[patch] Patch for master

0001-Add-exception-when-trying-to-add-remove-none-existen.patch (text/plain), 1.22 KB, created by Marc Muehlfeld (dead/inactive account) on 2014-10-12 15:01:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Muehlfeld (dead/inactive account)

Created: 2014-10-12 15:01:34 UTC

Size: 1.22 KB

patch

obsolete

>From 6379a9736f716db8723f2d570625d2251ce63917 Mon Sep 17 00:00:00 2001
>From: Marc Muehlfeld <mmuehlfeld@samba.org>
>Date: Sun, 12 Oct 2014 16:32:08 +0200
>Subject: [PATCH] Add exception when trying to add/remove none existent users
> from a group. This allows a better scripting around samba-tool for
> adding/removing users to/from groups. Before the output and the return code
> had indicated that everything was successul.
>
>See: https://bugzilla.samba.org/show_bug.cgi?id=10871
>
>Signed-off-by: Marc Muehlfeld <mmuehlfeld@samba.org>
>---
> python/samba/samdb.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/python/samba/samdb.py b/python/samba/samdb.py
>index 2dfc839..e6d99bc 100644
>--- a/python/samba/samdb.py
>+++ b/python/samba/samdb.py
>@@ -260,7 +260,7 @@ changetype: modify
>                     ldb.binary_encode(member), ldb.binary_encode(member)), attrs=[])
> 
>                 if len(targetmember) != 1:
>-                    continue
>+                    raise Exception('Unable to find "%s". Operation cancelled.' % member)
> 
>                 if add_members_operation is True and (targetgroup[0].get('member') is None or str(targetmember[0].dn) not in targetgroup[0]['member']):
>                     modified = True
>-- 
>1.9.3
>

Actions: View

Attachments on bug 10871: 10346