The branch, master has been updated
via d2ebe2d libnet: only create local private krb5.conf if joining an
AD domain
via 9a274d9 winbind: honor 'socket options' in winbind
from c3dfeb3 s4: dns: Correctly check for talloc failure.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d2ebe2d17d9606dc1f06bd5206ee09711ae0f3da
Author: Michael Adam <ob...@samba.org>
Date: Thu Jun 16 00:15:00 2016 +0200
libnet: only create local private krb5.conf if joining an AD domain
This prevents irritating warning messages.
Signed-off-by: Michael Adam <ob...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Jun 17 08:13:55 CEST 2016 on sn-devel-144
commit 9a274d9ae76ddad9a0b609bddfa007afee61c0ca
Author: Jim McDonough <j...@samba.org>
Date: Wed Jun 15 15:57:01 2016 -0400
winbind: honor 'socket options' in winbind
Set socket options from smb.conf before negprot, as done by libsmbclient
Signed-off-by: Jim McDonough <j...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/libnet/libnet_join.c | 8 +++++---
source3/winbindd/winbindd_cm.c | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index abb9cff..0a23e0d 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -2515,9 +2515,11 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
#ifdef HAVE_ADS
- create_local_private_krb5_conf_for_domain(
- r->out.dns_domain_name, r->out.netbios_domain_name,
- sitename, smbXcli_conn_remote_sockaddr(cli->conn));
+ if (r->out.domain_is_ad) {
+ create_local_private_krb5_conf_for_domain(
+ r->out.dns_domain_name, r->out.netbios_domain_name,
+ sitename, smbXcli_conn_remote_sockaddr(cli->conn));
+ }
if (r->out.domain_is_ad &&
!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 1de731a..e18f638 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1055,6 +1055,8 @@ static NTSTATUS cm_prepare_connection(struct
winbindd_domain *domain,
cli_set_timeout(*cli, 10000); /* 10 seconds */
+ set_socket_options(sockfd, lp_socket_options());
+
result = smbXcli_negprot((*cli)->conn, (*cli)->timeout,
lp_client_ipc_min_protocol(),
lp_client_ipc_max_protocol());
--
Samba Shared Repository
