[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c285bcfbdad lib/cmdline: fix a typo
       via  9332606a172 s3:utils:smbcacls fix a typo
      from  9ad03f51a34 s4:kdc: Add asserted identity SID to identify whether S4U2Self has occurred

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c285bcfbdad66fb7f076b6a106a6b113413dc486
Author: Christian Ambach <ambi at samba.org>
Date:   Wed Apr 20 22:46:52 2022 +0200

    lib/cmdline: fix a typo
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Apr 21 06:59:12 UTC 2022 on sn-devel-184

commit 9332606a172a5a60169de3a39bf00619c4fc2500
Author: Christian Ambach <ambi at samba.org>
Date:   Wed Oct 23 09:56:51 2019 +0200

    s3:utils:smbcacls fix a typo
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/cmdline/cmdline.h    | 4 ++--
 source3/utils/smbcacls.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index 5cd58c3ddbb..e254a1db5c3 100644
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -301,7 +301,7 @@ poptContext samba_popt_get_context(const char * name,
 	.argInfo    = POPT_ARG_INCLUDE_TABLE, \
 	.arg        = samba_cmdline_get_popt(SAMBA_CMDLINE_POPT_OPT_LEGACY_S3), \
 	.val        = 0, \
-	.descrip    = "Deprecated legcacy options:", \
+	.descrip    = "Deprecated legacy options:", \
 	.argDescrip = NULL },
 
 /* TODO Get rid of me! */
@@ -311,7 +311,7 @@ poptContext samba_popt_get_context(const char * name,
 	.argInfo    = POPT_ARG_INCLUDE_TABLE, \
 	.arg        = samba_cmdline_get_popt(SAMBA_CMDLINE_POPT_OPT_LEGACY_S4), \
 	.val        = 0, \
-	.descrip    = "Deprecated legcacy options:", \
+	.descrip    = "Deprecated legacy options:", \
 	.argDescrip = NULL },
 
 #endif /* _CMDLINE_H */
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 661d4eacf3e..004f2ff1266 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1700,7 +1700,7 @@ int main(int argc, char *argv[])
 			.argInfo    = POPT_ARG_NONE,
 			.arg        = NULL,
 			.val        = 'x',
-			.descrip    = "Query maximum persmissions",
+			.descrip    = "Query maximum permissions",
 		},
 		POPT_COMMON_SAMBA
 		POPT_COMMON_CONNECTION


-- 
Samba Shared Repository