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)

2 files changed, 40 insertions, 32 deletions

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index ff853018a2..c592bf8de0 100644
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -79,13 +79,14 @@ WERROR dsdb_load_oid_mappings_ldb(struct dsdb_schema *schema,
 				  const struct ldb_val *schemaInfo)
 {
 	WERROR status;
-	NTSTATUS nt_status;
+	enum ndr_err_code ndr_err;
 	struct prefixMapBlob pfm;
 	char *schema_info;
 
-	nt_status = ndr_pull_struct_blob(prefixMap, schema, &pfm,
-					 (ndr_pull_flags_fn_t)ndr_pull_prefixMapBlob);
-	if (!NT_STATUS_IS_OK(nt_status)) {
+	ndr_err = ndr_pull_struct_blob(prefixMap, schema, &pfm,
+				       (ndr_pull_flags_fn_t)ndr_pull_prefixMapBlob);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err);
 		return ntstatus_to_werror(nt_status);
 	}
 
@@ -160,7 +161,7 @@ WERROR dsdb_get_oid_mappings_ldb(const struct dsdb_schema *schema,
 				 struct ldb_val *schemaInfo)
 {
 	WERROR status;
-	NTSTATUS nt_status;
+	enum ndr_err_code ndr_err;
 	struct drsuapi_DsReplicaOIDMapping_Ctr *ctr;
 	struct prefixMapBlob pfm;
 
@@ -171,10 +172,11 @@ WERROR dsdb_get_oid_mappings_ldb(const struct dsdb_schema *schema,
 	pfm.reserved	= 0;
 	pfm.ctr.dsdb	= *ctr;
 
-	nt_status = ndr_push_struct_blob(prefixMap, mem_ctx, &pfm,
-					 (ndr_push_flags_fn_t)ndr_push_prefixMapBlob);
+	ndr_err = ndr_push_struct_blob(prefixMap, mem_ctx, &pfm,
+				       (ndr_push_flags_fn_t)ndr_push_prefixMapBlob);
 	talloc_free(ctr);
-	if (!NT_STATUS_IS_OK(nt_status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err);
 		return ntstatus_to_werror(nt_status);
 	}
 
@@ -652,11 +654,12 @@ static struct drsuapi_DsReplicaAttribute *dsdb_find_object_attr_name(struct dsdb
 	if (_a && _a->value_ctr.num_values >= 1 \
 	    && _a->value_ctr.values[0].blob) { \
 		struct drsuapi_DsReplicaObjectIdentifier3 _id3; \
-		NTSTATUS _nt_status; \
-		_nt_status = ndr_pull_struct_blob_all(_a->value_ctr.values[0].blob, \
+		enum ndr_err_code _ndr_err; \
+		_ndr_err = ndr_pull_struct_blob_all(_a->value_ctr.values[0].blob, \
 						      mem_ctx, &_id3,\
 						      (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3);\
-		if (!NT_STATUS_IS_OK(_nt_status)) { \
+		if (!NDR_ERR_CODE_IS_SUCCESS(_ndr_err)) { \
+			NTSTATUS _nt_status = ndr_map_error2ntstatus(_ndr_err); \
 			return ntstatus_to_werror(_nt_status); \
 		} \
 		(p)->elem = _id3.dn; \
@@ -713,11 +716,12 @@ static struct drsuapi_DsReplicaAttribute *dsdb_find_object_attr_name(struct dsdb
 	if (_a && _a->value_ctr.num_values >= 1 \
 	    && _a->value_ctr.values[0].blob \
 	    && _a->value_ctr.values[0].blob->length == 16) { \
-	    	NTSTATUS _nt_status; \
-		_nt_status = ndr_pull_struct_blob_all(_a->value_ctr.values[0].blob, \
+		enum ndr_err_code _ndr_err; \
+		_ndr_err = ndr_pull_struct_blob_all(_a->value_ctr.values[0].blob, \
 						      mem_ctx, &(p)->elem, \
 						      (ndr_pull_flags_fn_t)ndr_pull_GUID); \
-		if (!NT_STATUS_IS_OK(_nt_status)) { \
+		if (!NDR_ERR_CODE_IS_SUCCESS(_ndr_err)) { \
+			NTSTATUS _nt_status = ndr_map_error2ntstatus(_ndr_err); \
 			return ntstatus_to_werror(_nt_status); \
 		} \
 	} else { \
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 760417b676..dd2da4f0f7 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -839,7 +839,7 @@ static WERROR dsdb_syntax_DN_drsuapi_to_ldb(const struct dsdb_schema *schema,
 
 	for (i=0; i < out->num_values; i++) {
 		struct drsuapi_DsReplicaObjectIdentifier3 id3;
-		NTSTATUS status;
+		enum ndr_err_code ndr_err;
 
 		if (in->value_ctr.values[i].blob == NULL) {
 			return WERR_FOOBAR;
@@ -849,10 +849,11 @@ static WERROR dsdb_syntax_DN_drsuapi_to_ldb(const struct dsdb_schema *schema,
 			return WERR_FOOBAR;
 		}
 
-		status = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob,
-						  out->values, &id3,
-						  (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3);
-		if (!NT_STATUS_IS_OK(status)) {
+		ndr_err = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob,
+						   out->values, &id3,
+						   (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
 			return ntstatus_to_werror(status);
 		}
 
@@ -887,8 +888,8 @@ static WERROR dsdb_syntax_DN_ldb_to_drsuapi(const struct dsdb_schema *schema,
 	W_ERROR_HAVE_NO_MEMORY(blobs);
 
 	for (i=0; i < in->num_values; i++) {
-		NTSTATUS status;
 		struct drsuapi_DsReplicaObjectIdentifier3 id3;
+		enum ndr_err_code ndr_err;
 
 		out->value_ctr.values[i].blob	= &blobs[i];
 
@@ -896,9 +897,10 @@ static WERROR dsdb_syntax_DN_ldb_to_drsuapi(const struct dsdb_schema *schema,
 		ZERO_STRUCT(id3);
 		id3.dn = (const char *)in->values[i].data;
 
-		status = ndr_push_struct_blob(&blobs[i], blobs, &id3,
-					      (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3);
-		if (!NT_STATUS_IS_OK(status)) {
+		ndr_err = ndr_push_struct_blob(&blobs[i], blobs, &id3,
+					       (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
 			return ntstatus_to_werror(status);
 		}
 	}
@@ -926,7 +928,7 @@ static WERROR dsdb_syntax_DN_BINARY_drsuapi_to_ldb(const struct dsdb_schema *sch
 		struct drsuapi_DsReplicaObjectIdentifier3Binary id3b;
 		char *binary;
 		char *str;
-		NTSTATUS status;
+		enum ndr_err_code ndr_err;
 
 		if (in->value_ctr.values[i].blob == NULL) {
 			return WERR_FOOBAR;
@@ -936,10 +938,11 @@ static WERROR dsdb_syntax_DN_BINARY_drsuapi_to_ldb(const struct dsdb_schema *sch
 			return WERR_FOOBAR;
 		}
 
-		status = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob,
-						  out->values, &id3b,
-						  (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3Binary);
-		if (!NT_STATUS_IS_OK(status)) {
+		ndr_err = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob,
+						   out->values, &id3b,
+						   (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3Binary);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
 			return ntstatus_to_werror(status);
 		}
 
@@ -984,8 +987,8 @@ static WERROR dsdb_syntax_DN_BINARY_ldb_to_drsuapi(const struct dsdb_schema *sch
 	W_ERROR_HAVE_NO_MEMORY(blobs);
 
 	for (i=0; i < in->num_values; i++) {
-		NTSTATUS status;
 		struct drsuapi_DsReplicaObjectIdentifier3Binary id3b;
+		enum ndr_err_code ndr_err;
 
 		out->value_ctr.values[i].blob	= &blobs[i];
 
@@ -994,9 +997,10 @@ static WERROR dsdb_syntax_DN_BINARY_ldb_to_drsuapi(const struct dsdb_schema *sch
 		id3b.dn		= (const char *)in->values[i].data;
 		id3b.binary	= data_blob(NULL, 0);
 
-		status = ndr_push_struct_blob(&blobs[i], blobs, &id3b,
-					      (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary);
-		if (!NT_STATUS_IS_OK(status)) {
+		ndr_err = ndr_push_struct_blob(&blobs[i], blobs, &id3b,
+					       (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
 			return ntstatus_to_werror(status);
 		}
 	}