X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source4%2Fdsdb%2Fcommon%2Futil.c;h=411d1dd22b05d2d55fe674b5f9837b7d7b69cf45;hp=7cc9729bc3fef4f479afda47b95248b407959e84;hb=e18610a197aab80a32cae8c1e09b96496679bbad;hpb=a27c39c2c9fd3161f5bf3ae5dba687c8d49519ef

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 7cc9729bc3f..411d1dd22b0 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -342,7 +342,7 @@ uint32_t samdb_result_rid_from_sid(TALLOC_CTX *mem_ctx, const struct ldb_message
 struct dom_sid *samdb_result_dom_sid(TALLOC_CTX *mem_ctx, const struct ldb_message *msg, 
 				     const char *attr)
 {
-	bool ok;
+	struct sid_parse_ret ret;
 	const struct ldb_val *v;
 	struct dom_sid *sid;
 	v = ldb_msg_find_ldb_val(msg, attr);
@@ -353,8 +353,8 @@ struct dom_sid *samdb_result_dom_sid(TALLOC_CTX *mem_ctx, const struct ldb_messa
 	if (sid == NULL) {
 		return NULL;
 	}
-	ok = sid_parse(v->data, v->length, sid);
-	if (!ok) {
+	ret = sid_parse(v->data, v->length, sid);
+	if (ret.len == -1) {
 		talloc_free(sid);
 		return NULL;
 	}
@@ -5809,7 +5809,8 @@ static int dsdb_count_domain_callback(
 	case LDB_REPLY_ENTRY:
 	{
 		struct dsdb_count_domain_context *context = NULL;
-		bool ok, in_domain;
+		struct sid_parse_ret ret;
+		bool in_domain;
 		struct dom_sid sid;
 		const struct ldb_val *v;
 
@@ -5824,8 +5825,8 @@ static int dsdb_count_domain_callback(
 			break;
 		}
 
-		ok = sid_parse(v->data, v->length, &sid);
-		if (!ok) {
+		ret = sid_parse(v->data, v->length, &sid);
+		if (ret.len == -1) {
 			break;
 		}