[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Mar 28 10:28:02 UTC 2023
The branch, master has been updated
via cfc31bfe11d s3:libsmb: Fix conflicting declaration/implementation
via ec3229ed5c8 s3:libsmb: Remove trailing whitespaces in clientgen.c
via 34251ba8f20 examples: Improve comment in smb.conf.default
via d1db4ac0945 examples: Remove trailing whitespaces in smb.conf.default
via 1ba146dda30 examples: Fix code spelling
via ff46836eecc examples: Remove trailing whitespaces in mklogon.conf
via 4ada0ddea67 examples: Remove trailing whitespaces in ol-schema-migrate.pl
via b1767d505e8 buildtools: Fix code spelling
via 98c14205a0d auth: Fix code spelling
via 71eb85bc252 s3:utils: Fix grammar in testparm
from a11d6fe5907 s3:winbind: Fix wrong string zero termination for empty groups
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cfc31bfe11d74be36b6725cdc0f3f57809ce60cf
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 27 09:59:50 2023 +0200
s3:libsmb: Fix conflicting declaration/implementation
../../source3/libsmb/clientgen.c:61:19: error: conflicting types for
‘cli_state_create’ due to enum/integer mismatch; have
‘struct cli_state *(TALLOC_CTX *, int, const char *, int
, int)’ {aka ‘struct cli_state *(void *, int, const char *, int,
int)’} [-Werror=enum-int-mismatch]
61 | struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
| ^~~~~~~~~~~~~~~~
In file included from ../../source3/libsmb/libsmb.h:28,
from ../../source3/libsmb/clientgen.c:22:
../../source3/libsmb/proto.h:180:19: note: previous declaration of
‘cli_state_create’ with type
‘struct cli_state *(TALLOC_CTX *, int, const char *,
enum smb_signing_setting, int)’ {aka ‘struct cli_state *(void *, int,
const char *, enum smb_signing_setting, int)’}
180 | struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
| ^~~~~~~~~~~~~~~~
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Mar 28 10:27:19 UTC 2023 on atb-devel-224
commit ec3229ed5c892eee53fe2d7aefac5a1efd7ab731
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 27 09:59:22 2023 +0200
s3:libsmb: Remove trailing whitespaces in clientgen.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 34251ba8f209d42f7a1dd1e8a2e24339b3c0a56b
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 27 11:33:53 2023 +0200
examples: Improve comment in smb.conf.default
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit d1db4ac09454e02f534fe6da0733f77d6ad6aa32
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 27 11:33:32 2023 +0200
examples: Remove trailing whitespaces in smb.conf.default
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit 1ba146dda309af3842d7a75bca2ac45e4363ac2c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 22 10:05:24 2023 +0100
examples: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit ff46836eeccf9ea43a2af296e9b5ecc242df2325
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 22 10:07:06 2023 +0100
examples: Remove trailing whitespaces in mklogon.conf
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit 4ada0ddea6775dd4b8ee7e6556f401ab7306eade
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 22 09:55:10 2023 +0100
examples: Remove trailing whitespaces in ol-schema-migrate.pl
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit b1767d505e85b4c73d41256515f859eb8f3f6b52
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 14 08:53:49 2023 +0100
buildtools: Fix code spelling
Best reviewed with: `git show --word-diff`
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit 98c14205a0d2ff380ef65120aae52a1567ee443b
Author: Andreas Schneider <asn at samba.org>
Date: Tue Mar 14 08:50:34 2023 +0100
auth: Fix code spelling
Best reviewed with: `git show --word-diff`
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
commit 71eb85bc252637db908ca57c2d9790f6109491e0
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 28 20:41:59 2023 +0100
s3:utils: Fix grammar in testparm
Best reviewed with: `git show --word-diff`
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Rowland Penny <rpenny at samba.org>
-----------------------------------------------------------------------
Summary of changes:
auth/auth_log.c | 4 +-
auth/common_auth.h | 2 +-
auth/credentials/credentials.c | 10 ++--
auth/credentials/credentials_internal.h | 2 +-
auth/credentials/credentials_krb5.c | 2 +-
auth/gensec/gensec_start.c | 2 +-
auth/gensec/gensec_util.c | 2 +-
auth/gensec/schannel.c | 2 +-
auth/gensec/spnego.c | 2 +-
auth/kerberos/gssapi_pac.c | 2 +-
auth/kerberos/kerberos_pac.c | 2 +-
auth/ntlmssp/ntlmssp.h | 2 +-
auth/ntlmssp/ntlmssp_client.c | 2 +-
auth/ntlmssp/ntlmssp_server.c | 2 +-
auth/ntlmssp/ntlmssp_sign.c | 2 +-
buildtools/examples/run_on_target.py | 2 +-
buildtools/wafsamba/samba_autoconf.py | 2 +-
buildtools/wafsamba/samba_bundled.py | 2 +-
buildtools/wafsamba/samba_conftests.py | 2 +-
buildtools/wafsamba/samba_headers.py | 2 +-
buildtools/wafsamba/samba_utils.py | 2 +-
buildtools/wafsamba/samba_waf18.py | 4 +-
buildtools/wafsamba/symbols.py | 2 +-
buildtools/wafsamba/wscript | 5 +-
examples/LDAP/ol-schema-migrate.pl | 56 +++++++++++-----------
examples/dce-dfs/smb.conf | 6 +--
examples/libsmbclient/testbrowse2.c | 2 +-
examples/logon/mklogon/mklogon.conf | 18 +++----
examples/logon/ntlogon/README | 8 ++--
examples/logon/ntlogon/ntlogon.py | 2 +-
examples/pam_winbind/pam_winbind.conf | 2 +-
examples/pcap2nbench/README | 2 +-
examples/printer-accounting/hp5-redir | 2 +-
examples/printer-accounting/lp-acct | 2 +-
examples/scripts/idmap/README | 2 +-
examples/scripts/nmb/findsmb | 2 +-
.../scripts/users_and_groups/adduserstogroups.pl | 2 +-
examples/scripts/users_and_groups/createdomobj.pl | 2 +-
examples/smb.conf.default | 32 ++++++-------
examples/validchars/readme | 2 +-
examples/winexe/winexesvc.c | 2 +-
source3/libsmb/clientgen.c | 13 ++---
source3/utils/testparm.c | 2 +-
43 files changed, 112 insertions(+), 110 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/auth_log.c b/auth/auth_log.c
index 787a9ec6b42..cf1f9109c74 100644
--- a/auth/auth_log.c
+++ b/auth/auth_log.c
@@ -124,7 +124,7 @@ static enum event_logon_type get_logon_type(
*
* IF adding a new field please update the minor version number AUTH_MINOR
*
- * To process the resulting log lines from the commend line use jq to
+ * To process the resulting log lines from the command line use jq to
* parse the json.
*
* grep "^ {" log file |
@@ -345,7 +345,7 @@ failure:
*
* IF adding a new field please update the minor version number AUTHZ_MINOR
*
- * To process the resulting log lines from the commend line use jq to
+ * To process the resulting log lines from the command line use jq to
* parse the json.
*
* grep "^ {" log_file |\
diff --git a/auth/common_auth.h b/auth/common_auth.h
index fb41d48be49..691c6359ac4 100644
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -37,7 +37,7 @@ enum auth_password_state {
#define AUTH_SESSION_INFO_DEFAULT_GROUPS 0x01 /* Add the user to the default world and network groups */
#define AUTH_SESSION_INFO_AUTHENTICATED 0x02 /* Add the user to the 'authenticated users' group */
-#define AUTH_SESSION_INFO_SIMPLE_PRIVILEGES 0x04 /* Use a trivial map between users and privilages, rather than a DB */
+#define AUTH_SESSION_INFO_SIMPLE_PRIVILEGES 0x04 /* Use a trivial map between users and privileges, rather than a DB */
#define AUTH_SESSION_INFO_UNIX_TOKEN 0x08 /* The returned token must have the unix_token and unix_info elements provided */
#define AUTH_SESSION_INFO_NTLM 0x10 /* The returned token must have authenticated-with-NTLM flag set */
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index 521951ff957..0485cc4e64e 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -210,7 +210,7 @@ _PUBLIC_ const char *cli_credentials_get_username(struct cli_credentials *cred)
*
* @param[in] obtained A pointer to store the obtained information.
*
- * return The user name or NULL if an error occured.
+ * return The user name or NULL if an error occurred.
*/
_PUBLIC_ const char *
cli_credentials_get_username_and_obtained(struct cli_credentials *cred,
@@ -259,7 +259,7 @@ _PUBLIC_ bool cli_credentials_set_bind_dn(struct cli_credentials *cred,
* Obtain the BIND DN for this credentials context.
* @param cred credentials context
* @retval The username set on this context.
- * @note Return value will be NULL if not specified explictly
+ * @note Return value will be NULL if not specified explicitly
*/
_PUBLIC_ const char *cli_credentials_get_bind_dn(struct cli_credentials *cred)
{
@@ -459,7 +459,7 @@ _PUBLIC_ const char *cli_credentials_get_password(struct cli_credentials *cred)
*
* @param[in] obtained A pointer to store the obtained information.
*
- * return The user name or NULL if an error occured.
+ * return The user name or NULL if an error occurred.
*/
_PUBLIC_ const char *
cli_credentials_get_password_and_obtained(struct cli_credentials *cred,
@@ -1290,7 +1290,7 @@ _PUBLIC_ void cli_credentials_set_secure_channel_type(struct cli_credentials *cr
}
/**
- * Return NETLOGON secure chanel type
+ * Return NETLOGON secure channel type
*/
_PUBLIC_ time_t cli_credentials_get_password_last_changed_time(struct cli_credentials *cred)
@@ -1309,7 +1309,7 @@ _PUBLIC_ void cli_credentials_set_password_last_changed_time(struct cli_credenti
}
/**
- * Return NETLOGON secure chanel type
+ * Return NETLOGON secure channel type
*/
_PUBLIC_ enum netr_SchannelType cli_credentials_get_secure_channel_type(struct cli_credentials *cred)
diff --git a/auth/credentials/credentials_internal.h b/auth/credentials/credentials_internal.h
index 3b1581acb11..966926919b0 100644
--- a/auth/credentials/credentials_internal.h
+++ b/auth/credentials/credentials_internal.h
@@ -110,7 +110,7 @@ struct cli_credentials {
/* Should we get a forwardable ticket? */
enum credentials_krb_forwardable krb_forwardable;
- /* Forced SASL mechansim */
+ /* Forced SASL mechanism */
char *forced_sasl_mech;
/* gensec features which should be used for connections */
diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 58926bc8723..c0631b43061 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -996,7 +996,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
ccache out of it. This routine can be generalised in future for
the case where we deal with GSSAPI mechs other than krb5.
- On sucess, the caller must not free gssapi_cred, as it now belongs
+ On success, the caller must not free gssapi_cred, as it now belongs
to the credentials system.
*/
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index bd5b7259d3f..b6979812ac0 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -870,7 +870,7 @@ static NTSTATUS gensec_start_mech(struct gensec_security *gensec_security)
}
/**
- * Start a GENSEC sub-mechanism with a specified mechansim structure, used in SPNEGO
+ * Start a GENSEC sub-mechanism with a specified mechanism structure, used in SPNEGO
*
*/
diff --git a/auth/gensec/gensec_util.c b/auth/gensec/gensec_util.c
index 1075b9fde87..b6b4a722f27 100644
--- a/auth/gensec/gensec_util.c
+++ b/auth/gensec/gensec_util.c
@@ -120,7 +120,7 @@ static bool gensec_gssapi_check_oid(const DATA_BLOB *blob, const char *oid)
}
/**
- * Check if the packet is one for the KRB5 mechansim
+ * Check if the packet is one for the KRB5 mechanism
*
* NOTE: This is a helper that can be employed by multiple mechanisms, do
* not make assumptions about the private_data
diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c
index 9860559668f..872e7d185e6 100644
--- a/auth/gensec/schannel.c
+++ b/auth/gensec/schannel.c
@@ -1068,7 +1068,7 @@ static NTSTATUS schannel_session_info(struct gensec_security *gensec_security,
}
/*
- * Reduce the attack surface by ensuring schannel is not availble when
+ * Reduce the attack surface by ensuring schannel is not available when
* we are not a DC
*/
static NTSTATUS schannel_server_start(struct gensec_security *gensec_security)
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c
index 87545d860e8..fcb5a06439e 100644
--- a/auth/gensec/spnego.c
+++ b/auth/gensec/spnego.c
@@ -65,7 +65,7 @@ struct spnego_neg_state {
struct spnego_neg_ops {
const char *name;
/*
- * The start hook does the initial processing on the incoming paket and
+ * The start hook does the initial processing on the incoming packet and
* may starts the first possible subcontext. It indicates that
* gensec_update() is required on the subcontext by returning
* NT_STATUS_MORE_PROCESSING_REQUIRED and return something useful in
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index 12043992308..4ad787396aa 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -85,7 +85,7 @@ NTSTATUS gssapi_obtain_pac_blob(TALLOC_CTX *mem_ctx,
OM_uint32 gss_maj, gss_min;
#ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
/*
- * gss_get_name_attribute() in MIT krb5 1.10.0 can return unintialized pac_display_buffer
+ * gss_get_name_attribute() in MIT krb5 1.10.0 can return uninitialized pac_display_buffer
* and later gss_release_buffer() will crash on attempting to release it.
*
* So always initialize the buffer descriptors.
diff --git a/auth/kerberos/kerberos_pac.c b/auth/kerberos/kerberos_pac.c
index 650c851bf13..b914075d85c 100644
--- a/auth/kerberos/kerberos_pac.c
+++ b/auth/kerberos/kerberos_pac.c
@@ -309,7 +309,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
memset(srv_sig_wipe->signature.data,
'\0', srv_sig_wipe->signature.length);
- /* and reencode, back into the same place it came from */
+ /* and re-encode, back into the same place it came from */
ndr_err = ndr_push_struct_blob(
kdc_sig_blob, pac_data_raw, kdc_sig_wipe,
(ndr_push_flags_fn_t)ndr_push_PAC_SIGNATURE_DATA);
diff --git a/auth/ntlmssp/ntlmssp.h b/auth/ntlmssp/ntlmssp.h
index 658d3fa86af..49f47c270bd 100644
--- a/auth/ntlmssp/ntlmssp.h
+++ b/auth/ntlmssp/ntlmssp.h
@@ -63,7 +63,7 @@ struct ntlmssp_state
bool use_ntlmv2;
bool use_ccache;
bool resume_ccache;
- bool use_nt_response; /* Set to 'False' to debug what happens when the NT response is omited */
+ bool use_nt_response; /* Set to 'False' to debug what happens when the NT response is omitted */
bool allow_lm_response;/* The LM_RESPONSE code is not very secure... */
bool allow_lm_key; /* The LM_KEY code is not very secure... */
diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c
index af1642d3256..337aeed9229 100644
--- a/auth/ntlmssp/ntlmssp_client.c
+++ b/auth/ntlmssp/ntlmssp_client.c
@@ -658,7 +658,7 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
if (!(flags & CLI_CRED_LANMAN_AUTH)) {
/* LM Key is still possible, just silly, so we do not
- * allow it. Fortunetly all LM crypto is off by
+ * allow it. Fortunately all LM crypto is off by
* default and we require command line options to end
* up here */
ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c
index 6a27db1b7d4..64b96283eb2 100644
--- a/auth/ntlmssp/ntlmssp_server.c
+++ b/auth/ntlmssp/ntlmssp_server.c
@@ -175,7 +175,7 @@ NTSTATUS gensec_ntlmssp_server_negotiate(struct gensec_security *gensec_security
}
/* The flags we send back are not just the negotiated flags,
- * they are also 'what is in this packet'. Therfore, we
+ * they are also 'what is in this packet'. Therefore, we
* operate on 'chal_flags' from here on
*/
diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c
index 11e5930a8de..b9be182e3f2 100644
--- a/auth/ntlmssp/ntlmssp_sign.c
+++ b/auth/ntlmssp/ntlmssp_sign.c
@@ -793,7 +793,7 @@ NTSTATUS ntlmssp_sign_reset(struct ntlmssp_state *ntlmssp_state,
/*
* Key weakening not performed on the master key for NTLM2
- * and does not occour for NTLM1. Therefore we only need
+ * and does not occur for NTLM1. Therefore we only need
* to do this for the LM_KEY.
*/
if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) {
diff --git a/buildtools/examples/run_on_target.py b/buildtools/examples/run_on_target.py
index 79c57308ad0..0c9ac5a6a18 100755
--- a/buildtools/examples/run_on_target.py
+++ b/buildtools/examples/run_on_target.py
@@ -38,7 +38,7 @@ import os
import subprocess
from optparse import OptionParser
-# those are defaults, but can be overidden using command line
+# these are defaults, but can be overridden using command line
SSH = 'ssh'
USER = None
HOST = 'localhost'
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index f429ad2d487..75d5f4acbcc 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -982,7 +982,7 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
'''enable/disable cache of configure results'''
if enable:
# when -C is chosen, we will use a private cache and will
- # not look into system includes. This roughtly matches what
+ # not look into system includes. This roughly matches what
# autoconf does with -C
cache_path = os.path.join(conf.bldnode.abspath(), '.confcache')
mkdir_p(cache_path)
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index c7b7246e0d6..2300565b2e4 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -57,7 +57,7 @@ Options.OptionsContext.PRIVATE_EXTENSION_DEFAULT = PRIVATE_EXTENSION_DEFAULT
def minimum_library_version(conf, libname, default):
- '''allow override of mininum system library version'''
+ '''allow override of minimum system library version'''
minlist = Options.options.MINIMUM_LIBRARY_VERSION
if not minlist:
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index bd309adb0dd..c5e3fc9ecf6 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -36,7 +36,7 @@ def check(self, *k, **kw):
if d:
additional_dirs.append(d)
- # we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below
+ # we add the additional dirs twice: once for the test data, and again if the compilation test succeeds below
def add_options_dir(dirs, env):
for x in dirs:
if not x in env.CPPPATH:
diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py
index 78f57772a82..37147a95328 100644
--- a/buildtools/wafsamba/samba_headers.py
+++ b/buildtools/wafsamba/samba_headers.py
@@ -132,7 +132,7 @@ def PUBLIC_HEADERS(bld, public_headers, header_path=None, public_headers_install
bld.SET_BUILD_GROUP('final')
if not bld.env.build_public_headers:
- # in this case no header munging neeeded. Used for tdb, talloc etc
+ # in this case no header munging needed. Used for tdb, talloc etc
public_headers_simple(bld, public_headers, header_path=header_path,
public_headers_install=public_headers_install)
return
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index a7ba2ac4d0d..39512f0ac96 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -327,7 +327,7 @@ def EXPAND_VARIABLES(ctx, varstr, vars=None):
env = ConfigSet.ConfigSet()
ret = varstr
- # substitute on user supplied dict if avaiilable
+ # substitute on user supplied dict if available
if vars is not None:
for v in vars.keys():
env[v] = vars[v]
diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py
index cfdceea14ca..54444b3ab68 100644
--- a/buildtools/wafsamba/samba_waf18.py
+++ b/buildtools/wafsamba/samba_waf18.py
@@ -148,7 +148,7 @@ Build.BuildContext.AUTOCLEANUP_STALE_FILES = Utils.nada
def check(self, *k, **kw):
'''Override the waf defaults to inject --with-directory options'''
- # match the configuration test with speficic options, for example:
+ # match the configuration test with specific options, for example:
# --with-libiconv -> Options.options.iconv_open -> "Checking for library iconv"
self.validate_c(kw)
@@ -161,7 +161,7 @@ def check(self, *k, **kw):
if d:
additional_dirs.append(d)
- # we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below
+ # we add the additional dirs twice: once for the test data, and again if the compilation test succeeds below
def add_options_dir(dirs, env):
for x in dirs:
if not x in env.CPPPATH:
diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 5fbc0723927..99e121c372c 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -436,7 +436,7 @@ def check_syslib_collisions(bld, tgt_list):
def check_dependencies(bld, t):
- '''check for depenencies that should be changed'''
+ '''check for dependencies that should be changed'''
if bld.get_tgen_by_name(t.sname + ".objlist"):
return
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 9ee158b1f39..47ed3f71234 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -118,7 +118,7 @@ Use this with extreme care
action="store_true", dest='disable_rpath_private_install', default=False)
gr.add_option('--nonshared-binary',
help=(
-f'''Disable use of shared libaries internal to {Context.g_module.APPNAME} for the listed binaries.
+f'''Disable use of shared libraries internal to {Context.g_module.APPNAME} for the listed binaries.
The resulting binaries are 'statically linked' with regard to components provided by
{Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so
@@ -528,7 +528,8 @@ def configure(conf):
strict=True,
msg='Checking for __attribute__')
- # Solaris by defauls uses draft versions of some functions unless you set _POSIX_PTHREAD_SEMANTICS
+ # Solaris by default uses draft versions of some functions unless you set
+ # _POSIX_PTHREAD_SEMANTICS
if sys.platform.startswith('sunos'):
conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1)
diff --git a/examples/LDAP/ol-schema-migrate.pl b/examples/LDAP/ol-schema-migrate.pl
index 12392cb4cd0..c0a6f016ffd 100755
--- a/examples/LDAP/ol-schema-migrate.pl
+++ b/examples/LDAP/ol-schema-migrate.pl
@@ -29,7 +29,7 @@
# Useful to manually correct nasty schemas like:
# https://sourceforge.net/tracker/?func=detail&atid=108390&aid=1429276&group_id=8390
# - 13 September 2007
-# Based on Samba Team GPL Compliance Officer request, license has been updated from
+# Based on Samba Team GPL Compliance Officer request, license has been updated from
# GPL to GPLv3+
#
# - Fedora DS bug you need to correct by hand :
@@ -52,8 +52,8 @@ foreach (@ARGV) {
$filename = $_ if ( ! /^-b$/ && ! /^-c$/ && ! /^-d$/);
}
-die "Usage : ol-schema-migrate-v2.pl [ -c ] [ -b ] [ -d ] schema\n" .
- " -c\tcount attribute and object class\n" .
+die "Usage : ol-schema-migrate-v2.pl [ -c ] [ -b ] [ -d ] schema\n" .
+ " -c\tcount attribute and object class\n" .
" -b\tconvert and beautify your schema\n" .
" -d\tdisplay unrecognized elements, find empty and duplicated OID\n" .
" -h\tthis help\n" if ($filename eq "" || ($optionHelp || (!$optionCount && !$optionPrint && !$optionBadEntries)));
@@ -62,7 +62,7 @@ if($optionCount) {
print "Schema verification counters:\n";
my $ldapdata = &getSourceFile($filename);
print "".(defined($ldapdata->{attributes}) ? @{$ldapdata->{attributes}} : 0) . " attributes\n";
- print "".(defined($ldapdata->{objectclass}) ? @{$ldapdata->{objectclass}} : 0) . " object classes\n\n"
+ print "".(defined($ldapdata->{objectclass}) ? @{$ldapdata->{objectclass}} : 0) . " object classes\n\n"
}
if($optionPrint) {
@@ -78,12 +78,12 @@ if($optionBadEntries) {
my $errorsDup = 0;
my $emptyOid = 0;
my %dup;
-
+
foreach (@{$ldapdata->{attributes}}) {
my $attr = $_;
-
+
push @{$dup{$attr->{OID}}{attr}}, {NAME => $attr->{NAME}, LINENUMBER => $attr->{LINENUMBER}};
-
+
$attr->{DATA} =~ s/\n/ /g;
$attr->{DATA} =~ s/\r//g;
$attr->{DATA} =~ s/attribute[t|T]ypes?:?\s*\(//;
@@ -104,11 +104,11 @@ if($optionBadEntries) {
$attr->{DATA} =~ s/^\s+(\S)/\n$1/ ;
$attr->{DATA} =~ s/(\S)\s+$/$1\n/;
do {
- $errorsAttr ++;
- do { $emptyOid ++;
+ $errorsAttr ++;
+ do { $emptyOid ++;
print "Warning : no OID for attributes element at line $attr->{LINENUMBER} \n";
} if( !defined($attr->{OID}));
- print "### Unknow element embedded in ATTRIBUTE at line $attr->{LINENUMBER} :\n$attr->{DATA}\n"
+ print "### Unknown element embedded in ATTRIBUTE at line $attr->{LINENUMBER} :\n$attr->{DATA}\n"
} if($attr->{DATA} =~ /\w/);
}
@@ -137,7 +137,7 @@ if($optionBadEntries) {
do { $emptyOid++ ;
print "Warning : no OID for object class element at line $objc->{LINENUMBER} \n";
} if( $objc->{OID} eq "");
- print "### Unknow element embedded in OBJECT CLASS at line $objc->{LINENUMBER} :\n$objc->{DATA}\n"
+ print "### Unknown element embedded in OBJECT CLASS at line $objc->{LINENUMBER} :\n$objc->{DATA}\n"
} if($objc->{DATA} =~ /\w/);
}
@@ -151,13 +151,13 @@ if($optionBadEntries) {
print "#" x 80 ."\n";
print "Duplicate OID founds : $_\n";
foreach (@{$dup{$_}{attr}}) {
-
+
print "Attribute : $_->{NAME} (line : $_->{LINENUMBER})\n";
}
foreach (@{$dup{$_}{objc}}) {
print "Object class : $_->{NAME} (line : $_->{LINENUMBER})\n";
}
-
+
}
}
@@ -199,10 +199,10 @@ sub printit {
foreach (@{$ldapdata->{objectclass}}) {
my $objc = $_;
- # next 3 lines : Fedora DS space sensitive bug workaround
- $objc->{SUP} =~ s/^\(\s*(.*?)\s*\)$/\( $1 \)/ if (defined $objc->{SUP});
- $objc->{MUST} =~ s/^\(\s*(.*?)\s*\)$/\( $1 \)/ if (defined $objc->{MUST});
- $objc->{MAY} =~ s/^\(\s*(.*?)\s*\)$/\( $1 \)/ if (defined $objc->{MAY});
+ # next 3 lines : Fedora DS space sensitive bug workaround
+ $objc->{SUP} =~ s/^\(\s*(.*?)\s*\)$/\( $1 \)/ if (defined $objc->{SUP});
+ $objc->{MUST} =~ s/^\(\s*(.*?)\s*\)$/\( $1 \)/ if (defined $objc->{MUST});
+ $objc->{MAY} =~ s/^\(\s*(.*?)\s*\)$/\( $1 \)/ if (defined $objc->{MAY});
print "objectClasses: (\n";
print " $objc->{OID}\n";
@@ -210,7 +210,7 @@ sub printit {
print " DESC '$objc->{DESC}'\n" if(defined $objc->{DESC});
print " OBSOLETE\n" if(defined $objc->{OBSOLETE});
print " SUP $objc->{SUP}\n" if(defined $objc->{SUP});
- print " $objc->{TYPE}\n" if(defined $objc->{TYPE});
+ print " $objc->{TYPE}\n" if(defined $objc->{TYPE});
print " MUST $objc->{MUST}\n" if(defined $objc->{MUST});
print " MAY $objc->{MAY}\n" if(defined $objc->{MAY});
print " )\n";
@@ -222,7 +222,7 @@ sub printSeparator {
print "#\n";
print "#" x 80 . "\n";
print "#\n";
-}
+}
sub getSourceFile {
my @data = &getFile(shift);
@@ -239,7 +239,7 @@ sub getSourceFile {
my $idx = 0;
--
Samba Shared Repository
More information about the samba-cvs
mailing list