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)

4 files changed, 52 insertions, 37 deletions

diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index 3e78378732..3b5f67118f 100644
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -34,14 +34,15 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
 				    struct nbt_browse_packet *request)
 {
 	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 	DATA_BLOB blob;
 	TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 
-	status = ndr_push_struct_blob(&blob, tmp_ctx, request, 
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, request,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
-		return status;
+		return ndr_map_error2ntstatus(ndr_err);
 	}
 
 	status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE, 
@@ -58,16 +59,17 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
 				     struct nbt_browse_packet *reply)
 {
 	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 	DATA_BLOB blob;
 	TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 	struct nbt_name myname;
 	struct socket_address *dest;
 
-	status = ndr_push_struct_blob(&blob, tmp_ctx, reply, 
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, reply,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
-		return status;
+		return ndr_map_error2ntstatus(ndr_err);
 	}
 
 	make_nbt_name_client(&myname, lp_netbios_name(global_loadparm));
@@ -94,13 +96,14 @@ NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot,
 				     struct nbt_browse_packet *pkt)
 {
 	DATA_BLOB data = dgram_mailslot_data(dgram);
-	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 
-	status = ndr_pull_struct_blob(&data, mem_ctx, pkt, 
+	ndr_err = ndr_pull_struct_blob(&data, mem_ctx, pkt,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_browse_packet);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Failed to parse browse packet of length %d\n", 
-			 (int)data.length));
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
+		DEBUG(0,("Failed to parse browse packet of length %d: %s\n",
+			 (int)data.length, nt_errstr(status)));
 		if (DEBUGLVL(10)) {
 			file_save("browse.dat", data.data, data.length);
 		}
diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 1097c30f99..1af252c0bf 100644
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -39,6 +39,7 @@ static void dgm_socket_recv(struct nbt_dgram_socket *dgmsock)
 	size_t nread, dsize;
 	struct nbt_dgram_packet *packet;
 	const char *mailslot_name;
+	enum ndr_err_code ndr_err;
 
 	status = socket_pending(dgmsock->sock, &dsize);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -70,9 +71,10 @@ static void dgm_socket_recv(struct nbt_dgram_socket *dgmsock)
 	}
 
 	/* parse the request */
