The branch, master has been updated
via 3d649a0 winbind: Fix a cut&paste debug typo
via b93d58e waf: Fix a typo
via cc34175 posix_acls: Use talloc_zero_array
via 2dc369f posix_acls: Do a *bit* of reformatting
from b12562f script: Add test script for traffic_summary.pl
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d649a073ad3e221ccbe3ca4c7aa1ed09137e022
Author: Volker Lendecke <v...@samba.org>
Date: Mon Feb 20 19:06:14 2017 +0100
winbind: Fix a cut&paste debug typo
We're in cm_connect_netlogon_transport, not in cm_connect_sam
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu Mar 2 00:31:54 CET 2017 on sn-devel-144
commit b93d58e48e3c2d58a9c00f8eeef3152f19751cbc
Author: Volker Lendecke <v...@samba.org>
Date: Mon Feb 20 18:30:48 2017 +0100
waf: Fix a typo
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit cc3417549c7a17930329322d7e711421244f0c65
Author: Volker Lendecke <v...@samba.org>
Date: Thu Feb 9 18:46:06 2017 +0100
posix_acls: Use talloc_zero_array
This is a slight change in behaviour: We now also zero out
the space for num_profile_acls.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 2dc369feac1fb43ae17e9d2ad1402c8fa682cf4f
Author: Volker Lendecke <v...@samba.org>
Date: Thu Feb 9 18:45:40 2017 +0100
posix_acls: Do a *bit* of reformatting
Makes the next commit a bit more obvious to me
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_conftests.py | 2 +-
source3/smbd/posix_acls.c | 9 +++++----
source3/winbindd/winbindd_cm.c | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_conftests.py
b/buildtools/wafsamba/samba_conftests.py
index 72e4321..511176d 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -24,7 +24,7 @@ def check(self, *k, **kw):
if not 'env' in kw:
kw['env'] = self.env.copy()
- # match the configuration test with speficic options, for example:
+ # match the configuration test with specific options, for example:
# --with-libiconv -> Options.options.iconv_open -> "Checking for library
iconv"
additional_dirs = []
if 'msg' in kw:
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 8187a8b..72bb9fe 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3359,14 +3359,15 @@ static NTSTATUS posix_get_nt_acl_common(struct
connection_struct *conn,
num_acls = count_canon_ace_list(file_ace);
num_def_acls = count_canon_ace_list(dir_ace);
- /* Allocate the ace list. */
- if ((nt_ace_list = talloc_array(talloc_tos(), struct
security_ace,num_acls + num_profile_acls + num_def_acls)) == NULL) {
+ nt_ace_list = talloc_zero_array(
+ talloc_tos(), struct security_ace,
+ num_acls + num_profile_acls + num_def_acls);
+
+ if (nt_ace_list == NULL) {
DEBUG(0,("get_nt_acl: Unable to malloc space
for nt_ace_list.\n"));
goto done;
}
- memset(nt_ace_list, '\0', (num_acls + num_def_acls) *
sizeof(struct security_ace) );
-
/*
* Create the NT ACE list from the canonical ace lists.
*/
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index c9890ac..3df4af3 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -3224,8 +3224,8 @@ static NTSTATUS cm_connect_netlogon_transport(struct
winbindd_domain *domain,
result = get_trust_credentials(domain, talloc_tos(), true, &creds);
if (!NT_STATUS_IS_OK(result)) {
- DEBUG(10, ("cm_connect_sam: No user available for "
- "domain %s when trying schannel\n", domain->name));
+ DBG_DEBUG("No user available for domain %s when trying "
+ "schannel\n", domain->name);
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
--
Samba Shared Repository
