[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4222-ga7ba58e

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  a7ba58ebede769e944005adaecbeda237ba9b5e0 (commit)
       via  3a848570996c7df8c3230e0b3a9369b41658a650 (commit)
       via  02e303b3f08656e9bf1d59dc452c7f48f2cb0dea (commit)
       via  50b86766442f27748d8d16223c8cd68fd162eabc (commit)
      from  09d76244a1e3eeeb1396a707e78325320e4e4f9e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit a7ba58ebede769e944005adaecbeda237ba9b5e0
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 5 14:35:09 2008 -0700

    Remove an unused variable

commit 3a848570996c7df8c3230e0b3a9369b41658a650
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 5 14:33:48 2008 -0700

    Fix some missing error handlings

commit 02e303b3f08656e9bf1d59dc452c7f48f2cb0dea
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 5 14:30:01 2008 -0700

    OS/X does not have rl_done in readline.h

commit 50b86766442f27748d8d16223c8cd68fd162eabc
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 5 14:28:02 2008 -0700

    Fix an uninitialized variable warning
    
    Not sure if we can ever not get domain and dns_domain, but gcc complained

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

Summary of changes:
 source/lib/netapi/file.c    |    3 ++-
 source/lib/netapi/getdc.c   |    5 +++++
 source/lib/netapi/share.c   |    3 ++-
 source/lib/readline.c       |    8 ++++++++
 source/libsmb/dsgetdcname.c |    2 ++
 source/utils/net_dns.c      |    1 -
 6 files changed, 19 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/file.c b/source/lib/netapi/file.c
index 036af32..0d66be0 100644
--- a/source/lib/netapi/file.c
+++ b/source/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/source/lib/netapi/getdc.c b/source/lib/netapi/getdc.c
index 07a6544..4069046 100644
--- a/source/lib/netapi/getdc.c
+++ b/source/lib/netapi/getdc.c
@@ -58,6 +58,11 @@ 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/source/lib/netapi/share.c b/source/lib/netapi/share.c
index 1d0e181..e6aed36 100644
--- a/source/lib/netapi/share.c
+++ b/source/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;
 	}
 
diff --git a/source/lib/readline.c b/source/lib/readline.c
index fd57799..cafb5a9 100644
--- a/source/lib/readline.c
+++ b/source/lib/readline.c
@@ -47,6 +47,14 @@
 
 static bool smb_rl_done;
 
+#if HAVE_LIBREADLINE
+/*
+ * MacOS/X does not have rl_done in readline.h, but
+ * readline.so has it
+ */
+extern int rl_done;
+#endif
+
 void smb_readline_done(void)
 {
 	smb_rl_done = true;
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 2a445cb..0714aa7 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -356,6 +356,8 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx,
 		}
 	}
 
+	status = NT_STATUS_OK;
+
  done:
 	data_blob_free(&blob);
 
diff --git a/source/utils/net_dns.c b/source/utils/net_dns.c
index 46f38d4..4e617a1 100644
--- a/source/utils/net_dns.c
+++ b/source/utils/net_dns.c
@@ -145,7 +145,6 @@ error:
 int get_my_ip_address( struct sockaddr_storage **pp_ss )
 
 {
-	struct iface_struct nics[MAX_INTERFACES];
 	int i, n;
 	struct sockaddr_storage *list = NULL;
 	int count = 0;


-- 
Samba Shared Repository