The branch, master has been updated
via 08fd0561534 Fix typo and remove the sun and the clouds
via e29cb5095b5 Fix typos and ban the rams from samba
via 6e0acc7c398 selftest: Remove duplicate dependency definition
via 78214d3ccb3 dsdb: Print strerror in addition to errno
via f1ff4075248 dns: Do NULL checks in dns_sign_tsig
from fd355dff906 s3:libsmb: cli_smb2_list() can sometimes fail initially
on a connection
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 08fd05615346637e0600d2c7475e86dee95c721b
Author: Swen Schillig <[email protected]>
Date: Mon Jan 7 15:10:25 2019 +0100
Fix typo and remove the sun and the clouds
Signed-off-by: Swen Schillig <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Thu Jan 10 06:14:27 CET 2019 on sn-devel-144
commit e29cb5095b519cd12ecc1029b22a120f14d93db5
Author: Swen Schillig <[email protected]>
Date: Mon Jan 7 15:07:22 2019 +0100
Fix typos and ban the rams from samba
Signed-off-by: Swen Schillig <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit 6e0acc7c3989dfd3842bc1509af7c1b854e71340
Author: Volker Lendecke <[email protected]>
Date: Wed Jan 2 16:33:14 2019 +0100
selftest: Remove duplicate dependency definition
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 78214d3ccb3ff3391b472316a46bab69e7484aa6
Author: Volker Lendecke <[email protected]>
Date: Thu Jun 14 17:42:56 2018 +0200
dsdb: Print strerror in addition to errno
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit f1ff40752486a5207e3dfb322282243343c25ab7
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 6 18:00:22 2018 +0200
dns: Do NULL checks in dns_sign_tsig
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/krb5_wrap/krb5_samba.c | 4 ++--
lib/tdb/include/tdb.h | 2 +-
lib/tevent/tevent.h | 2 +-
libgpo/gpo_util.c | 4 ++--
selftest/target/Samba4.pm | 1 -
source3/include/libsmbclient.h | 4 ++--
source4/dns_server/dns_crypto.c | 6 ++++++
source4/dsdb/dns/dns_update.c | 4 ++--
source4/dsdb/samdb/ldb_modules/dirsync.c | 2 +-
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 2 +-
source4/dsdb/tests/python/sec_descriptor.py | 2 +-
11 files changed, 19 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 840fbb10695..f0dc86b1859 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -1466,7 +1466,7 @@ krb5_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
*
* @param[in] princ The principal as a krb5_principal to search for.
*
- * @param[in] flush Weather to flush the complete keytab.
+ * @param[in] flush Whether to flush the complete keytab.
*
* @param[in] keep_old_entries Keep the entry with the previous kvno.
*
@@ -1659,7 +1659,7 @@ out:
* this is only set to false for encryption types
* which do not support salting like RC4.
*
- * @param[in] keep_old_entries Wether to keep or delte old keytab entries.
+ * @param[in] keep_old_entries Whether to keep or delete old keytab entries.
*
* @retval 0 on Success
*
diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
index 445f48c1fd9..825ceedd9b4 100644
--- a/lib/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
@@ -244,7 +244,7 @@ int tdb_reopen(struct tdb_context *tdb);
* improve performance on systems that keep POSIX locks as a non-scalable data
* structure in the kernel.
*
- * @param[in] parent_longlived Wether the parent is longlived or not.
+ * @param[in] parent_longlived Whether the parent is longlived or not.
*
* @return 0 on success, -1 on error.
*/
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index 664604a06bd..c1ed85109d9 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -1907,7 +1907,7 @@ size_t tevent_queue_length(struct tevent_queue *queue);
*
* @param[in] queue The queue.
*
- * @return Wether the queue is running or not..
+ * @return Whether the queue is running or not..
*/
bool tevent_queue_running(struct tevent_queue *queue);
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index e90b9a3f244..6ad5c3b7f2f 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -469,7 +469,7 @@ NTSTATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
/****************************************************************
- check wether the version number in a GROUP_POLICY_OBJECT match those of the
+ check whether the version number in a GROUP_POLICY_OBJECT match those of the
locally stored version. If not, fetch the required policy via CIFS
****************************************************************/
@@ -555,7 +555,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
}
/****************************************************************
- check wether the version numbers in the gpo_list match the locally stored, if
+ check whether the version numbers in the gpo_list match the locally stored, if
not, go and get each required GPO via CIFS
****************************************************************/
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 90d35d0bc3d..fbcdfcdc2eb 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2203,7 +2203,6 @@ sub check_env($$)
ad_dc => [],
ad_dc_no_nss => [],
ad_dc_no_ntlm => [],
- ad_dc_ntvfs => [],
backupfromdc => [],
customdc => [],
preforkrestartdc => [],
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 5e4a1715402..b045221f12b 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -2681,7 +2681,7 @@ int smbc_listxattr(const char *url,
* extended attributes
*
* @note This function always returns all attribute names supported
- * by NT file systems, regardless of wether the referenced
+ * by NT file systems, regardless of whether the referenced
* file system supports extended attributes (e.g. a Windows
* 2000 machine supports extended attributes if NTFS is used,
* but not if FAT is used, and Windows 98 doesn't support
@@ -2716,7 +2716,7 @@ int smbc_llistxattr(const char *url,
* extended attributes
*
* @note This function always returns all attribute names supported
- * by NT file systems, regardless of wether the referenced
+ * by NT file systems, regardless of whether the referenced
* file system supports extended attributes (e.g. a Windows
* 2000 machine supports extended attributes if NTFS is used,
* but not if FAT is used, and Windows 98 doesn't support
diff --git a/source4/dns_server/dns_crypto.c b/source4/dns_server/dns_crypto.c
index 740e1e4dd53..8c7502628d5 100644
--- a/source4/dns_server/dns_crypto.c
+++ b/source4/dns_server/dns_crypto.c
@@ -393,6 +393,9 @@ WERROR dns_sign_tsig(struct dns_server *dns,
tsig->ttl = 0;
tsig->length = UINT16_MAX;
tsig->rdata.tsig_record.algorithm_name = talloc_strdup(tsig,
"gss-tsig");
+ if (tsig->rdata.tsig_record.algorithm_name == NULL) {
+ return WERR_NOT_ENOUGH_MEMORY;
+ }
tsig->rdata.tsig_record.time_prefix = 0;
tsig->rdata.tsig_record.time = current_time;
tsig->rdata.tsig_record.fudge = 300;
@@ -403,6 +406,9 @@ WERROR dns_sign_tsig(struct dns_server *dns,
if (sig.length > 0) {
tsig->rdata.tsig_record.mac_size = sig.length;
tsig->rdata.tsig_record.mac = talloc_memdup(tsig, sig.data,
sig.length);
+ if (tsig->rdata.tsig_record.mac == NULL) {
+ return WERR_NOT_ENOUGH_MEMORY;
+ }
}
if (packet->arcount == 0) {
diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index 20052f4e47f..b2b951c0561 100644
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -327,8 +327,8 @@ static void dnsupdate_nameupdate_done(struct tevent_req
*subreq)
TALLOC_FREE(subreq);
if (ret != 0) {
- DEBUG(0,(__location__ ": Failed DNS update - with error code
%d\n",
- sys_errno));
+ DBG_ERR("Failed DNS update - with error code %d: %s\n",
+ sys_errno, strerror(sys_errno));
} else {
DEBUG(3,("Completed DNS update check OK\n"));
}
diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c
b/source4/dsdb/samdb/ldb_modules/dirsync.c
index b5510eccd24..2a9895ae641 100644
--- a/source4/dsdb/samdb/ldb_modules/dirsync.c
+++ b/source4/dsdb/samdb/ldb_modules/dirsync.c
@@ -404,7 +404,7 @@ skip:
continue;
}
/* For links, when our functional level > windows 2000
- * we use the RMD_LOCAL_USN information to decide wether
+ * we use the RMD_LOCAL_USN information to decide whether
* we return the attribute or not.
* For windows 2000 this information is in the
replPropertyMetaData
* so it will be handled like any other replicated attribute
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index 014ae0a8f53..af4ad8b5d08 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -748,7 +748,7 @@ static int extended_dn_out_search(struct ldb_module
*module, struct ldb_request
ac->extended_type = 0;
}
- /* check if attrs only is specified, in that case check wether
we need to modify them */
+ /* check if attrs only is specified, in that case check whether
we need to modify them */
if (req->op.search.attrs &&
!is_attr_in_list(req->op.search.attrs, "*")) {
if (! is_attr_in_list(req->op.search.attrs,
"objectGUID")) {
ac->remove_guid = true;
diff --git a/source4/dsdb/tests/python/sec_descriptor.py
b/source4/dsdb/tests/python/sec_descriptor.py
index a385c4e17ad..5e0f1453423 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -338,7 +338,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
self.deleteAll()
def check_user_belongs(self, user_dn, groups=[]):
- """ Test wether user is member of the expected group(s) """
+ """ Test whether user is member of the expected group(s) """
if groups != []:
# User is member of at least one additional group
res = self.ldb_admin.search(user_dn, attrs=["memberOf"])
--
Samba Shared Repository
