The branch, master has been updated
via 0bfdefffc8b s3:include: Fix code spelling
via a26c00db11d s4:client: Fix code spelling
via ef5ab45be70 s3:auth: Use new debug macros for logging
via e57f034f013 s3:auth: Fix code spelling
via 60b02126a3c selftest: Fix code spelling
via 2bba3ef297f script: Fix code spelling
via 3233fc03356 python:tests: Fix code spelling
from 3522cddf9cf libcli/smb: Remove unused fallback case for
ALLOW_GNUTLS_AEAD_CIPHER_ENCRYPTV2_AES_GCM
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0bfdefffc8b269674e4ffeb273170ad68f8efa32
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jun 30 12:10:26 2023 +0200
s3:include: Fix code spelling
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Wed Jul 5 07:32:15 UTC 2023 on atb-devel-224
commit a26c00db11d9e02b18e7ef9a516eca4a107764d6
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jun 30 12:06:20 2023 +0200
s4:client: Fix code spelling
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
commit ef5ab45be70469b9471455574ac38e7fb435c043
Author: Andreas Schneider <a...@samba.org>
Date: Mon Jul 3 11:19:33 2023 +0200
s3:auth: Use new debug macros for logging
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
commit e57f034f013bda65618898f22f3fb0cb903f0d94
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jun 30 12:06:01 2023 +0200
s3:auth: Fix code spelling
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
commit 60b02126a3c0c05e710ad5be59257e969c0f1e2a
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jun 30 12:04:33 2023 +0200
selftest: Fix code spelling
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
commit 2bba3ef297f5f9a8ff55db0b73da5e9ec253e9cb
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jun 30 11:57:55 2023 +0200
script: Fix code spelling
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
commit 3233fc0335607ee67c1e03b6387d4b3efb0cc24d
Author: Andreas Schneider <a...@samba.org>
Date: Fri Jun 30 11:56:06 2023 +0200
python:tests: Fix code spelling
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Joseph Sutton <josephsut...@catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/dsdb.py | 2 +-
script/traffic_replay | 2 +-
script/traffic_summary.pl | 8 +++---
selftest/create_smb1_fail_skipfile.txt | 6 ++---
selftest/flapping.d/nbt_dgram | 2 +-
selftest/knownfail | 4 +--
selftest/knownfail.d/dns | 2 +-
selftest/knownfail.d/samba-4.5-emulation | 2 +-
selftest/knownfail_heimdal_kdc | 2 +-
selftest/knownfail_mit_kdc | 2 +-
selftest/knownfail_mit_kdc_pre_1_20 | 2 +-
selftest/manage-ca/manage-ca.sh | 2 +-
selftest/ns/mk_nsenter.sh | 2 +-
selftest/selftest.pl | 2 +-
selftest/target/Samba3.pm | 6 ++---
selftest/todo_smb2_tests_to_port.list | 2 +-
source3/auth/auth.c | 46 ++++++++++++++++++--------------
source3/auth/auth_builtin.c | 2 +-
source3/auth/auth_generic.c | 2 +-
source3/auth/auth_util.c | 2 +-
source3/auth/auth_winbind.c | 2 +-
source3/auth/check_samsec.c | 4 +--
source3/auth/pampass.c | 10 +++----
source3/auth/pass_check.c | 2 +-
source3/auth/proto.h | 12 ++++-----
source3/client/clitar.c | 4 +--
source3/include/fake_file.h | 2 +-
source3/include/idmap.h | 6 ++---
source3/include/idmap_autorid_tdb.h | 4 +--
source3/include/libsmbclient.h | 20 +++++++-------
source3/include/local.h | 6 ++---
source3/include/messages.h | 4 +--
source3/include/nameserv.h | 2 +-
source3/include/passdb.h | 30 ++++++++++-----------
source3/include/smb.h | 2 +-
source3/include/vfs.h | 8 +++---
36 files changed, 112 insertions(+), 106 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index d8d9ac1ee3c..37c36d6ab02 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -1189,7 +1189,7 @@ class DsdbStartUpTests(TestCase):
lp = samba.tests.env_loadparm()
path = lp.configfile
- # This is to avoid a tatoo of the global state
+ # This is to avoid a tattoo of the global state
self.lp = LoadParm(filename_for_non_global_lp=path)
self.creds = Credentials()
self.creds.guess(self.lp)
diff --git a/script/traffic_replay b/script/traffic_replay
index e785e31babf..60b7adb6e52 100755
--- a/script/traffic_replay
+++ b/script/traffic_replay
@@ -174,7 +174,7 @@ def main():
if not os.path.exists(model_file):
logger.error("Model file %s doesn't exist" % model_file)
sys.exit(1)
- # the model-file can be ommitted for --generate-users-only and
+ # the model-file can be omitted for --generate-users-only and
# --cleanup-up, but it should be specified in all other cases
elif not opts.generate_users_only:
logger.error("No model file specified to replay traffic from")
diff --git a/script/traffic_summary.pl b/script/traffic_summary.pl
index 05c1cf03702..295a320aa0a 100755
--- a/script/traffic_summary.pl
+++ b/script/traffic_summary.pl
@@ -45,7 +45,7 @@ my $ip_sequence = 0; # count of unique IP addresses seen
my $timestamp; # Packet timestamp
my $stream; # Wireshark stream number
-my $ip_proto; # IP protocol (IANA protocl number)
+my $ip_proto; # IP protocol (IANA protocol number)
my $source; # source IP address
my $dest; # destination address
my $proto; # application protocol name
@@ -578,7 +578,7 @@ It reads the pdml input from stdin or the list of files
passed on the command li
B<Wireshark Stream Number> Calculated by wireshark groups related
requests and responses
B<Source IP> The unique sequence number for the source IP
address
B<Destination IP> The unique sequence number for the
destination IP address
- B<protocl> The protocol name
+ B<protocol> The protocol name
B<opcode> The protocol operation code
B<Description> The protocol or operation description
B<extra> Extra protocol specific data, may be more
than one field
@@ -636,7 +636,7 @@ It reads the pdml input from stdin or the list of files
passed on the command li
=head3 ldap modifiyRequest
In addition to the standard ldap fields the modification type is also
captured
- modify_operator for modifyRequests this contains the modifiy
operation
+ modify_operator for modifyRequests this contains the modify operation
0 - add
1 - delete
2 - replace
@@ -683,7 +683,7 @@ indicates a kerberos encrypted operation.
tshark indicated that the packet was malformed, for ldap it usually indicates
TLS
encrypted traffic.
-=head1 LISENCE AND COPYRIGHT
+=head1 LICENSE AND COPYRIGHT
Copyright (C) Catalyst.Net Ltd 2017
diff --git a/selftest/create_smb1_fail_skipfile.txt
b/selftest/create_smb1_fail_skipfile.txt
index aea772f171b..dd08b5d5427 100644
--- a/selftest/create_smb1_fail_skipfile.txt
+++ b/selftest/create_smb1_fail_skipfile.txt
@@ -12,14 +12,14 @@ environments to be SMB2_02.
Servers will only offer protocols starting with the min specified in the
conf files, we don't need to change the client value here yet (until SMB1 is
-truely gone)
+truly gone)
2.
The following environments will still negotiate SMB1
ad_dc_ntvfs, rpc_proxy & s4member
3.
-Make test wont stop on first error
+Make test won't stop on first error
Once this patch is applied either
a. Commit to gitlab or
@@ -139,7 +139,7 @@ index 00000000000..eedfdbb6c35
+#!/usr/bin/env python3
+#
+# Simple script to parse make test stdout results
-+# to find the tests that are in error, the scrip
++# to find the tests that are in error, the script
+# then creates a line for each error suitable for
+# putting into a skip file.
+# This scripts intended use is in SMB1 to SMB2 test
diff --git a/selftest/flapping.d/nbt_dgram b/selftest/flapping.d/nbt_dgram
index bb35a7d017b..10390558e64 100644
--- a/selftest/flapping.d/nbt_dgram
+++ b/selftest/flapping.d/nbt_dgram
@@ -1,6 +1,6 @@
# following SMB1/SMB2 test env split it seems this test
# fails randomly however it doesn't seem to be directly
-# related to the changes (e.g. not protocl negotiation
+# related to the changes (e.g. not protocol negotiation
# specific) Best guess is the order of test having being
# changed (as a result of test moving env) or some other
# strange env related side affect is causing this.
diff --git a/selftest/knownfail b/selftest/knownfail
index c6e0a242ecb..37c75d7ca33 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -62,7 +62,7 @@
^samba3.base.delete.deltest17a
^samba3.unix.whoami anonymous connection.whoami\(ad_dc_smb1\) # We need to
resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
# smbclient4 behaves differently from smbclient (s3) when encountering
-# logon failures when possesing a valid ticket. Test below has been
+# logon failures when possessing a valid ticket. Test below has been
# changed to use smbclient (in order to support SMB2) and this part of the
# test fails due to this difference
^samba4.blackbox.chgdcpass.Test login with kerberos ccache after 2nd password
change\(chgdcpass\)
@@ -303,7 +303,7 @@
#
^samba.tests.dcerpc.integer.samba.tests.dcerpc.integer.IntegerTests.test_.*_into_uint8_list
#
-# Samba sort takes a primative approach to unicode sort. These tests
+# Samba sort takes a primitive approach to unicode sort. These tests
# match Windows 2012R2 behaviour.
#
^samba4.ldap.sort.python.+UnicodeSortTests
diff --git a/selftest/knownfail.d/dns b/selftest/knownfail.d/dns
index fee2f2ae322..94000e03baa 100644
--- a/selftest/knownfail.d/dns
+++ b/selftest/knownfail.d/dns
@@ -1,5 +1,5 @@
# These tests are expected to fail because we want to ensure that
-# unauthenicated updates are not permitted against the default
+# unauthenticated updates are not permitted against the default
# configuration, nor against an RODC
samba.tests.dns.__main__.TestDNSUpdates.test_delete_record\(rodc:local\)
diff --git a/selftest/knownfail.d/samba-4.5-emulation
b/selftest/knownfail.d/samba-4.5-emulation
index 1fc79361e40..ef0cdf1dffa 100644
--- a/selftest/knownfail.d/samba-4.5-emulation
+++ b/selftest/knownfail.d/samba-4.5-emulation
@@ -1,4 +1,4 @@
-# This fails as there is no second DC in this enviroment, so it is always the
owner
+# This fails as there is no second DC in this environment, so it is always the
owner
samba4.drs.getnc_exop.python\(chgdcpass\).getnc_exop.DrsReplicaSyncTestCase.test_FSMONotOwner\(chgdcpass\)
# This fails because GET_ANC is now poorly implemented (matching Samba 4.5)
^samba4.drs.getnc_exop.python\(chgdcpass\).getnc_exop.DrsReplicaSyncTestCase.test_link_utdv_hwm\(chgdcpass\)
diff --git a/selftest/knownfail_heimdal_kdc b/selftest/knownfail_heimdal_kdc
index 61b00aa0200..eea5fb2dfb8 100644
--- a/selftest/knownfail_heimdal_kdc
+++ b/selftest/knownfail_heimdal_kdc
@@ -1,5 +1,5 @@
#
-# We expect all the MIT specific compatability tests to fail on heimdal
+# We expect all the MIT specific compatibility tests to fail on heimdal
# kerberos
^samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.SimpleKerberosTests.test_mit_
#
diff --git a/selftest/knownfail_mit_kdc b/selftest/knownfail_mit_kdc
index 97e3cf9e120..6f4df9771ca 100644
--- a/selftest/knownfail_mit_kdc
+++ b/selftest/knownfail_mit_kdc
@@ -1,5 +1,5 @@
#
-# We expect all the heimdal specific compatability tests to fail on MIT
+# We expect all the heimdal specific compatibility tests to fail on MIT
# kerberos
^samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.SimpleKerberosTests.test_heimdal_
#
diff --git a/selftest/knownfail_mit_kdc_pre_1_20
b/selftest/knownfail_mit_kdc_pre_1_20
index d84f6de8039..fa808d83837 100644
--- a/selftest/knownfail_mit_kdc_pre_1_20
+++ b/selftest/knownfail_mit_kdc_pre_1_20
@@ -105,7 +105,7 @@
^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_enc_timestamp_spn(?!_)
^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_enc_timestamp_spn_realm
#
-# KDC COMPATABLITY
+# KDC COMPATIBILITY
#
samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.SimpleKerberosTests.test_ticket_signature
#
diff --git a/selftest/manage-ca/manage-ca.sh b/selftest/manage-ca/manage-ca.sh
index 8e09a93fbd8..765b4f7493f 100755
--- a/selftest/manage-ca/manage-ca.sh
+++ b/selftest/manage-ca/manage-ca.sh
@@ -39,7 +39,7 @@ function check_arg()
CNF="${1-}"
test -n "${CNF}" || {
print_usage
- echo "ERROR: speficy <CNF_FILE> see
manage-ca.templates.d/manage-CA-example.com.cnf"
+ echo "ERROR: specify <CNF_FILE> see
manage-ca.templates.d/manage-CA-example.com.cnf"
exit 1
}
test -e "${CNF}" || {
diff --git a/selftest/ns/mk_nsenter.sh b/selftest/ns/mk_nsenter.sh
index c97fda9ea44..6ba50653635 100755
--- a/selftest/ns/mk_nsenter.sh
+++ b/selftest/ns/mk_nsenter.sh
@@ -2,7 +2,7 @@
#
# Helper script. If you want a 2nd shell that communicates with the testenv DC
# you can use the nsenter command to change the namespace you're in. However,
-# this command is a bit unwieldly and changes depending on the testenv PID.
+# this command is a bit unwieldy and changes depending on the testenv PID.
# We can generate a helper script on the fly that abstracts all this
# complexity, allowing you to use the same, simple command to change the
# namespace that you're in, e.g.
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index c5041c93497..cff150c9eb7 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -553,7 +553,7 @@ sub write_clientconf($$$)
# each user has a USER-${USER_PRINCIPAL_NAME}-cert.pem and
# USER-${USER_PRINCIPAL_NAME}-private-key.pem symlink
# We make a copy here and make the certificated easily
- # accessable in the client environment.
+ # accessible in the client environment.
my $mask = umask;
umask 0077;
opendir USERS, "${ca_users_dir}" or die "Could not open dir
'${ca_users_dir}': $!";
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 0bb074cf11e..d9e17473615 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1194,7 +1194,7 @@ sub setup_admem_idmap_autorid
idmap config * : range = 1000000-19999999
idmap config * : rangesize = 1000000
- # Prevent overridding the provisioned lib/krb5.conf which sets certain
+ # Prevent overriding the provisioned lib/krb5.conf which sets certain
# values required for tests to succeed
create krb5 conf = no
";
@@ -1290,7 +1290,7 @@ sub setup_ad_member_idmap_rid
idmap config * : range = 1000000-1999999
idmap config $dcvars->{DOMAIN} : backend = rid
idmap config $dcvars->{DOMAIN} : range = 2000000-2999999
- # Prevent overridding the provisioned lib/krb5.conf which sets certain
+ # Prevent overriding the provisioned lib/krb5.conf which sets certain
# values required for tests to succeed
create krb5 conf = no
map to guest = bad user
@@ -3262,7 +3262,7 @@ sub provision($$)
[fsrvp_share]
path = $fsrvp_shrdir
- comment = fake shapshots using rsync
+ comment = fake snapshots using rsync
vfs objects = shell_snap shadow_copy2
shell_snap:check path command = $fake_snap_pl --check
shell_snap:create command = $fake_snap_pl --create
diff --git a/selftest/todo_smb2_tests_to_port.list
b/selftest/todo_smb2_tests_to_port.list
index dc1df963918..8b24c1e92ff 100644
--- a/selftest/todo_smb2_tests_to_port.list
+++ b/selftest/todo_smb2_tests_to_port.list
@@ -8,7 +8,7 @@
# python3 selftest/tests.py | grep "^samba" \
# | grep _smb1 | grep -v _done
#
-# Tests that are ported should be moved to approriate _smb1_done
+# Tests that are ported should be moved to appropriate _smb1_done
# test environment and the entry removed from here
samba3.base.attr(ad_dc_smb1)
samba3.base.attr(nt4_dc_smb1)
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index b388b619d75..b83e98f0a3c 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
Password and authentication handling
Copyright (C) Andrew Bartlett 2001-2002
@@ -86,8 +86,9 @@ NTSTATUS auth_get_ntlm_challenge(struct auth_context
*auth_context,
uint8_t chal[8])
{
if (auth_context->challenge.length) {
- DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning
previous challenge by module %s (normal)\n",
- auth_context->challenge_set_by));
+ DBG_INFO("get_ntlm_challenge (auth subsystem): returning "
+ "previous challenge by module %s (normal)\n",
+ auth_context->challenge_set_by);
memcpy(chal, auth_context->challenge.data, 8);
return NT_STATUS_OK;
}
@@ -111,14 +112,14 @@ NTSTATUS auth_get_ntlm_challenge(struct auth_context
*auth_context,
* Check user is in correct domain (if required)
*
* @param user Only used to fill in the debug message
- *
+ *
* @param domain The domain to be verified
*
- * @return True if the user can connect with that domain,
+ * @return True if the user can connect with that domain,
* False otherwise.
**/
-static bool check_domain_match(const char *user, const char *domain)
+static bool check_domain_match(const char *user, const char *domain)
{
/*
* If we aren't serving to trusted domains, we must make sure that
@@ -127,8 +128,8 @@ static bool check_domain_match(const char *user, const char
*domain)
*/
if (!lp_allow_trusted_domains() &&
- !(strequal("", domain) ||
- strequal(lp_workgroup(), domain) ||
+ !(strequal("", domain) ||
+ strequal(lp_workgroup(), domain) ||
is_myname(domain))) {
DEBUG(1, ("check_domain_match: Attempt to connect as user %s
from domain %s denied.\n", user, domain));
return False;
@@ -146,17 +147,17 @@ static bool check_domain_match(const char *user, const
char *domain)
* This function does NOT need to be in a become_root()/unbecome_root() pair
* as it makes the calls itself when needed.
*
- * The return value takes precedence over the contents of the server_info
- * struct. When the return is other than NT_STATUS_OK the contents
+ * The return value takes precedence over the contents of the server_info
+ * struct. When the return is other than NT_STATUS_OK the contents
* of that structure is undefined.
*
* @param user_info Contains the user supplied components, including the
passwords.
* Must be created with make_user_info() or one of its
wrappers.
*
- * @param auth_context Supplies the challenges and some other data.
- * Must be created with make_auth_context(), and the
challenges should be
- * filled in, either at creation or by calling the challenge
geneation
- * function auth_get_challenge().
+ * @param auth_context Supplies the challenges and some other data.
+ * Must be created with make_auth_context(), and the
challenges should be
+ * filled in, either at creation or by calling the challenge
generation
+ * function auth_get_challenge().
*
* @param pserver_info If successful, contains information about the
authentication,
* including a struct samu struct describing the user.
@@ -198,11 +199,16 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx,
*pauthoritative = 1;
- DEBUG(3, ("check_ntlm_password: Checking password for unmapped user
[%s]\\[%s]@[%s] with the new password interface\n",
- user_info->client.domain_name,
user_info->client.account_name, user_info->workstation_name));
+ DBG_NOTICE("check_ntlm_password: Checking password for unmapped user "
+ "[%s]\\[%s]@[%s] with the new password interface\n",
+ user_info->client.domain_name,
+ user_info->client.account_name,
+ user_info->workstation_name);
- DEBUG(3, ("check_ntlm_password: mapped user is: [%s]\\[%s]@[%s]\n",
- user_info->mapped.domain_name,
user_info->mapped.account_name, user_info->workstation_name));
+ DBG_NOTICE("check_ntlm_password: mapped user is: [%s]\\[%s]@[%s]\n",
+ user_info->mapped.domain_name,
+ user_info->mapped.account_name,
+ user_info->workstation_name);
if (auth_context->challenge.length != 8) {
DEBUG(0, ("check_ntlm_password: Invalid challenge stored for
this auth context - cannot continue\n"));
@@ -218,7 +224,7 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx,
dump_data(5, auth_context->challenge.data,
auth_context->challenge.length);
#ifdef DEBUG_PASSWORD
- DEBUG(100, ("user_info has passwords of length %d and %d\n",
+ DEBUG(100, ("user_info has passwords of length %d and %d\n",
(int)user_info->password.response.lanman.length,
(int)user_info->password.response.nt.length));
DEBUG(100, ("lm:\n"));
dump_data(100, user_info->password.response.lanman.data,
user_info->password.response.lanman.length);
@@ -487,7 +493,7 @@ static NTSTATUS make_auth_context_text_list(TALLOC_CTX
*mem_ctx,
return nt_status;
}
- for (;*text_list; text_list++) {
+ for (;*text_list; text_list++) {
if (load_auth_module(*auth_context, *text_list, &t)) {
DLIST_ADD_END(list, t);
}
diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index 046b9793e33..646fbea272f 100644
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -109,7 +109,7 @@ static NTSTATUS auth_init_anonymous(
/**
* Return an error based on username
*
- * This function allows the testing of obsure errors, as well as the generation
+ * This function allows the testing of obscure errors, as well as the
generation
* of NT_STATUS -> DOS error mapping tables.
*
* This module is of no value to end-users.
diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index 673f441d9a5..f9570455fe3 100644
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -85,7 +85,7 @@ static NTSTATUS auth3_generate_session_info_pac(struct
auth4_context *auth_ctx,
if (pac_blob == NULL) {
/*
- * This should already be catched at the main
+ * This should already be caught at the main
* gensec layer, but better check twice
*/
status = NT_STATUS_INTERNAL_ERROR;
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 9fe407ee5e9..293523f4272 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -2295,7 +2295,7 @@ bool is_trusted_domain(const char* dom_name)
/*
on a logon error possibly map the error to success if "map to guest"
- is set approriately
+ is set appropriately
*/
NTSTATUS do_map_to_guest_server_info(TALLOC_CTX *mem_ctx,
NTSTATUS status,
diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 3b8d1a95769..46db4f21f7a 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -1,7 +1,7 @@
/*
Unix SMB/CIFS implementation.
- Winbind authentication mechnism
+ Winbind authentication mechanism
Copyright (C) Tim Potter 2000
Copyright (C) Andrew Bartlett 2001 - 2002
diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index 30125809563..1e55fedb615 100644
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -429,7 +429,7 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge,
user_info, &user_sess_key, &lm_sess_key);
/*
- * We must re-load the sam acount information under a mutex
+ * We must re-load the sam account information under a mutex
* lock to ensure we don't miss any concurrent account lockout
* changes.
*/
@@ -589,7 +589,7 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge,
done:
/*
- * Always flush the getpwsid cache or this will grow indefinetly for
+ * Always flush the getpwsid cache or this will grow indefinitely for
* each NTLM auththentication.
*/
memcache_flush(NULL, PDB_GETPWSID_CACHE);
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index c761d3e4fda..15025e7f1d4 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -22,7 +22,7 @@
/*
* This module provides PAM based functions for validation of
- * username/password pairs, account managment, session and access control.
+ * username/password pairs, account management, session and access control.
* Note: SMB password checking is done in smbpass.c
*/
@@ -95,7 +95,7 @@ static bool smb_pam_error_handler(pam_handle_t *pamh, int
pam_error, const char
/*******************************************************************
This function is a sanity check, to make sure that we NEVER report
- failure as sucess.
+ failure as success.
*********************************************************************/
static bool smb_pam_nt_status_error_handler(pam_handle_t *pamh, int pam_error,
@@ -137,7 +137,7 @@ static int smb_pam_conv(int num_msg,
return PAM_CONV_ERR;
/*
- * Apparantly HPUX has a buggy PAM that doesn't support the
+ * Apparently HPUX has a buggy PAM that doesn't support the
* appdata_ptr. Fail if this is the case. JRA.
*/
@@ -306,7 +306,7 @@ static int smb_pam_passchange_conv(int num_msg,
return PAM_CONV_ERR;
/*
- * Apparantly HPUX has a buggy PAM that doesn't support the
+ * Apparently HPUX has a buggy PAM that doesn't support the
* appdata_ptr. Fail if this is the case. JRA.
*/
@@ -607,7 +607,7 @@ static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, const
char * user)
NTSTATUS nt_status = NT_STATUS_NO_TOKEN;
--
Samba Shared Repository
