[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3075-g41aed9f
Jeremy Allison
jra at samba.org
Sun Oct 5 21:36:54 GMT 2008
The branch, v3-2-test has been updated
via 41aed9f2f3c6d53e1b8b6d72467bc5d5a0689dce (commit)
via 1709a099c82e9b06771b3aa562c5488a71f10c62 (commit)
via af055bb8d89a14ed572f76b5f8fe492e0ed98e12 (commit)
via e56b0b947a5c357c4e84b330c38d7a7f569be201 (commit)
from 52365077e74e80959a42aa82cf9a6c959e2fcda5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 41aed9f2f3c6d53e1b8b6d72467bc5d5a0689dce
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:34:58 2008 -0700
Remove an unused variable
commit 1709a099c82e9b06771b3aa562c5488a71f10c62
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:34:01 2008 -0700
Fix some missing error handlings
commit af055bb8d89a14ed572f76b5f8fe492e0ed98e12
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:29:50 2008 -0700
OS/X does not have rl_done in readline.h
commit e56b0b947a5c357c4e84b330c38d7a7f569be201
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 5 14:28:33 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/getdc.c | 5 +++++
source/lib/readline.c | 8 ++++++++
source/libsmb/dsgetdcname.c | 2 ++
source/utils/net_dns.c | 1 -
4 files changed, 15 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/getdc.c b/source/lib/netapi/getdc.c
index c1d021b..e03660c 100644
--- a/source/lib/netapi/getdc.c
+++ b/source/lib/netapi/getdc.c
@@ -60,6 +60,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/readline.c b/source/lib/readline.c
index fd57799..cf7809b 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 8d75593..2b8f76a 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
More information about the samba-cvs
mailing list