The branch, v4-3-test has been updated via 1f29432 s3: winbind: Prevent null ptr access by returning error if no creds available via a373495 s3: rpcclient: Prevent null ptr access by returning error if no creds available via 136df8c s3: smbd: If EA's are turned off on a share don't allow an SMB2 create containing them. via 7dceba3 vfs_gpfs: Re-enable share modes via 3542761 texpect: undefined symbol rep_fprintf from 2aa391a Changing log level of two entries to DBG_NOTICE
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test - Log ----------------------------------------------------------------- commit 1f29432e51c8519d9d4f7602001e276f5437f2ff Author: Noel Power <noel.po...@suse.com> Date: Thu Oct 22 12:37:17 2015 +0100 s3: winbind: Prevent null ptr access by returning error if no creds available Prevent rpccli_netlogon_network_logon/rpccli_netlogon_password_logon being called with 'NULL' credentials BUG: https://bugzilla.samba.org/show_bug.cgi?id=11569 Signed-off-by: Noel Power <noel.po...@suse.com> Reviewed-by: Jeremy Allison <j...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> (cherry picked from commit e8fab02773892812f563eea7098847618df76e1b) Autobuild-User(v4-3-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-3-test): Mon Nov 16 13:33:26 CET 2015 on sn-devel-104 commit a3734950c0be24004e7c3c5104ea1a59b4f879c7 Author: Noel Power <noel.po...@suse.com> Date: Mon Nov 2 09:59:12 2015 +0000 s3: rpcclient: Prevent null ptr access by returning error if no creds available Prevent rpccli_netlogon_password_logon being called with 'NULL' credentials. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11569 Signed-off-by: Noel Power <noel.po...@suse.com> Reviewed-by: Jeremy Allison <j...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> (cherry picked from commit 89940f39c6d2db03b3a468942d686e762f126f9f) commit 136df8cbe168d28d1259051eeea769332045d29b Author: Jeremy Allison <j...@samba.org> Date: Wed Nov 4 09:34:57 2015 -0800 s3: smbd: If EA's are turned off on a share don't allow an SMB2 create containing them. Otherwise a create that should have failed may succeed. Based on an original patch from John Mulligan <phlogistonj...@asynchrono.us> and comments from Uri Simchoni <u...@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=11589 Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Uri Simchoni <u...@samba.org> Autobuild-User(master): Uri Simchoni <u...@samba.org> Autobuild-Date(master): Wed Nov 4 22:14:22 CET 2015 on sn-devel-104 (cherry picked from commit aa3cc0b459124c66de0aad8ff41908e1bf261222) commit 7dceba35f8828f0b5beaa8fd07560a0dd24e3584 Author: Volker Lendecke <v...@samba.org> Date: Thu Nov 5 13:22:33 2015 +0100 vfs_gpfs: Re-enable share modes is_ntfs_default_stream_smb_fname returns false for a NULL stream name, so for streamless filenames we do not set gpfs share modes without this patch. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11243 Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Fri Nov 6 03:21:01 CET 2015 on sn-devel-104 commit 3542761fdef31c5f81da78335eef9b2d93956174 Author: Tom Schulz <sch...@adi.com> Date: Thu Oct 22 11:12:01 2015 +0200 texpect: undefined symbol rep_fprintf Add libreplace dependency to texpect, fixes a linking error on Solaris. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11511 Signed-off-by: Tom Schulz <sch...@adi.com> Reviewed-by: Ralph Boehme <s...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Thu Oct 22 14:28:17 CEST 2015 on sn-devel-104 (cherry picked from commit c466ad47d53b1f3fbfc582a89f4b90a2c5dee2e9) ----------------------------------------------------------------------- Summary of changes: lib/texpect/wscript | 2 +- source3/modules/vfs_gpfs.c | 3 ++- source3/rpcclient/cmd_netlogon.c | 5 +++++ source3/smbd/smb2_create.c | 6 ++++++ source3/winbindd/winbindd_pam.c | 7 +++++-- 5 files changed, 19 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/texpect/wscript b/lib/texpect/wscript index 62a1d4d..e14c048 100644 --- a/lib/texpect/wscript +++ b/lib/texpect/wscript @@ -4,4 +4,4 @@ def configure(conf): conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h') def build(bld): - bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False) + bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util replace', install=False) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 3260d2f..62cc801 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -135,7 +135,8 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp, * fd, so lacking a distinct fd for the stream we have to skip * kernel_flock and set_gpfs_sharemode for stream. */ - if (!is_ntfs_default_stream_smb_fname(fsp->fsp_name)) { + if (is_ntfs_stream_smb_fname(fsp->fsp_name) && + !is_ntfs_default_stream_smb_fname(fsp->fsp_name)) { DEBUG(2,("%s: kernel_flock on stream\n", fsp_str_dbg(fsp))); return 0; } diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index 0a8ab20..744361c 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -800,6 +800,11 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli, if (argc == 6) sscanf(argv[5], "%x", &logon_param); + if (rpcclient_netlogon_creds == NULL) { + result = NT_STATUS_UNSUCCESSFUL; + goto done; + } + /* Perform the sam logon */ result = rpccli_netlogon_password_logon(rpcclient_netlogon_creds, diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 880ceee..ad21533 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -703,6 +703,12 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, } if (exta) { + if (!lp_ea_support(SNUM(smb2req->tcon->compat))) { + tevent_req_nterror(req, + NT_STATUS_EAS_NOT_SUPPORTED); + return tevent_req_post(req, ev); + } + ea_list = read_nttrans_ea_list(mem_ctx, (const char *)exta->data.data, exta->data.length); if (!ea_list) { diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 329db62..21a8954 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1379,8 +1379,11 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain, return result; } netr_attempts = 0; - - if (interactive && username != NULL && password != NULL) { + if (domain->conn.netlogon_creds == NULL) { + DEBUG(3, ("No security credentials available for " + "domain [%s]\n", domainname)); + result = NT_STATUS_CANT_ACCESS_DOMAIN_INFO; + } else if (interactive && username != NULL && password != NULL) { result = rpccli_netlogon_password_logon(domain->conn.netlogon_creds, netlogon_pipe->binding_handle, mem_ctx, -- Samba Shared Repository