[SCM] Samba Shared Repository - branch master updated - 8670235f2a2b9ef4b6863c185bd2ab57acd7e57a

[Volker Lendecke]

The branch, master has been updated
       via  8670235f2a2b9ef4b6863c185bd2ab57acd7e57a (commit)
      from  01ecd766c86ad49c7d8b9095bef76b5dcc71d757 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8670235f2a2b9ef4b6863c185bd2ab57acd7e57a
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 5 13:58:09 2008 +0200

    Fix some missing error handlings

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/netapi/file.c  |    3 ++-
 source3/lib/netapi/getdc.c |    4 ++++
 source3/lib/netapi/share.c |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 036af32..0d66be0 100644
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -47,7 +47,8 @@ WERROR NetFileClose_r(struct libnetapi_ctx *ctx,
 					    r->in.server_name,
 					    r->in.fileid,
 					    &werr);
-	if (!W_ERROR_IS_OK(werr)) {
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
 		goto done;
 	}
 
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 07a6544..76c0d0b 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -58,6 +58,10 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx,
 				       r->in.domain_name,
 				       (const char **)r->out.buffer,
 				       &werr);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+	}
  done:
 
 	return werr;
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index 1d0e181..e6aed36 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -271,7 +271,8 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
 					   r->in.net_name,
 					   r->in.reserved,
 					   &werr);
-	if (!W_ERROR_IS_OK(werr)) {
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
 		goto done;
 	}
 


-- 
Samba Shared Repository