-	status = ndr_pull_struct_blob(&blob, packet, packet, 
+	ndr_err = ndr_pull_struct_blob(&blob, packet, packet,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_dgram_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		status = ndr_map_error2ntstatus(ndr_err);
 		DEBUG(2,("Failed to parse incoming NBT DGRAM packet - %s\n",
 			 nt_errstr(status)));
 		talloc_free(tmp_ctx);
@@ -218,6 +220,7 @@ NTSTATUS nbt_dgram_send(struct nbt_dgram_socket *dgmsock,
 {
 	struct nbt_dgram_request *req;
 	NTSTATUS status = NT_STATUS_NO_MEMORY;
+	enum ndr_err_code ndr_err;
 
 	req = talloc(dgmsock, struct nbt_dgram_request);
 	if (req == NULL) goto failed;
@@ -225,9 +228,12 @@ NTSTATUS nbt_dgram_send(struct nbt_dgram_socket *dgmsock,
 	req->dest = dest;
 	if (talloc_reference(req, dest) == NULL) goto failed;
 
-	status = ndr_push_struct_blob(&req->encoded, req, packet, 
+	ndr_err = ndr_push_struct_blob(&req->encoded, req, packet,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_dgram_packet);
-	if (!NT_STATUS_IS_OK(status)) goto failed;
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		status = ndr_map_error2ntstatus(ndr_err);
+		goto failed;
+	}
 
 	DLIST_ADD_END(dgmsock->send_queue, req, struct nbt_dgram_request *);
 
diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index 3a5510b408..f89c2c5644 100644
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -36,14 +36,15 @@ NTSTATUS dgram_mailslot_netlogon_send(struct nbt_dgram_socket *dgmsock,
 				      struct nbt_netlogon_packet *request)
 {
 	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 	DATA_BLOB blob;
 	TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 
-	status = ndr_push_struct_blob(&blob, tmp_ctx, request, 
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, request,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_netlogon_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
-		return status;
+		return ndr_map_error2ntstatus(ndr_err);
 	}
 
 
@@ -65,16 +66,17 @@ NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock,
 				       struct nbt_netlogon_packet *reply)
 {
 	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 	DATA_BLOB blob;
 	TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 	struct nbt_name myname;
 	struct socket_address *dest;
 
-	status = ndr_push_struct_blob(&blob, tmp_ctx, reply, 
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, reply,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_netlogon_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
-		return status;
+		return ndr_map_error2ntstatus(ndr_err);
 	}
 
 	make_nbt_name_client(&myname, lp_netbios_name(global_loadparm));
@@ -105,13 +107,14 @@ NTSTATUS dgram_mailslot_netlogon_parse(struct dgram_mailslot_handler *dgmslot,
 				       struct nbt_netlogon_packet *netlogon)
 {
 	DATA_BLOB data = dgram_mailslot_data(dgram);
-	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 
-	status = ndr_pull_struct_blob(&data, mem_ctx, netlogon, 
+	ndr_err = ndr_pull_struct_blob(&data, mem_ctx, netlogon,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Failed to parse netlogon packet of length %d\n", 
-			 (int)data.length));
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
+		DEBUG(0,("Failed to parse netlogon packet of length %d: %s\n",
+			 (int)data.length, nt_errstr(status)));
 		if (DEBUGLVL(10)) {
 			file_save("netlogon.dat", data.data, data.length);
 		}
diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index a49f011bda..b4b548fb27 100644
--- a/source4/libcli/dgram/ntlogon.c
+++ b/source4/libcli/dgram/ntlogon.c
@@ -37,14 +37,15 @@ NTSTATUS dgram_mailslot_ntlogon_send(struct nbt_dgram_socket *dgmsock,
 				     struct nbt_ntlogon_packet *request)
 {
 	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 	DATA_BLOB blob;
 	TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 
-	status = ndr_push_struct_blob(&blob, tmp_ctx, request, 
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, request,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_ntlogon_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
-		return status;
+		return ndr_map_error2ntstatus(ndr_err);
 	}
 
 
@@ -66,16 +67,17 @@ NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock,
 				      struct nbt_ntlogon_packet *reply)
 {
 	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 	DATA_BLOB blob;
 	TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 	struct nbt_name myname;
 	struct socket_address *dest;
 
-	status = ndr_push_struct_blob(&blob, tmp_ctx, reply, 
+	ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, reply,
 				      (ndr_push_flags_fn_t)ndr_push_nbt_ntlogon_packet);
-	if (!NT_STATUS_IS_OK(status)) {
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		talloc_free(tmp_ctx);
-		return status;
+		return ndr_map_error2ntstatus(ndr_err);
 	}
 
 	make_nbt_name_client(&myname, lp_netbios_name(global_loadparm));
@@ -107,13 +109,14 @@ NTSTATUS dgram_mailslot_ntlogon_parse(struct dgram_mailslot_handler *dgmslot,
 				      struct nbt_ntlogon_packet *ntlogon)
 {
 	DATA_BLOB data = dgram_mailslot_data(dgram);
-	NTSTATUS status;
+	enum ndr_err_code ndr_err;
 
-	status = ndr_pull_struct_blob(&data, mem_ctx, ntlogon, 
+	ndr_err = ndr_pull_struct_blob(&data, mem_ctx, ntlogon,
 				      (ndr_pull_flags_fn_t)ndr_pull_nbt_ntlogon_packet);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Failed to parse ntlogon packet of length %d\n", 
-			 (int)data.length));
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
+		DEBUG(0,("Failed to parse ntlogon packet of length %d: %s\n",
+			 (int)data.length, nt_errstr(status)));
 		if (DEBUGLVL(10)) {
 			file_save("ntlogon.dat", data.data, data.length);
 		}