[SCM] Samba Shared Repository - branch v4-4-test updated
Karolin Seeger
kseeger at samba.org
Tue Aug 16 14:27:04 UTC 2016
The branch, v4-4-test has been updated
via 1305ba6 libgpo: Correctly use the 'server' parameter after parsing it out of the GPO path.
via fcb7910 s3: libsmb: Protect cli_connect_nb_send() from being passed a NULL hostname and dest_ss.
from 39b4580 ldb-samba: Add "secret" as a value to hide in LDIF files
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -----------------------------------------------------------------
commit 1305ba67565976466aa6ebc4dd4f50dd34374002
Author: Jeremy Allison <jra at samba.org>
Date: Tue Aug 9 11:57:20 2016 -0700
libgpo: Correctly use the 'server' parameter after parsing it out of the GPO path.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12135
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Uri Simchoni <uri at samba.org>
(cherry picked from commit 2a8ccc0841184c2df9fc19f8452009b92071c115)
Autobuild-User(v4-4-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-4-test): Tue Aug 16 16:26:28 CEST 2016 on sn-devel-144
commit fcb7910f790e3675952028bb0e209df7379ed470
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 8 16:53:21 2016 -0700
s3: libsmb: Protect cli_connect_nb_send() from being passed a NULL hostname and dest_ss.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12135
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Uri Simchoni <uri at samba.org>
(cherry picked from commit 27ebf64b347a770e0d1ad4f1db645cb1b8dd5861)
-----------------------------------------------------------------------
Summary of changes:
libgpo/gpo_fetch.c | 2 +-
source3/libsmb/cliconnect.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 07141d4..6b01544 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -166,7 +166,7 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
/* for now reuse the existing ds connection */
- result = gpo_connect_server(ads, ads->server.ldap_server, service, &cli);
+ result = gpo_connect_server(ads, server, service, &cli);
NT_STATUS_NOT_OK_RETURN(result);
result = gpo_prepare_local_store(mem_ctx, cache_dir, unix_path);
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ebba8f2..33759d9 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3108,11 +3108,15 @@ static struct tevent_req *cli_connect_nb_send(
}
state->desthost = host;
- } else {
+ } else if (dest_ss != NULL) {
state->desthost = print_canonical_sockaddr(state, dest_ss);
if (tevent_req_nomem(state->desthost, req)) {
return tevent_req_post(req, ev);
}
+ } else {
+ /* No host or dest_ss given. Error out. */
+ tevent_req_error(req, EINVAL);
+ return tevent_req_post(req, ev);
}
subreq = cli_connect_sock_send(state, ev, host, name_type, dest_ss,
--
Samba Shared Repository
More information about the samba-cvs
mailing list