>From 28750ab1a10c3bc00e26c008faef1e778434ecdc Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 20 Aug 2015 10:00:11 +1200 Subject: [PATCH 1/2] samba-tool --help: possessive pronoun "its" has no apostrophe "it's" is reserved for the contraction of "it is". This *is* somewhat illogical, which is how you know its proper English. Signed-off-by: Douglas Bagnall --- python/samba/netcmd/domain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index f0710f2..250fdf9 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -194,7 +194,7 @@ class cmd_domain_provision(Command): Option("--dnspass", type="string", metavar="PASSWORD", help="choose dns password (otherwise random)"), Option("--ldapadminpass", type="string", metavar="PASSWORD", - help="choose password to set between Samba and it's LDAP backend (otherwise random)"), + help="choose password to set between Samba and its LDAP backend (otherwise random)"), Option("--root", type="string", metavar="USERNAME", help="choose 'root' unix username"), Option("--nobody", type="string", metavar="USERNAME", -- 2.1.4 >From 7b9c2784be90c434263ada5deb649121ebbc0e21 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 1 Oct 2015 17:24:02 +1300 Subject: [PATCH 2/2] ntlm auth: spelling fixes Signed-off-by: Douglas Bagnall --- source4/auth/ntlm/auth_unix.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c index 526b655..2b0512a 100644 --- a/source4/auth/ntlm/auth_unix.c +++ b/source4/auth/ntlm/auth_unix.c @@ -263,7 +263,7 @@ static NTSTATUS smb_pam_start(pam_handle_t **pamh, const char *account_name, con pam_error = pam_end(*pamh, 0); if (pam_error != PAM_SUCCESS) { - /* no vaild pamh here, can we reliably call pam_strerror ? */ + /* no valid pamh here, can we reliably call pam_strerror ? */ DEBUG(4,("smb_pam_start: clean up failed, pam_end gave error %d.\n", pam_error)); return pam_to_nt_status(pam_error); @@ -283,7 +283,7 @@ static NTSTATUS smb_pam_start(pam_handle_t **pamh, const char *account_name, con pam_error = pam_end(*pamh, 0); if (pam_error != PAM_SUCCESS) { - /* no vaild pamh here, can we reliably call pam_strerror ? */ + /* no valid pamh here, can we reliably call pam_strerror ? */ DEBUG(4,("smb_pam_start: clean up failed, pam_end gave error %d.\n", pam_error)); return pam_to_nt_status(pam_error); @@ -303,7 +303,7 @@ static NTSTATUS smb_pam_end(pam_handle_t *pamh) if (pamh != NULL) { pam_error = pam_end(pamh, 0); if (pam_error != PAM_SUCCESS) { - /* no vaild pamh here, can we reliably call pam_strerror ? */ + /* no valid pamh here, can we reliably call pam_strerror ? */ DEBUG(4,("smb_pam_end: clean up failed, pam_end gave error %d.\n", pam_error)); return pam_to_nt_status(pam_error); -- 2.1.4