[SCM] Samba Shared Repository - branch master updated

[Björn Baumbach]

The branch, master has been updated
       via  8fbadada8c0 lib/tsocket: fix a typo in the tsocket guide doc
       via  1289575af2c s3/libsmb: fix a typo in parameter description
       via  5a017b113ed samba-tool domain: fix a typo in samba-tool passwordsettings option description
       via  86fde91621b auth/creds: fix a typo in a comment
      from  3d3d01cda8d s3: smbd: Tweak openat_pathref_dirfsp_nosymlink() to NULL out fsp->fsp_name after calling fd_close() on intermediate directories, rather than before.

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


- Log -----------------------------------------------------------------
commit 8fbadada8c00ff7df311bd7868011f01e797a4e8
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jan 17 12:28:36 2023 +0100

    lib/tsocket: fix a typo in the tsocket guide doc
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Björn Baumbach <bb at sernet.de>
    Autobuild-Date(master): Tue Jan 17 18:23:18 UTC 2023 on sn-devel-184

commit 1289575af2c99d8abd5abfd5d1f90d1664d3e7f2
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jan 17 12:29:28 2023 +0100

    s3/libsmb: fix a typo in parameter description
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 5a017b113ed902eb73f2233321d1fbe8d97c10c8
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jan 17 12:27:01 2023 +0100

    samba-tool domain: fix a typo in samba-tool passwordsettings option description
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 86fde91621b9190df1a8df290441575ca284e6ed
Author: Björn Baumbach <bb at sernet.de>
Date:   Tue Jan 17 12:26:10 2023 +0100

    auth/creds: fix a typo in a comment
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 auth/credentials/credentials_cmdline.c | 2 +-
 lib/tsocket/tsocket_guide.txt          | 2 +-
 python/samba/netcmd/domain.py          | 2 +-
 source3/libsmb/cliconnect.c            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/credentials_cmdline.c b/auth/credentials/credentials_cmdline.c
index 11b1ab9ecd2..c8c7c183c22 100644
--- a/auth/credentials/credentials_cmdline.c
+++ b/auth/credentials/credentials_cmdline.c
@@ -65,7 +65,7 @@ fail:
 bool cli_credentials_set_cmdline_callbacks(struct cli_credentials *cred)
 {
 	/*
-	 * The there is no tty, then we will try to read the password from
+	 * If there is no tty, we will try to read the password from
 	 * stdin.
 	 */
 	return cli_credentials_set_password_callback(cred,
diff --git a/lib/tsocket/tsocket_guide.txt b/lib/tsocket/tsocket_guide.txt
index afd0bd37dbc..7c925d4f1db 100644
--- a/lib/tsocket/tsocket_guide.txt
+++ b/lib/tsocket/tsocket_guide.txt
@@ -216,7 +216,7 @@ state for this function. The tstream_readv_pdu engine will ask
 the next_vector function for the next iovec vector to be used.
 There is a tstream_readv_send/recv pair for each vector returned
 by the next_vector function. If the next_vector function detects
-it received a full pdu, it returns an empty vector. The the callback
+it received a full pdu, it returns an empty vector. The callback
 of the tevent_req (returned by tstream_readv_pdu_send()) is triggered.
 Note: the buffer allocation is completely up to the next_vector function
 and its private state.
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index cf8c089c13d..582a17f0fff 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -1352,7 +1352,7 @@ class cmd_domain_passwordsettings_set(Command):
         Option("--max-pwd-age",
                help="The maximum password age (<integer in days> | default).  Default is 43.", type=str),
         Option("--account-lockout-duration",
-               help="The length of time an account is locked out after exeeding the limit on bad password attempts (<integer in mins> | default).  Default is 30 mins.", type=str),
+               help="The length of time an account is locked out after exceeding the limit on bad password attempts (<integer in mins> | default).  Default is 30 mins.", type=str),
         Option("--account-lockout-threshold",
                help="The number of bad password attempts allowed before locking out the account (<integer> | default).  Default is 0 (never lock out).", type=str),
         Option("--reset-account-lockout-after",
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index edbd2477f60..b687a22e11c 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2786,7 +2786,7 @@ static void cli_start_connection_done(struct tevent_req *subreq);
    establishes a connection to after the negprot. 
    @param output_cli A fully initialised cli structure, non-null only on success
    @param dest_host The netbios name of the remote host
-   @param dest_ss (optional) The the destination IP, NULL for name based lookup
+   @param dest_ss (optional) The destination IP, NULL for name based lookup
    @param port (optional) The destination port (0 for default)
 */
 


-- 
Samba Shared Repository