From dde2b66341d5addbb80a239b8ccab58af1f3fc24 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 8 Jan 2010 12:54:42 +1100 Subject: s4-samba3sid: fixed error returns when res->count != 1 and oom --- source4/dsdb/samdb/ldb_modules/samba3sid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/samba3sid.c b/source4/dsdb/samdb/ldb_modules/samba3sid.c index bb4b58be3f..76848eb258 100644 --- a/source4/dsdb/samdb/ldb_modules/samba3sid.c +++ b/source4/dsdb/samdb/ldb_modules/samba3sid.c @@ -69,7 +69,7 @@ static int samba3sid_next_sid(struct ldb_module *module, ": Expected exactly 1 domain object - got %u", res->count); talloc_free(tmp_ctx); - return ret; + return LDB_ERR_OPERATIONS_ERROR; } msg = res->msgs[0]; @@ -84,7 +84,7 @@ static int samba3sid_next_sid(struct ldb_module *module, ": No sambaSID in %s", ldb_dn_get_linearized(msg->dn)); talloc_free(tmp_ctx); - return ret; + return LDB_ERR_OPERATIONS_ERROR; } /* choose the highest of the 3 - see pdb_ldap.c for an @@ -102,7 +102,7 @@ static int samba3sid_next_sid(struct ldb_module *module, ": No sambaNextRid in %s", ldb_dn_get_linearized(msg->dn)); talloc_free(tmp_ctx); - return ret; + return LDB_ERR_OPERATIONS_ERROR; } /* sambaNextRid is actually the previous RID .... */ -- cgit