r25920: ndr: change NTSTAUS into enum ndr_err_code (samba4 callers)

lib/messaging/
lib/registry/
lib/ldb-samba/
librpc/rpc/
auth/auth_winbind.c
auth/gensec/
auth/kerberos/
dsdb/repl/
dsdb/samdb/
dsdb/schema/
torture/
cluster/ctdb/
kdc/
ntvfs/ipc/
torture/rap/
ntvfs/
utils/getntacl.c
ntptr/
smb_server/
libcli/wrepl/
wrepl_server/
libcli/cldap/
libcli/dgram/
libcli/ldap/
libcli/raw/
libcli/nbt/
libnet/
winbind/
rpc_server/

metze
(This used to be commit 6223c7fddc972687eb577e04fc1c8e0604c35435)

1 files changed, 17 insertions, 14 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/entryUUID.c b/source4/dsdb/samdb/ldb_modules/entryUUID.c
index 1a16cb8321..f4231d20d3 100644
--- a/source4/dsdb/samdb/ldb_modules/entryUUID.c
+++ b/source4/dsdb/samdb/ldb_modules/entryUUID.c
@@ -43,14 +43,15 @@ static struct ldb_val encode_guid(struct ldb_module *module, TALLOC_CTX *ctx, co
 {
 	struct GUID guid;
 	NTSTATUS status = GUID_from_string((char *)val->data, &guid);
+	enum ndr_err_code ndr_err;
 	struct ldb_val out = data_blob(NULL, 0);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return out;
 	}
-	status = ndr_push_struct_blob(&out, ctx, &guid, 
-				      (ndr_push_flags_fn_t)ndr_push_GUID);
-	if (!NT_STATUS_IS_OK(status)) {
+	ndr_err = ndr_push_struct_blob(&out, ctx, &guid,
+				       (ndr_push_flags_fn_t)ndr_push_GUID);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		return out;
 	}
 
@@ -60,18 +61,19 @@ static struct ldb_val encode_guid(struct ldb_module *module, TALLOC_CTX *ctx, co
 static struct ldb_val guid_always_string(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
 {
 	struct GUID *guid;
-	NTSTATUS status;
 	struct ldb_val out = data_blob(NULL, 0);
 	if (val->length >= 32 && val->data[val->length] == '\0') {
 		ldb_handler_copy(module->ldb, ctx, val, &out);
 	} else {
+		enum ndr_err_code ndr_err;
+
 		guid = talloc(ctx, struct GUID);
 		if (guid == NULL) {
 			return out;
 		}
-		status = ndr_pull_struct_blob(val, guid, guid, 
-					      (ndr_pull_flags_fn_t)ndr_pull_GUID);
-		if (!NT_STATUS_IS_OK(status)) {
+		ndr_err = ndr_pull_struct_blob(val, guid, guid,
+					       (ndr_pull_flags_fn_t)ndr_pull_GUID);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			talloc_free(guid);
 			return out;
 		}
@@ -85,14 +87,15 @@ static struct ldb_val encode_ns_guid(struct ldb_module *module, TALLOC_CTX *ctx,
 {
 	struct GUID guid;
 	NTSTATUS status = NS_GUID_from_string((char *)val->data, &guid);
+	enum ndr_err_code ndr_err;
 	struct ldb_val out = data_blob(NULL, 0);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return out;
 	}
-	status = ndr_push_struct_blob(&out, ctx, &guid, 
-				      (ndr_push_flags_fn_t)ndr_push_GUID);
-	if (!NT_STATUS_IS_OK(status)) {
+	ndr_err = ndr_push_struct_blob(&out, ctx, &guid,
+				       (ndr_push_flags_fn_t)ndr_push_GUID);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		return out;
 	}
 
@@ -101,21 +104,21 @@ static struct ldb_val encode_ns_guid(struct ldb_module *module, TALLOC_CTX *ctx,
 
 static struct ldb_val guid_ns_string(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
 {
-	NTSTATUS status;
 	struct ldb_val out = data_blob(NULL, 0);
 	if (val->length >= 32 && val->data[val->length] == '\0') {
 		struct GUID guid;
 		GUID_from_string((char *)val->data, &guid);
 		out = data_blob_string_const(NS_GUID_string(ctx, &guid));
 	} else {
+		enum ndr_err_code ndr_err;
 		struct GUID *guid_p;
 		guid_p = talloc(ctx, struct GUID);
 		if (guid_p == NULL) {
 			return out;
 		}
-		status = ndr_pull_struct_blob(val, guid_p, guid_p, 
-					      (ndr_pull_flags_fn_t)ndr_pull_GUID);
-		if (!NT_STATUS_IS_OK(status)) {
+		ndr_err = ndr_pull_struct_blob(val, guid_p, guid_p,
+					       (ndr_pull_flags_fn_t)ndr_pull_GUID);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			talloc_free(guid_p);
 			return out;
 		}