[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

On Wed, 2009-10-07 at 17:19 -0500, Matthias Dieter Wallnöfer wrote:
> commit f9990e9b391f330a8e6c5c158ee4e4eaa50f6176
> Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
> Date:   Wed Oct 7 23:49:29 2009 +0200
> 
>     s4:ldb - add a check which has to be done on beginning of a
> "modify" operation

> diff --git a/source4/lib/ldb/common/ldb.c
> b/source4/lib/ldb/common/ldb.c
> index e9c9245..4c27de7 100644
> --- a/source4/lib/ldb/common/ldb.c
> +++ b/source4/lib/ldb/common/ldb.c
> @@ -1358,6 +1358,14 @@ int ldb_modify(struct ldb_context *ldb,
>                 return ret;
>         }
> 
> +       if (message->num_elements == 0) {
> +               /* this needs also to be returned when the specified
> object
> +                  doesn't exist. Therefore this test is located here.
> */
> +               ldb_asprintf_errstring(ldb, "LDB message has to have
> elements/attributes (%s)!",
> +
> ldb_dn_get_linearized(message->dn));
> +               return LDB_ERR_UNWILLING_TO_PERFORM;
> +       }
> +
>         ret = ldb_build_mod_req(&req, ldb, ldb,
>                                         message,
>                                         NULL,

Matthias,

I really don't think this belongs in the general LDB code, for a few
reasons:
 - It now means we cannot test this assumption, as the ldap.py uses LDB,
and will now always trigger this check, even against remote servers
 - Our 'make test' now fails because this is triggered by our own code
 - It imposes an AD-specific restriction on the general LDB, which is
meant to be easier to work with
   - That is, it seems quite reasonable to process (as a no-op) such an
ldb_modify.  

If AD gives an error on this, and we want to give the same error, we
should write a Samba4 ldb module to give that error. 

As such, can you please revert this?

Thanks,

Andrew Bartlett


-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Cisco Inc.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20091012/9f047ebd/attachment.pgp>