From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Sun, 27 Mar 2011 20:14:56 +0000 (+0200)
Subject: s4:lib/policy/gp_ldap.c - make more use of LDB result constants
X-Git-Tag: ldb-1.1.0~378
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=32a76ca146104e94a974e23668e93464c2b35a9a;p=samba.git

s4:lib/policy/gp_ldap.c - make more use of LDB result constants

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Wed Mar 30 09:33:38 CEST 2011 on sn-devel-104
---

diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c
index 091af2ee16d..de56e4c5d2d 100644
--- a/source4/lib/policy/gp_ldap.c
+++ b/source4/lib/policy/gp_ldap.c
@@ -641,7 +641,7 @@ NTSTATUS gp_set_gplink(struct gp_context *gp_ctx, const char *dn_str, struct gp_
 	msg->dn = dn;
 
 	rv = ldb_msg_add_string(msg, "gPLink", gplink_str);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB message add string failed: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -649,7 +649,7 @@ NTSTATUS gp_set_gplink(struct gp_context *gp_ctx, const char *dn_str, struct gp_
 	msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
 
 	rv = ldb_modify(gp_ctx->ldb_ctx, msg);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -717,14 +717,14 @@ NTSTATUS gp_del_gplink(struct gp_context *gp_ctx, const char *dn_str, const char
 
 	if (strcmp(gplink_str, "") == 0) {
 		rv = ldb_msg_add_empty(msg, "gPLink", LDB_FLAG_MOD_DELETE, NULL);
-		if (rv != 0) {
+		if (rv != LDB_SUCCESS) {
 			DEBUG(0, ("LDB message add empty element failed: %s\n", ldb_strerror(rv)));
 			talloc_free(mem_ctx);
 			return NT_STATUS_UNSUCCESSFUL;
 		}
 	} else {
 		rv = ldb_msg_add_string(msg, "gPLink", gplink_str);
-		if (rv != 0) {
+		if (rv != LDB_SUCCESS) {
 			DEBUG(0, ("LDB message add string failed: %s\n", ldb_strerror(rv)));
 			talloc_free(mem_ctx);
 			return NT_STATUS_UNSUCCESSFUL;
@@ -732,7 +732,7 @@ NTSTATUS gp_del_gplink(struct gp_context *gp_ctx, const char *dn_str, const char
 		msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
 	}
 	rv = ldb_modify(gp_ctx->ldb_ctx, msg);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -789,7 +789,7 @@ NTSTATUS gp_set_inheritance(struct gp_context *gp_ctx, const char *dn_str, enum
 	NT_STATUS_HAVE_NO_MEMORY_AND_FREE(inheritance_string, msg);
 
 	rv = ldb_msg_add_string(msg, "gPOptions", inheritance_string);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB message add string failed: %s\n", ldb_strerror(rv)));
 		talloc_free(msg);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -797,7 +797,7 @@ NTSTATUS gp_set_inheritance(struct gp_context *gp_ctx, const char *dn_str, enum
 	msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
 
 	rv = ldb_modify(gp_ctx->ldb_ctx, msg);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
 		talloc_free(msg);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -963,7 +963,7 @@ NTSTATUS gp_set_ads_acl (struct gp_context *gp_ctx, const char *dn_str, const st
 	msg->dn = ldb_dn_new(mem_ctx, gp_ctx->ldb_ctx, dn_str);
 
 	rv = ldb_msg_add_value(msg, "nTSecurityDescriptor", &data, NULL);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB message add element failed for adding nTSecurityDescriptor: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -971,7 +971,7 @@ NTSTATUS gp_set_ads_acl (struct gp_context *gp_ctx, const char *dn_str, const st
 	msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
 
 	rv = ldb_modify(gp_ctx->ldb_ctx, msg);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -1003,7 +1003,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx, struct gp_object *gpo)
 	NT_STATUS_HAVE_NO_MEMORY_AND_FREE(msg, mem_ctx);
 
 	rv = ldb_msg_add_string(msg, "flags", flags_str);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB message add string failed for flags: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -1011,7 +1011,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx, struct gp_object *gpo)
 	msg->elements[0].flags = LDB_FLAG_MOD_REPLACE;
 
 	rv = ldb_msg_add_string(msg, "version", version_str);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB message add string failed for version: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -1019,7 +1019,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx, struct gp_object *gpo)
 	msg->elements[1].flags = LDB_FLAG_MOD_REPLACE;
 
 	rv = ldb_msg_add_string(msg, "displayName", gpo->display_name);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB message add string failed for displayName: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;
@@ -1027,7 +1027,7 @@ NTSTATUS gp_set_ldap_gpo(struct gp_context *gp_ctx, struct gp_object *gpo)
 	msg->elements[2].flags = LDB_FLAG_MOD_REPLACE;
 
 	rv = ldb_modify(gp_ctx->ldb_ctx, msg);
-	if (rv != 0) {
+	if (rv != LDB_SUCCESS) {
 		DEBUG(0, ("LDB modify failed: %s\n", ldb_strerror(rv)));
 		talloc_free(mem_ctx);
 		return NT_STATUS_UNSUCCESSFUL;