[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Aug 3 15:26:01 UTC 2023
The branch, master has been updated
via 85c8222bdb7 s4:kdc: Fix code spelling
via b29793ffdee s4:dsdb:tests: Fix code spelling
via bedc978c81f s4:dsdb:schema: Fix code spelling
via 969bcc28627 s4:dsdb:schema: Fix trailing white spaces
via f34ef1ef505 s4:dsdb:samdb: Fix code spelling
via 3ebe11cd43b s4:dsdb:repl: Fix code spelling
via e3319795801 s4:dsdb:kcc: Fix code spelling
via 2304ec43970 s4:dsdb:common: Fix code spelling
via ed3c1fcb878 s4:dns_server: Fix code spelling
via dbb1fbe8668 s4:client: Fix code spelling
via 694980224ab s4:cldap_server: Fix code spelling
via 795e464cfaf s4:auth: Fix code spelling
via 01c31c8f6d0 s3:spoolss: Remove dead code
via 0ed62798ddd s3:utils: Fix code spelling
via edcebcd48a4 lib:tevent: Fix code spelling
via d0b2c27d2f6 lib:fuzzing: Fix code spelling
from 06d673a1a0c third_party/heimdal: Import lorikeet-heimdal-202308030152 (commit 2a036a6fd80833799316b8a85623cdea3a1135df)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 85c8222bdb7ea3524cbbfa2da6bbeb1191a819c2
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:47:30 2023 +0200
s4:kdc: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Aug 3 15:25:01 UTC 2023 on atb-devel-224
commit b29793ffdee5d9b9c1c05830622e80f7faec7670
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:44:32 2023 +0200
s4:dsdb:tests: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit bedc978c81fd92edeb3eb6d3efb3a55eb1a8bca3
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:44:02 2023 +0200
s4:dsdb:schema: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 969bcc28627ffd22ee9251d4510c5adef263fb49
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:44:50 2023 +0200
s4:dsdb:schema: Fix trailing white spaces
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit f34ef1ef5054d453e0923dbcad8fd0ca977cc3e4
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:41:31 2023 +0200
s4:dsdb:samdb: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 3ebe11cd43bedb98214664e7cf99632295b0ca34
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:40:56 2023 +0200
s4:dsdb:repl: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit e33197958017d6ab12649319e71ab16969694d94
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:40:35 2023 +0200
s4:dsdb:kcc: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 2304ec43970ab79415ff28f3e2327b157e1b2799
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:39:57 2023 +0200
s4:dsdb:common: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit ed3c1fcb878918663588652ecf4d7aa6e41711b5
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:37:18 2023 +0200
s4:dns_server: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit dbb1fbe8668175aecf7f9b9a86664c1378499292
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 20 11:36:01 2023 +0200
s4:client: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 694980224ab8df02945e24c2065d9af4c6f30611
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 20 11:35:39 2023 +0200
s4:cldap_server: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 795e464cfaf806f758ab4c12b815d9eb4aaf3c02
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 20 11:34:28 2023 +0200
s4:auth: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 01c31c8f6d02fa99cf843ded1a5c25f4d017ba62
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:35:27 2023 +0200
s3:spoolss: Remove dead code
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 0ed62798ddd98d3faf5a90d9cea5bb5bc10950d8
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 20 11:33:37 2023 +0200
s3:utils: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit edcebcd48a474190940a53ddb8fac6099a4f0b6d
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 2 10:33:35 2023 +0200
lib:tevent: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit d0b2c27d2f6778b928da4b8b76dd5a02b038f69c
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 20 11:31:43 2023 +0200
lib:fuzzing: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
lib/fuzzing/fuzz_sddl_access_check.c | 4 +-
lib/tevent/tevent.h | 2 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 12 ---
source3/utils/net_offlinejoin.c | 2 +-
source4/auth/gensec/gensec_gssapi.c | 4 +-
source4/auth/gensec/gensec_krb5.c | 4 +-
source4/auth/kerberos/kerberos-notes.txt | 18 ++---
.../kerberos/kerberos-porting-to-mit-notes.txt | 12 +--
source4/auth/kerberos/krb5_init_context.c | 2 +-
source4/auth/ntlm/auth.c | 4 +-
source4/auth/ntlm/auth_anonymous.c | 2 +-
source4/auth/ntlm/auth_developer.c | 2 +-
source4/auth/ntlm/auth_sam.c | 2 +-
source4/auth/ntlm/auth_winbind.c | 2 +-
source4/auth/sam.c | 4 +-
source4/auth/samba_server_gensec.c | 2 +-
source4/auth/session.c | 4 +-
source4/auth/session.h | 2 +-
source4/cldap_server/rootdse.c | 2 +-
source4/client/cifsdd.c | 2 +-
source4/dns_server/dlz_bind9.c | 12 +--
source4/dns_server/dns_update.c | 22 ++---
source4/dns_server/dnsserver_common.c | 2 +-
source4/dsdb/common/dsdb_dn.c | 10 +--
source4/dsdb/common/util.c | 6 +-
source4/dsdb/common/util_trusts.c | 2 +-
source4/dsdb/kcc/garbage_collect_tombstones.c | 2 +-
source4/dsdb/kcc/scavenge_dns_records.c | 2 +-
source4/dsdb/repl/drepl_out_helpers.c | 6 +-
source4/dsdb/repl/drepl_ridalloc.c | 2 +-
source4/dsdb/repl/drepl_service.h | 2 +-
source4/dsdb/samdb/cracknames.c | 4 +-
source4/dsdb/samdb/ldb_modules/acl.c | 4 +-
source4/dsdb/samdb/ldb_modules/anr.c | 2 +-
source4/dsdb/samdb/ldb_modules/audit_util.c | 2 +-
source4/dsdb/samdb/ldb_modules/count_attrs.c | 2 +-
source4/dsdb/samdb/ldb_modules/dirsync.c | 12 +--
source4/dsdb/samdb/ldb_modules/dsdb_notification.c | 2 +-
source4/dsdb/samdb/ldb_modules/encrypted_secrets.c | 4 +-
source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 2 +-
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 4 +-
source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 4 +-
source4/dsdb/samdb/ldb_modules/group_audit.c | 4 +-
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 2 +-
source4/dsdb/samdb/ldb_modules/objectclass.c | 4 +-
source4/dsdb/samdb/ldb_modules/operational.c | 2 +-
source4/dsdb/samdb/ldb_modules/partition.c | 4 +-
source4/dsdb/samdb/ldb_modules/partition_init.c | 2 +-
source4/dsdb/samdb/ldb_modules/password_hash.c | 12 +--
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 26 +++---
source4/dsdb/samdb/ldb_modules/ridalloc.c | 4 +-
source4/dsdb/samdb/ldb_modules/rootdse.c | 18 ++---
source4/dsdb/samdb/ldb_modules/samba3sid.c | 2 +-
source4/dsdb/samdb/ldb_modules/schema_data.c | 4 +-
source4/dsdb/samdb/ldb_modules/schema_load.c | 2 +-
.../dsdb/samdb/ldb_modules/tests/test_audit_log.c | 2 +-
source4/dsdb/samdb/ldb_modules/util.c | 4 +-
source4/dsdb/samdb/samdb.c | 2 +-
source4/dsdb/schema/schema_convert_to_ol.c | 94 +++++++++++-----------
source4/dsdb/schema/schema_query.c | 4 +-
source4/dsdb/tests/python/acl.py | 12 +--
.../dsdb/tests/python/ad_dc_search_performance.py | 2 +-
source4/dsdb/tests/python/confidential_attr.py | 2 +-
source4/dsdb/tests/python/dirsync.py | 8 +-
source4/dsdb/tests/python/ldap.py | 14 ++--
source4/dsdb/tests/python/ldap_modify_order.py | 4 +-
source4/dsdb/tests/python/ldap_syntaxes.py | 4 +-
source4/dsdb/tests/python/login_basics.py | 2 +-
source4/dsdb/tests/python/password_settings.py | 4 +-
source4/dsdb/tests/python/passwords.py | 4 +-
source4/dsdb/tests/python/sam.py | 2 +-
source4/dsdb/tests/python/sec_descriptor.py | 14 ++--
source4/dsdb/tests/python/token_group.py | 4 +-
source4/dsdb/tests/python/user_account_control.py | 2 +-
source4/kdc/ad_claims.c | 2 +-
source4/kdc/db-glue.c | 4 +-
source4/kdc/hdb-samba4.c | 2 +-
source4/kdc/ktutil.c | 2 +-
source4/kdc/mit_samba.c | 2 +-
source4/kdc/wdc-samba4.c | 2 +-
80 files changed, 235 insertions(+), 247 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/fuzzing/fuzz_sddl_access_check.c b/lib/fuzzing/fuzz_sddl_access_check.c
index e6231d7da5f..438ca026656 100644
--- a/lib/fuzzing/fuzz_sddl_access_check.c
+++ b/lib/fuzzing/fuzz_sddl_access_check.c
@@ -1,5 +1,5 @@
/*
- Fuzz access chcek using SDDL strings and a known token
+ Fuzz access check using SDDL strings and a known token
Copyright (C) Catalyst IT 2023
This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@ int LLVMFuzzerTestOneInput(uint8_t *input, size_t len)
* the tail is just junk that comes along for the ride.
*
* 3. Even if there is a case where the end of the SDDL is part of the
- * mask, the evolution stategy is very likely to try a different mask,
+ * mask, the evolution strategy is very likely to try a different mask,
* because it likes to add junk on the end.
*
* But still, you ask, WHY? So that the seeds from here can be shared
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index fec8c2a1744..1d589b899ca 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -625,7 +625,7 @@ typedef void (*tevent_debug_fn)(void *context,
* Set destination for tevent debug messages
*
* As of version 0.15.0 the invocation of
- * the debug function for indiviual messages
+ * the debug function for individual messages
* is limited by the current max_debug_level,
* which means TEVENT_DEBUG_TRACE messages
* are not passed by default:
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 883eebc6474..5a35b6a0e32 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -10436,18 +10436,6 @@ WERROR _spoolss_EnumPrinterDataEx(struct pipes_struct *p,
goto done;
}
-#if 0 /* FIXME - gd */
- /* housekeeping information in the reply */
-
- /* Fix from Martin Zielinski <mz at seh.de> - ensure
- * the hand marshalled container size is a multiple
- * of 4 bytes for RPC alignment.
- */
-
- if (needed % 4) {
- needed += 4-(needed % 4);
- }
-#endif
*r->out.count = count;
*r->out.info = info;
diff --git a/source3/utils/net_offlinejoin.c b/source3/utils/net_offlinejoin.c
index 0cfd5fdfe23..7bab2d2e86d 100644
--- a/source3/utils/net_offlinejoin.c
+++ b/source3/utils/net_offlinejoin.c
@@ -90,7 +90,7 @@ static int net_offlinejoin_provision_usage(struct net_context *c, int argc, cons
d_printf(_("\tdomain=<DOMAIN>\t\t\t\tDefines AD Domain to join\n"));
d_printf(_("\tmachine_name=<MACHINE_NAME>\t\tDefines the machine account name\n"));
d_printf(_("\tmachine_account_ou=<OU>\t\t\tDefines the machine account organizational unit DN\n"));
- d_printf(_("\tdcname=<DCNAME>\t\t\t\tSpecifices a Domain Controller to join to\n"));
+ d_printf(_("\tdcname=<DCNAME>\t\t\t\tSpecify a Domain Controller to join to\n"));
d_printf(_("\tdefpwd\t\t\t\t\tUse default machine account password\n"));
d_printf(_("\treuse\t\t\t\t\tReuse existing machine account in AD\n"));
d_printf(_("\tsavefile=<FILENAME>\t\t\tFile to store the ODJ data\n"));
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index cca19646dfc..f460c6d2424 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -343,7 +343,7 @@ static NTSTATUS gensec_gssapi_client_creds(struct gensec_security *gensec_securi
DEBUG(2, ("Error obtaining ticket we require to contact %s: (possibly due to clock skew between us and the KDC) %s\n", gensec_gssapi_state->target_principal, error_string));
return NT_STATUS_TIME_DIFFERENCE_AT_DC;
default:
- DEBUG(1, ("Aquiring initiator credentials failed: %s\n", error_string));
+ DEBUG(1, ("Acquiring initiator credentials failed: %s\n", error_string));
return NT_STATUS_UNSUCCESSFUL;
}
@@ -1511,7 +1511,7 @@ static NTSTATUS gensec_gssapi_session_info(struct gensec_security *gensec_securi
&pac_blob);
/* IF we have the PAC - otherwise we need to get this
- * data from elsewere - local ldb, or (TODO) lookup of some
+ * data from elsewhere - local ldb, or (TODO) lookup of some
* kind...
*/
if (NT_STATUS_IS_OK(nt_status)) {
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 104e4639c44..d6a160f38c2 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -296,7 +296,7 @@ static NTSTATUS gensec_krb5_common_client_creds(struct gensec_security *gensec_s
DEBUG(3, ("Error preparing credentials we require to contact %s : %s\n", principal, error_string));
return NT_STATUS_INVALID_PARAMETER; /* Make SPNEGO ignore us, we can't go any further here */
default:
- DEBUG(1, ("gensec_krb5_start: Aquiring initiator credentials failed: %s\n", error_string));
+ DEBUG(1, ("gensec_krb5_start: Acquiring initiator credentials failed: %s\n", error_string));
return NT_STATUS_UNSUCCESSFUL;
}
@@ -612,7 +612,7 @@ static NTSTATUS gensec_krb5_update_internal(struct gensec_security *gensec_secur
server_in_keytab = NULL;
}
- /* Parse the GSSAPI wrapping, if it's there... (win2k3 allows it to be omited) */
+ /* Parse the GSSAPI wrapping, if it's there... (win2k3 allows it to be omitted) */
if (gensec_krb5_state->gssapi
&& gensec_gssapi_parse_krb5_wrap(out_mem_ctx, &in, &unwrapped_in, tok_id)) {
inbuf.data = (char *)unwrapped_in.data;
diff --git a/source4/auth/kerberos/kerberos-notes.txt b/source4/auth/kerberos/kerberos-notes.txt
index 69541290ef7..cb8f0a9afed 100644
--- a/source4/auth/kerberos/kerberos-notes.txt
+++ b/source4/auth/kerberos/kerberos-notes.txt
@@ -13,7 +13,7 @@ hbd-samba4.c is the biggest piece of samba-to-krb glue layer, so the main
part of the port to MIT is to replace hdb-samba4 with a similar glue layer
that's designed for MIT's code.
-PAC requirements are implemeneted in source4/kdc/pac-glue.c
+PAC requirements are implemented in source4/kdc/pac-glue.c
The plugins (both of the above are Heimdal plugins) for the above are loaded
in source4/kdc/kdc.c
@@ -142,9 +142,9 @@ just gssapi.
there's two kinds of name-canonicalization that can occur:
* lower-to-upper case conversion, because Windows domain names are
usually in upper case;
- * an unrecognizable subsitution of names, such as might happen when
+ * an unrecognizable substitution of names, such as might happen when
a user requests a ticket for a NetBIOS domain name, but gets back
- a ticket for the corresponging FQDN.
+ a ticket for the corresponding FQDN.
As developers, we should test if the AD KDC's name-canonicalisation
can be turned off with the KDCOption flags in the AS-REQ or TGS-REQ;
@@ -410,7 +410,7 @@ IO handling, and run other events in the meantime. This uses a
library might be called again, while still in the send_to_kdc hook).
Heimdal has this 'state machine safety' in parts, and we have modified
-the lorikeet branch to improve this behviour, when using a new,
+the lorikeet branch to improve this behaviour, when using a new,
non-standard API to tunnelling a ccache (containing a set of tickets)
through the gssapi, by temporarily casting the ccache pointer to a
gss credential pointer.
@@ -434,7 +434,7 @@ allows the caller to specify a keytab and ccache, for use by the
GSSAPI code. Therefore there is no need to use global variables to
communicate this information about keytab & ccache.
-At a more theoritical level (simply counting static and global
+At a more theoretical level (simply counting static and global
variables) Heimdal is not state machine safe for the GSSAPI layer.
(Heimdal is now (6/09) much more nearly free of globals.)
The Krb5 layer alone is much closer, as far as I can tell, blocking
@@ -479,7 +479,7 @@ the kerberos libraries
- gsskrb5_get_initiator_subkey() (return the exact key that Samba3
has always asked for. gsskrb5_get_subkey() might do what we need
anyway). This is necessary, because in some spots, Microsoft uses
- raw Kerberos keys, outside the Kerberos protocls, and not using Kerberos
+ raw Kerberos keys, outside the Kerberos protocols, and not using Kerberos
wrappings etc. Ie, as a direct input to MD5 and ARCFOUR, without using
the make_priv() or make_safe() calls.
@@ -626,13 +626,13 @@ We currently define 3 classes:
- server (tgt)
- krbtgt (kinit, tgt) the kdc's own ldap record
-I also now specify the kerberos principal as an explict parameter to LDB_fetch(),
+I also now specify the kerberos principal as an explicit parameter to LDB_fetch(),
not an in/out value on the struct hdb_entry parameter itself.
Private Data pointer (and windc hooks) (see above):
In addition, I have added a new interface hdb_fetch_ex(), which
returns a structure including a private data-pointer, which may be used
- by the windc plugin inferface functions. The windc plugin provides
+ by the windc plugin interface functions. The windc plugin provides
the hook for the PAC, as well as a function for the main access control routines.
A new windc plugin function should be added to increment the bad password counter
@@ -659,7 +659,7 @@ See also the discussion about state machine safety above)
An important detail in the use of libkdc is that we use samba4's own socket
lib. This allows the KDC code to be as portable as the rest of samba
(this cuts both ways), but far more importantly it ensures a
-consistancy in the handling of requests, binding to sockets etc.
+consistency in the handling of requests, binding to sockets etc.
To handle TCP, we use of our socket layer in much the same way as
we deal with TCP for CIFS. Tridge created a generic packet handling
diff --git a/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt b/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt
index 9b478bbd1c1..9df3a13d495 100644
--- a/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt
+++ b/source4/auth/kerberos/kerberos-porting-to-mit-notes.txt
@@ -77,7 +77,7 @@ source code, as follows:
glue layer, so the main part of the port to MIT is
to replace hdb-samba4 with a similar glue layer
that's designed for MIT's code.
- * Samba4's PAC requirements are implemeneted in
+ * Samba4's PAC requirements are implemented in
source4/kdc/pac-glue.c
* Both of the above two layers are Heimdal plugins, and
both get loaded in source4/kdc/kdc.c
@@ -115,9 +115,9 @@ source code, as follows:
occur on Windows:
* Lower-to-upper case conversion, because Windows domain
names are usually in upper case;
- * An unrecognizable subsitution of names, such as might
+ * An unrecognizable substitution of names, such as might
happen when a user requests a ticket for a NetBIOS domain
- name, but gets back a ticket for the corresponging FQDN.
+ name, but gets back a ticket for the corresponding FQDN.
As developers, we should test if the AD KDC's name-canonical-
isation can be turned off with the KDCOption flags in the
AS-REQ or TGS-REQ; Windows clients always send the
@@ -280,11 +280,11 @@ source code, as follows:
c. Turn on MIT-krb 1.7'sPAC handling.
In addition, I have added a new interface hdb_fetch_ex(),
which returns a structure including a private data-pointer,
- which may be used by the windc plugin inferface functions.
+ which may be used by the windc plugin interface functions.
The windc plugin provides the hook for the PAC.
d. Samba4 needsaccess control hooks in the Heimdal& MIT
KDCs. We need to lockout accounts (eg, after 10 failed PW-
- attemps), and perform other controls. This is standard
+ attempts), and perform other controls. This is standard
AD behavior, that Samba4 needs to get right, whether
Heimdal or MIT-krb is doing the ticket work.
- If PADL doesn't publish their patch for this,
@@ -413,7 +413,7 @@ when using Kerberos and GSSAPI libraries
c. Make sure Samba4'sportable socket API works:
* An important detail in the use of libkdc is that we use samba4's
own socket lib. This allows the KDC code to be as portable as
- the rest of samba, but more importantly it ensures consistancy
+ the rest of samba, but more importantly it ensures consistency
in the handling of requests, binding to sockets etc.
* To handle TCP, we use of our socket layer in much the same way as
we deal with TCP for CIFS. Tridge created a generic packet handling
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 48cb256486e..e8114af7ab2 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -305,7 +305,7 @@ static krb5_error_code smb_krb5_send_and_recv_func_int(struct smb_krb5_context *
* from the start (otherwise we may miss a socket
* drop) and mark as AUTOCLOSE along with the fde */
- /* Ths is equivilant to EVENT_FD_READABLE(smb_krb5->fde) */
+ /* This is equivalent to EVENT_FD_READABLE(smb_krb5->fde) */
smb_krb5->fde = tevent_add_fd(ev, smb_krb5->sock,
socket_get_fd(smb_krb5->sock),
TEVENT_FD_READ,
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 9f5cb92f89f..3c48c77ec5b 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -99,7 +99,7 @@ _PUBLIC_ NTSTATUS auth_get_challenge(struct auth4_context *auth_ctx, uint8_t cha
*
* @param auth_ctx Supplies the challenges and some other data.
* Must be created with auth_context_create(), and the challenges should be
- * filled in, either at creation or by calling the challenge geneation
+ * filled in, either at creation or by calling the challenge generation
* function auth_get_challenge().
*
* @param user_info Contains the user supplied components, including the passwords.
@@ -542,7 +542,7 @@ static NTSTATUS auth_check_password_wrapper_recv(struct tevent_req *req,
/* Wrapper because we don't want to expose all callers to needing to
* know that session_info is generated from the main ldb, and because
- * we need to break a depenency loop between the DCE/RPC layer and the
+ * we need to break a dependency loop between the DCE/RPC layer and the
* generation of unix tokens via IRPC */
static NTSTATUS auth_generate_session_info_wrapper(struct auth4_context *auth_context,
TALLOC_CTX *mem_ctx,
diff --git a/source4/auth/ntlm/auth_anonymous.c b/source4/auth/ntlm/auth_anonymous.c
index 0f71830259c..328347a2dad 100644
--- a/source4/auth/ntlm/auth_anonymous.c
+++ b/source4/auth/ntlm/auth_anonymous.c
@@ -1,7 +1,7 @@
/*
Unix SMB/CIFS implementation.
- Anonymous Authentification
+ Anonymous Authentication
Copyright (C) Stefan Metzmacher 2004-2005
diff --git a/source4/auth/ntlm/auth_developer.c b/source4/auth/ntlm/auth_developer.c
index 7b9610cc85e..89db15d0ee7 100644
--- a/source4/auth/ntlm/auth_developer.c
+++ b/source4/auth/ntlm/auth_developer.c
@@ -43,7 +43,7 @@ static NTSTATUS name_to_ntstatus_want_check(struct auth_method_context *ctx,
/**
* 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/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c
index 74cdcc50c29..7b65b3084f8 100644
--- a/source4/auth/ntlm/auth_sam.c
+++ b/source4/auth/ntlm/auth_sam.c
@@ -494,7 +494,7 @@ static NTSTATUS authsam_password_check_and_record(struct auth4_context *auth_con
* samdb_result_passwords_from_history() currently
* does not fail for missing attributes, it only sets
* nt_history_pwd = NULL, so "break" and fall down to
- * the bad password count upate if this happens
+ * the bad password count update if this happens
*/
if (!NT_STATUS_IS_OK(nt_status)) {
break;
diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c
index 4049c3ac209..2b1cc51cd03 100644
--- a/source4/auth/ntlm/auth_winbind.c
+++ b/source4/auth/ntlm/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/source4/auth/sam.c b/source4/auth/sam.c
index 3b34525b7e1..5409007722f 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -88,7 +88,7 @@ const char *user_attrs[] = {
* This ordering (having msDS-ResultantPSO first) is
* important. By processing this attribute first it is
* available in the operational module for the other PSO
- * attribute calcuations to use.
+ * attribute calculations to use.
*/
"msDS-ResultantPSO",
@@ -1387,7 +1387,7 @@ error:
* level is raised to DS_BEHAVIOR_WIN2003 or higher, is calculated as
* 14 days minus a random percentage of 5 days", but we aren't doing
* that. The blogosphere seems to think that this randomised update
- * happens everytime, but [MS-ADA1] doesn't agree.
+ * happens every time, but [MS-ADA1] doesn't agree.
*
* Dochelp referred us to the following blog post:
* http://blogs.technet.com/b/askds/archive/2009/04/15/the-lastlogontimestamp-attribute-what-it-was-designed-for-and-how-it-works.aspx
diff --git a/source4/auth/samba_server_gensec.c b/source4/auth/samba_server_gensec.c
index f2b0551afe8..b5d436d571c 100644
--- a/source4/auth/samba_server_gensec.c
+++ b/source4/auth/samba_server_gensec.c
@@ -20,7 +20,7 @@
*/
/* This code sets up GENSEC in the way that all Samba servers want
- * (becaue they have presumed access to the sam.ldb etc */
+ * (because they have presumed access to the sam.ldb etc */
#include "includes.h"
#include "auth/auth.h"
diff --git a/source4/auth/session.c b/source4/auth/session.c
index 70dc4b19f9d..a240cdb2e22 100644
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -270,7 +270,7 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
/* Fill out the auth_session_info with a cli_credentials based on the
* auth_session_info we were forwarded over named pipe forwarding.
*
- * NOTE: The stucture members of session_info_transport are stolen
+ * NOTE: The structure members of session_info_transport are stolen
* with talloc_move() into auth_session_info for long term use
*/
struct auth_session_info *auth_session_info_from_transport(TALLOC_CTX *mem_ctx,
@@ -409,7 +409,7 @@ NTSTATUS auth_session_info_transport_from_session(TALLOC_CTX *mem_ctx,
}
-/* Produce a session_info for an arbitary DN or principal in the local
+/* Produce a session_info for an arbitrary DN or principal in the local
* DB, assuming the local DB holds all the groups
*
* Supply either a principal or a DN
diff --git a/source4/auth/session.h b/source4/auth/session.h
index 900b6ab3365..011d6bcd35e 100644
--- a/source4/auth/session.h
+++ b/source4/auth/session.h
@@ -61,7 +61,7 @@ NTSTATUS auth_session_info_transport_from_session(TALLOC_CTX *mem_ctx,
struct loadparm_context *lp_ctx,
struct auth_session_info_transport **transport_out);
-/* Produce a session_info for an arbitary DN or principal in the local
+/* Produce a session_info for an arbitrary DN or principal in the local
* DB, assuming the local DB holds all the groups
*
* Supply either a principal or a DN
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index 84f26967da1..aff594608fb 100644
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -159,7 +159,7 @@ void cldapd_rootdse_request(struct cldap_socket *cldap,
reply.result = &result;
/* Note: The remoteAddress should rather be set on a ldb request.
- * We can set this savely on the context here,
+ * We can set this safely on the context here,
* since cldapd_rootdse_fill operates synchronously. */
ldb_set_opaque(cldapd->samctx, "remoteAddress", src);
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 812698e49db..37c6cadc9b2 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -31,7 +31,7 @@
const char * const PROGNAME = "cifsdd";
-#define SYNTAX_EXIT_CODE 1 /* Invokation syntax or logic error. */
+#define SYNTAX_EXIT_CODE 1 /* Invocation syntax or logic error. */
#define EOM_EXIT_CODE 9 /* Out of memory error. */
#define FILESYS_EXIT_CODE 10 /* File manipulation error. */
#define IOERROR_EXIT_CODE 11 /* Error during IO phase. */
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index acd811f66ee..207dc7cc261 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -617,7 +617,7 @@ static void b9_debug(void *private_ptr, int msg_level, const char *msg)
};
struct dlz_bind9_data *state = private_ptr;
int isc_log_level;
-
+
if (msg_level >= ARRAY_SIZE(isc_log_map) || msg_level < 0) {
isc_log_level = ISC_LOG_INFO;
} else {
@@ -1107,15 +1107,15 @@ _PUBLIC_ isc_result_t dlz_allowzonexfr(void *dbdata, const char *name, const cha
denied_clients = lpcfg_dns_zone_transfer_clients_deny(state->lp);
/* The logic of allow_access() when both allow and deny lists are given
- * does not match our expectation here: it would allow clients thar are
+ * does not match our expectation here: it would allow clients that are
* neither allowed nor denied.
* Here, we want to deny clients by default.
* Using the allow_access() function is still useful as it takes care of
- * parsing IP adresses and subnets in a consistent way with other options
+ * parsing IP addresses and subnets in a consistent way with other options
* from smb.conf.
*
* We will then check the deny list first, then the allow list, so that
- * we accept only clients that are explicitely allowed AND not explicitely
+ * we accept only clients that are explicitly allowed AND not explicitly
* denied.
*/
if ((authorized_clients == NULL) && (denied_clients == NULL)) {
@@ -1409,7 +1409,7 @@ static bool b9_has_soa(struct dlz_bind9_data *state, struct ldb_dn *dn, const ch
}
/*
- * The SOA record is alwas stored under DC=@,DC=zonename
+ * The SOA record is always stored under DC=@,DC=zonename
* This can probably be removed when dns_common_lookup makes a fallback
* lookup on @ pseudo record
*/
@@ -1981,7 +1981,7 @@ _PUBLIC_ isc_result_t dlz_addrdataset(const char *name, const char *rdatastr, vo
* dns_common_replace() will work out whether to bump the
* timestamp or not. But to do that, we need to tell it the
* old timestamp.
- */
+ */
if (! dns_name_is_static(recs, num_recs)) {
rec->dwTimeStamp = recs[i].dwTimeStamp;
}
diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index 3cc26952353..19eaaaf2d88 100644
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -54,7 +54,7 @@ static WERROR check_one_prerequisite(struct dns_server *dns,
bool found = false;
struct dnsp_DnssrvRpcRecord *rec = NULL;
struct dnsp_DnssrvRpcRecord *ans;
- uint16_t acount;
+ uint16_t a_count;
size_t host_part_len = 0;
@@ -82,19 +82,19 @@ static WERROR check_one_prerequisite(struct dns_server *dns,
if (pr->rr_type == DNS_QTYPE_ALL) {
/*
*/
- werror = dns_lookup_records(dns, mem_ctx, dn, &ans, &acount);
+ werror = dns_lookup_records(dns, mem_ctx, dn, &ans, &a_count);
if (W_ERROR_EQUAL(werror, WERR_DNS_ERROR_NAME_DOES_NOT_EXIST)) {
return DNS_ERR(NAME_ERROR);
}
W_ERROR_NOT_OK_RETURN(werror);
- if (acount == 0) {
+ if (a_count == 0) {
return DNS_ERR(NAME_ERROR);
}
} else {
--
Samba Shared Repository
More information about the samba-cvs
mailing list