[PATCH] Fix a few typos
Jeremy Allison
jra at samba.org
Tue Jan 8 17:40:29 UTC 2019
On Mon, Jan 07, 2019 at 03:13:57PM +0100, swen via samba-technical wrote:
> Two small patches removing the rams and
> the sun and the clouds from SAMBA.
>
> Please review and push if happy.
LGTM, Thanks Swen ! Can I get a second Team reviewer ?
Jeremy.
> From ea0f82507383c9768122c60c8a0a387178690975 Mon Sep 17 00:00:00 2001
> From: Swen Schillig <swen at linux.ibm.com>
> Date: Mon, 7 Jan 2019 15:07:22 +0100
> Subject: [PATCH 1/2] Fix typos and ban the rams from samba
>
> Signed-off-by: Swen Schillig <swen at linux.ibm.com>
> ---
> lib/krb5_wrap/krb5_samba.c | 2 +-
> lib/tdb/include/tdb.h | 2 +-
> lib/tevent/tevent.h | 2 +-
> libgpo/gpo_util.c | 4 ++--
> source3/include/libsmbclient.h | 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 +-
> 8 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
> index 840fbb10695..039de66c7c7 100644
> --- a/lib/krb5_wrap/krb5_samba.c
> +++ b/lib/krb5_wrap/krb5_samba.c
> @@ -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/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/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"])
> --
> 2.20.1
>
>
> From cb3b1d326c0042ba929aa4e56036bda8f69ec83c Mon Sep 17 00:00:00 2001
> From: Swen Schillig <swen at linux.ibm.com>
> Date: Mon, 7 Jan 2019 15:10:25 +0100
> Subject: [PATCH 2/2] Fix typo and remove the sun and the clouds
>
> Signed-off-by: Swen Schillig <swen at linux.ibm.com>
> ---
> lib/krb5_wrap/krb5_samba.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
> index 039de66c7c7..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.
> *
> --
> 2.20.1
>
More information about the samba-technical
mailing list