[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Jan 30 13:54:03 UTC 2020
The branch, master has been updated
via 3d40efaed8b ctdb-test: Fix a typo
via 168c6d9b8f6 libsmb: Fix a typo
via 9f2b131c570 auth3: Fix a typo
via 30940e72803 lib: Align integer types
via bf531c249d7 libcli: Align integer types
via 21359f4fc60 passdb: Use struct allocation
from 1bb16ff4e2d s4:torture: Convert samba4.base.charset test to smb2
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d40efaed8bf93cfb95b6c97a66f7cd39c847b1a
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 28 17:42:13 2020 +0100
ctdb-test: Fix a typo
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Jan 30 13:53:22 UTC 2020 on sn-devel-184
commit 168c6d9b8f68ef58ae671336818c57f499647484
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jan 23 21:23:03 2020 +0100
libsmb: Fix a typo
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 9f2b131c5700e0f44db01e8c458d018258aee8ba
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 27 16:43:24 2020 +0100
auth3: Fix a typo
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 30940e72803a8ec2f6a7327f783849d1b7bed8df
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jan 24 11:49:58 2020 +0100
lib: Align integer types
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit bf531c249d74734a7c350539a662730171226395
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 28 15:39:29 2020 +0100
libcli: Align integer types
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 21359f4fc60ed5cd99f85fe96f1b3d59768767fc
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 27 17:00:59 2020 +0100
passdb: Use struct allocation
Give the compiler more info
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/tests/local_daemons.sh | 2 +-
libcli/security/security_descriptor.c | 2 +-
libcli/smb/smb2_create_ctx.h | 2 +-
source3/auth/check_samsec.c | 2 +-
source3/lib/util_str.c | 3 +--
source3/passdb/machine_sid.c | 8 ++++----
6 files changed, 9 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh
index 4a653224b23..5aa9adc387b 100755
--- a/ctdb/tests/local_daemons.sh
+++ b/ctdb/tests/local_daemons.sh
@@ -103,7 +103,7 @@ setup_socket_wrapper ()
die "$0 setup: Unable to find ${_socket_wrapper_so}"
fi
- # Find absoluate path if only relative is given
+ # Find absolute path if only relative is given
case "$_socket_wrapper_so" in
/*) : ;;
*) _socket_wrapper_so="${PWD}/${_socket_wrapper_so}" ;;
diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c
index 7b7a13d421d..7761eca3506 100644
--- a/libcli/security/security_descriptor.c
+++ b/libcli/security/security_descriptor.c
@@ -680,7 +680,7 @@ struct security_ace *security_ace_create(TALLOC_CTX *mem_ctx,
*******************************************************************/
bool security_descriptor_with_ms_nfs(const struct security_descriptor *psd)
{
- int i;
+ uint32_t i;
if (psd->dacl == NULL) {
return false;
diff --git a/libcli/smb/smb2_create_ctx.h b/libcli/smb/smb2_create_ctx.h
index 0e0b713e55c..7e7bf22d36f 100644
--- a/libcli/smb/smb2_create_ctx.h
+++ b/libcli/smb/smb2_create_ctx.h
@@ -1,7 +1,7 @@
/*
Unix SMB/CIFS implementation.
- SMB2 create context specifc stuff
+ SMB2 create context specific stuff
Copyright (C) Ralph Boehme 2014
diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index 53b6da53dc1..cfd32c5f5ba 100644
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -290,7 +290,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
/**
* Check whether the given password is one of the last two
* password history entries. If so, the bad pwcount should
- * not be incremented even thought the actual password check
+ * not be incremented even though the actual password check
* failed.
*/
static bool need_to_increment_bad_pw_count(
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 5d1d1291011..cc3c257e41d 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -680,8 +680,7 @@ int ipstr_list_parse(const char *ipstr_list, struct ip_service **ip_list)
{
TALLOC_CTX *frame;
char *token_str = NULL;
- size_t count;
- int i;
+ size_t i, count;
if (!ipstr_list || !ip_list)
return 0;
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index cdef1d61c97..fa420d8edfe 100644
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -65,11 +65,11 @@ static void generate_random_sid(struct dom_sid *sid)
int i;
uchar raw_sid_data[12];
- ZERO_STRUCTP(sid);
+ *sid = (struct dom_sid) {
+ .sid_rev_num = 1,
+ .id_auth[5] = 5,
+ };
- sid->sid_rev_num = 1;
- sid->id_auth[5] = 5;
- sid->num_auths = 0;
sid->sub_auths[sid->num_auths++] = 21;
generate_random_buffer(raw_sid_data, 12);
--
Samba Shared Repository
More information about the samba-cvs
mailing list