[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed Jul 19 10:58:01 UTC 2023
The branch, master has been updated
via 801772012eb Revert "s3:winbindd: set TEVENT_DEPRECATED as tevent_thread_call_depth_*() api will change soon"
via 40fb810de39 s4:dns_server: Add some more debugging in order to find problems with level 10 logs
via 76b0530e673 s4:dns_server: defer calling werr_to_dns_err() in a central place
via fb4bb188acf s3:waf: Fix code spelling
via 83b58255ed5 s3:winbindd: Fix code spelling
via 746ef717a74 s3:utils: Fix code spelling
via 4cff81603ab s3:torture: Fix code spelling
via 7077ae40423 s3:smbd: Fix code spelling
via feee2018883 s3:smbd: Fix trailing white spaces in quotas.c
via 26d9da1543f s3:smbd: Fix trailing white spaces in dmapi.c
via 9fd809296ce s3:selftest: Fix code spelling
via 18dd3f3dd31 s3:script: Fix code spelling
via 9826fd4588f s3:rpc_server: Fix code spelling
via 4a817b1655d s3:rpc_client: Fix code spelling
via 6a359944f1f s3:registry: Fix code spelling
via 1517fd17094 s3:printing: Rename variably to dummy to make codespell happy
via 73abbd1465e s3:printing: Fix code spelling
via d8dd743f0b2 s3:printing: Fix trailing white spaces in print_iprint.c
via d41702abe09 s3:passdb: Fix code spelling
via 57047ca56d6 s3:param: Fix code spelling
via f8d5e70a913 s3:param: Rename bLoaded global variable
from 6e4c7ae9a2e ctdb-tests: Log to stderr in statd-callout tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 801772012ebdd702e0c9f5335d131fb7ad07dac6
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jul 19 11:19:55 2023 +0200
Revert "s3:winbindd: set TEVENT_DEPRECATED as tevent_thread_call_depth_*() api will change soon"
This reverts commit 28ddcaf4d8ebb7a4e3498518580ff71662d3cee0.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Wed Jul 19 10:57:27 UTC 2023 on atb-devel-224
commit 40fb810de39c681c647b9003fe7472d9fb010667
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jul 14 12:00:51 2022 +0200
s4:dns_server: Add some more debugging in order to find problems with level 10 logs
We had customer problems where level 10 logs were not good enough in
order to find the reason for failing dns updates.
With the new debug message there's at least a chance to
find out what the problem could be.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 76b0530e6734afe989c0defb9aba8acf2800401e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jul 14 12:00:51 2022 +0200
s4:dns_server: defer calling werr_to_dns_err() in a central place
The WERROR codes are much more verbose and it's better to
keep them until we really need the mapping to DNS error codes.
This will allow us to create much better debug messages in
the next commit.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit fb4bb188acfc3e88887b500a05e9e4db8b08aed3
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 12:29:12 2023 +0200
s3:waf: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 83b58255ed5c8cc371785ca1d42823cfb9273b06
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 11:45:25 2023 +0200
s3:winbindd: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 746ef717a74b679da794c31f24dff0d126bd9930
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 11:36:49 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 4cff81603ab55ebdbe1e7581fa91d6538231e3cf
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 11:35:22 2023 +0200
s3:torture: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 7077ae40423a4cbfa79b700c9b8f4da6d5d1612f
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 11:30:18 2023 +0200
s3:smbd: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit feee201888367404dc1302888c76628c027de7ed
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 11:30:56 2023 +0200
s3:smbd: Fix trailing white spaces in quotas.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 26d9da1543f271c51ad8f9733b5c823cda54f105
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 18 11:30:37 2023 +0200
s3:smbd: Fix trailing white spaces in dmapi.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 9fd809296cee4c035c6df33389b9aa84e0a6d263
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 17 18:25:41 2023 +0200
s3:selftest: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 18dd3f3dd31ce30071caa5196ad3ef4c391acf5a
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 17 15:03:58 2023 +0200
s3:script: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 9826fd4588f12db5f26474f73260010817e4024e
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 17 15:01:21 2023 +0200
s3:rpc_server: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 4a817b1655de199e37ebe2ac1bcbd15a7b9096a0
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 17 14:59:06 2023 +0200
s3:rpc_client: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 6a359944f1fd6a2f24bd5221f4ecf86b1594ac34
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:27:28 2023 +0200
s3:registry: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 1517fd17094ee15ee63e2ce51624f4e72fe0e1b2
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:25:50 2023 +0200
s3:printing: Rename variably to dummy to make codespell happy
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 73abbd1465ef7673652929c55e245b7249cdb08d
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:21:37 2023 +0200
s3:printing: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit d8dd743f0b2321e8cbcacddc6472306a670af2df
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:21:13 2023 +0200
s3:printing: Fix trailing white spaces in print_iprint.c
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit d41702abe099cd2450713e324859a82272cb013b
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:20:05 2023 +0200
s3:passdb: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 57047ca56d60dd68ce65578ecea6e6402d60b4e4
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:19:11 2023 +0200
s3:param: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit f8d5e70a913f76887927d99a58e6c4f90f6bec65
Author: Andreas Schneider <asn at samba.org>
Date: Thu Jul 13 09:18:42 2023 +0200
s3:param: Rename bLoaded global variable
This makes codespell happy.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 16 +++---
source3/passdb/machine_account_secrets.c | 2 +-
source3/passdb/passdb.c | 8 +--
source3/passdb/pdb_get_set.c | 2 +-
source3/passdb/pdb_interface.c | 2 +-
source3/passdb/pdb_ldap.c | 4 +-
source3/passdb/pdb_ldap.h | 2 +-
source3/passdb/pdb_smbpasswd.c | 6 +--
source3/passdb/pdb_tdb.c | 2 +-
source3/passdb/py_passdb.c | 2 +-
source3/printing/lpq_parse.c | 4 +-
source3/printing/nt_printing.c | 10 ++--
source3/printing/nt_printing_ads.c | 2 +-
source3/printing/print_iprint.c | 34 ++++++-------
source3/printing/printing.c | 16 +++---
source3/registry/reg_backend_db.c | 4 +-
source3/registry/reg_format.c | 2 +-
source3/registry/reg_format.h | 24 ++++-----
source3/registry/reg_import.h | 2 +-
source3/registry/reg_parse.h | 2 +-
source3/registry/reg_parse_dox.cfg | 4 +-
source3/registry/reg_parse_internal.h | 2 +-
source3/registry/reg_perfcount.c | 2 +-
source3/registry/regfio.c | 6 +--
source3/registry/regfio.h | 2 +-
source3/rpc_client/cli_lsarpc.h | 8 +--
source3/rpc_client/cli_pipe.c | 10 ++--
source3/rpc_client/cli_samr.c | 2 +-
source3/rpc_client/cli_samr.h | 22 ++++----
source3/rpc_client/cli_winreg.h | 8 +--
source3/rpc_client/cli_winreg_int.h | 4 +-
source3/rpc_client/cli_winreg_spoolss.h | 6 +--
source3/rpc_server/epmapper/srv_epmapper.c | 2 +-
source3/rpc_server/eventlog/srv_eventlog_nt.c | 2 +-
source3/rpc_server/mdssvc/dalloc.c | 2 +-
source3/rpc_server/mdssvc/mdssvc.c | 2 +-
source3/rpc_server/mdssvc/mdssvc.h | 4 +-
source3/rpc_server/mdssvc/sparql_mapping.h | 2 +-
source3/rpc_server/mdssvc/sparql_parser.y | 2 +-
source3/rpc_server/netlogon/srv_netlog_nt.c | 2 +-
source3/rpc_server/samr/srv_samr_chgpasswd.c | 4 +-
source3/rpc_server/samr/srv_samr_nt.c | 2 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 10 ++--
source3/rpc_server/srv_access_check.c | 4 +-
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 2 +-
source3/script/format_indent.sh | 2 +-
source3/script/tests/smbspool_argv_wrapper.c | 2 +-
source3/script/tests/test_net_misc.sh | 2 +-
source3/script/tests/test_net_registry.sh | 4 +-
source3/script/tests/test_sacl_set_get.sh | 2 +-
source3/script/tests/test_smb1_system_security.sh | 2 +-
source3/script/tests/test_smbclient_s3.sh | 4 +-
source3/script/tests/test_smbclient_tarmode.pl | 6 +--
source3/script/tests/test_smbclient_tarmode.sh | 2 +-
source3/script/tests/test_smbcquota.py | 2 +-
source3/script/tests/test_smbd_no_krb5.sh | 2 +-
source3/script/tests/test_smbspool.sh | 4 +-
source3/script/tests/vfstest-catia/run.sh | 2 +-
source3/selftest/tests.py | 2 +-
source3/smbd/blocking.c | 6 +--
source3/smbd/close.c | 2 +-
source3/smbd/conn.c | 2 +-
source3/smbd/dfree.c | 2 +-
source3/smbd/dmapi.c | 36 ++++++-------
source3/smbd/dosmode.c | 2 +-
source3/smbd/fake_file.c | 2 +-
source3/smbd/fd_handle.c | 2 +-
source3/smbd/filename.c | 2 +-
source3/smbd/globals.h | 2 +-
source3/smbd/mangle_hash.c | 2 +-
source3/smbd/mangle_hash2.c | 2 +-
source3/smbd/notify.c | 4 +-
source3/smbd/notifyd/notifyd.c | 2 +-
source3/smbd/ntquotas.c | 2 +-
source3/smbd/open.c | 8 +--
source3/smbd/posix_acls.c | 6 +--
source3/smbd/quotas.c | 16 +++---
source3/smbd/server.c | 2 +-
source3/smbd/smb1_ipc.c | 2 +-
source3/smbd/smb1_lanman.c | 44 ++++++++--------
source3/smbd/smb1_process.c | 4 +-
source3/smbd/smb1_reply.c | 12 ++---
source3/smbd/smb1_service.c | 2 +-
source3/smbd/smb2_create.c | 2 +-
source3/smbd/smb2_lock.c | 4 +-
source3/smbd/smb2_negprot.c | 2 +-
source3/smbd/smb2_nttrans.c | 4 +-
source3/smbd/smb2_reply.c | 8 +--
source3/smbd/smb2_server.c | 6 +--
source3/smbd/smb2_service.c | 4 +-
source3/smbd/smb2_sesssetup.c | 2 +-
source3/smbd/smb2_trans2.c | 4 +-
source3/smbd/smbXsrv_session.c | 6 +--
source3/smbd/smbd_cleanupd.c | 10 ++--
source3/torture/cmd_vfs.c | 2 +-
source3/torture/denytest.c | 4 +-
source3/torture/pdbtest.c | 8 +--
source3/torture/test_messaging_fd_passing.c | 2 +-
source3/torture/test_posix.c | 4 +-
source3/torture/test_smb1_dfs.c | 10 ++--
source3/torture/test_smb2.c | 2 +-
source3/torture/torture.c | 8 +--
source3/utils/net_ads.c | 4 +-
source3/utils/net_ads_gpo.c | 2 +-
source3/utils/net_cache.c | 2 +-
source3/utils/net_registry_check.c | 2 +-
source3/utils/net_rpc.c | 6 +--
source3/utils/net_rpc_conf.c | 4 +-
source3/utils/net_rpc_printer.c | 36 ++++++-------
source3/utils/net_rpc_rights.c | 2 +-
source3/utils/smbcacls.c | 6 +--
source3/winbindd/idmap_ldap.c | 4 +-
source3/winbindd/idmap_nss.c | 4 +-
source3/winbindd/idmap_rid.c | 4 +-
source3/winbindd/idmap_tdb2.c | 2 +-
source3/winbindd/wb_lookupsids.c | 2 +-
source3/winbindd/wb_seqnums.c | 12 ++---
source3/winbindd/winbindd.c | 3 +-
source3/winbindd/winbindd.h | 2 +-
source3/winbindd/winbindd_ads.c | 4 +-
source3/winbindd/winbindd_cache.c | 2 +-
source3/winbindd/winbindd_ccache_access.c | 2 +-
source3/winbindd/winbindd_cm.c | 4 +-
source3/winbindd/winbindd_cred_cache.c | 2 +-
source3/winbindd/winbindd_creds.c | 2 +-
source3/winbindd/winbindd_dual.c | 3 +-
source3/winbindd/winbindd_getgrnam.c | 2 +-
source3/winbindd/winbindd_gpupdate.c | 2 +-
source3/winbindd/winbindd_group.c | 2 +-
source3/winbindd/winbindd_irpc.c | 2 +-
source3/winbindd/winbindd_pam.c | 14 ++---
source3/winbindd/winbindd_proto.h | 2 +-
source3/winbindd/winbindd_samr.c | 2 +-
source3/winbindd/winbindd_show_sequence.c | 8 +--
source3/winbindd/winbindd_util.c | 2 +-
source3/wscript | 8 +--
source4/dns_server/dns_crypto.c | 14 +++++
source4/dns_server/dns_server.c | 62 +++++++++++++++--------
source4/dns_server/dns_update.c | 18 +++++++
139 files changed, 432 insertions(+), 380 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index fd9157fb95f..68e20729661 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -86,7 +86,7 @@
#include <sys/sysctl.h>
#endif
-bool bLoaded = false;
+bool b_loaded = false;
/* the special value for the include parameter
* to be interpreted not as a file name but to
@@ -1708,7 +1708,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
pszPrintername);
lpcfg_string_set(ServicePtrs[i], &ServicePtrs[i]->comment, comment);
- /* set the browseable flag from the gloabl default */
+ /* set the browseable flag from the global default */
ServicePtrs[i]->browseable = sDefault.browseable;
/* Printers cannot be read_only. */
@@ -1784,7 +1784,7 @@ bool lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
/**************************************************************************
Determine the canonical name for a parameter.
Turn the value given into the inverse boolean expression when
- the synonym is an invers boolean synonym.
+ the synonym is an inverse boolean synonym.
Return true if
- parm_name is a valid parameter name and
@@ -1845,7 +1845,7 @@ static int map_parameter_canonical(const char *pszParmName, bool *inverse)
parm_num = lpcfg_map_parameter(pszParmName);
if ((parm_num < 0) || !(parm_table[parm_num].flags & FLAG_SYNONYM)) {
- /* invalid, parametric or no canidate for synonyms ... */
+ /* invalid, parametric or no candidate for synonyms ... */
goto done;
}
@@ -3047,7 +3047,7 @@ void lp_add_one_printer(const char *name, const char *comment,
bool lp_loaded(void)
{
- return (bLoaded);
+ return (b_loaded);
}
/***************************************************************************
@@ -3094,7 +3094,7 @@ void lp_killservice(int iServiceIn)
}
/***************************************************************************
- Save the curent values of all global and sDefault parameters into the
+ Save the current values of all global and sDefault parameters into the
defaults union. This allows testparm to show only the
changed (ie. non-default) parameters.
***************************************************************************/
@@ -3163,7 +3163,7 @@ static void lp_save_defaults(void)
}
/***********************************************************
- If we should send plaintext/LANMAN passwords in the clinet
+ If we should send plaintext/LANMAN passwords in the client
************************************************************/
static void set_allowed_client_auth(void)
@@ -4109,7 +4109,7 @@ static bool lp_load_ex(const char *pszFname,
lp_password_server()));
}
- bLoaded = true;
+ b_loaded = true;
/* Now we check we_are_a_wins_server and set szWINSserver to 127.0.0.1 */
/* if we_are_a_wins_server is true and we are in the client */
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 494059b2849..a80b1633892 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -1804,7 +1804,7 @@ static NTSTATUS secrets_check_password_change(const struct secrets_domain_info1
}
/*
- * Here we check that the given strucure still contains the
+ * Here we check that the given structure still contains the
* same secrets_domain_info1_change as currently stored.
*
* There's always a gap between secrets_prepare_password_change()
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 8b66a992269..4bc48f63ee8 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1049,7 +1049,7 @@ static bool init_samu_from_buffer_v0(struct samu *sampass, uint8_t *buf, uint32_
&lm_pw_len, &lm_pw_ptr, /* B */
&nt_pw_len, &nt_pw_ptr, /* B */
&acct_ctrl, /* w */
- &remove_me, /* remove on the next TDB_FORMAT upgarde */ /* d */
+ &remove_me, /* remove on the next TDB_FORMAT upgrade */ /* d */
&logon_divs, /* w */
&hours_len, /* d */
&hourslen, &hours, /* B */
@@ -2102,7 +2102,7 @@ static uint32_t init_buffer_from_samu_v4(uint8_t **buf, struct samu *sampass, bo
}
/**********************************************************************
- Intialize a struct samu struct from a BYTE buffer of size len
+ Initialize a struct samu struct from a BYTE buffer of size len
*********************************************************************/
bool init_samu_from_buffer(struct samu *sampass, uint32_t level,
@@ -2125,7 +2125,7 @@ bool init_samu_from_buffer(struct samu *sampass, uint32_t level,
}
/**********************************************************************
- Intialize a BYTE buffer from a struct samu struct
+ Initialize a BYTE buffer from a struct samu struct
*********************************************************************/
uint32_t init_buffer_from_samu (uint8_t **buf, struct samu *sampass, bool size_only)
@@ -2408,7 +2408,7 @@ static bool get_trust_pw_clear2(const char *domain,
* request to trusted domains are performed through our dc.)
*
* So we simply use our own domain name to retrieve the
- * machine account passowrd and ignore the request domain here.
+ * machine account password and ignore the request domain here.
*/
pwd = secrets_fetch_machine_password(lp_workgroup(), &last_set_time, channel);
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c
index d598fe51e1f..6789cc0824e 100644
--- a/source3/passdb/pdb_get_set.c
+++ b/source3/passdb/pdb_get_set.c
@@ -32,7 +32,7 @@
/**
* @todo Redefine this to NULL, but this changes the API because
- * much of samba assumes that the pdb_get...() funtions
+ * much of samba assumes that the pdb_get...() functions
* return strings. (ie not null-pointers).
* See also pdb_fill_default_sam().
*/
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 118a5d76926..14d7c2aec5f 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -253,7 +253,7 @@ struct pdb_domain_info *pdb_get_domain_info(TALLOC_CTX *mem_ctx)
*
* @param[in] sampass The sam user to check.
*
- * @return True if the function was successfull, false on an error.
+ * @return True if the function was successful, false on an error.
*/
static bool pdb_try_account_unlock(struct samu *sampass)
{
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 46ba5e9a773..83c61e206b5 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -177,7 +177,7 @@ static NTSTATUS ldapsam_get_seq_num(struct pdb_methods *my_methods, time_t *seq_
const char *p;
const char **attrs;
- /* Unfortunatly there is no proper way to detect syncrepl-support in
+ /* Unfortunately there is no proper way to detect syncrepl-support in
* smbldap_connect_system(). The syncrepl OIDs are submitted for publication
* but do not show up in the root-DSE yet. Neither we can query the
* subschema-context for the syncProviderSubentry or syncConsumerSubentry
@@ -1684,7 +1684,7 @@ static NTSTATUS ldapsam_getsampwsid(struct pdb_methods *my_methods, struct samu
}
/********************************************************************
- Do the actual modification - also change a plaintext passord if
+ Do the actual modification - also change a plaintext password if
it it set.
**********************************************************************/
diff --git a/source3/passdb/pdb_ldap.h b/source3/passdb/pdb_ldap.h
index d83c2afbbba..755574a35d0 100644
--- a/source3/passdb/pdb_ldap.h
+++ b/source3/passdb/pdb_ldap.h
@@ -31,7 +31,7 @@
struct ldapsam_privates {
struct smbldap_state *smbldap_state;
- /* Former statics */
+ /* Former statistics */
LDAPMessage *result;
LDAPMessage *entry;
int index;
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 515e5f9f84d..36e016f02c4 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -167,7 +167,7 @@ static bool pw_file_unlock(int fd, int *plock_depth)
}
/**************************************************************
- Intialize a smb_passwd struct
+ Initialize a smb_passwd struct
*************************************************************/
static void pdb_init_smb(struct smb_passwd *user)
@@ -283,7 +283,7 @@ Error was %s\n", pfile, strerror(errno) ));
* by doing a stat on the filename and an fstat on the fd. If the
* two inodes differ then someone did a rename between the open and
* the lock. Back off and try the open again. Only do this 5 times to
- * prevent infinate loops. JRA.
+ * prevent infinite loops. JRA.
*/
if (sys_stat(pfile, &sbuf1, false) != 0) {
@@ -1203,7 +1203,7 @@ static bool build_smb_pass (struct smb_passwd *smb_pw, const struct samu *sampas
if (!IS_SAM_DEFAULT(sampass, PDB_USERSID)) {
rid = pdb_get_user_rid(sampass);
- /* If the user specified a RID, make sure its able to be both stored and retreived */
+ /* If the user specified a RID, make sure its able to be both stored and retrieved */
if (rid == DOMAIN_RID_GUEST) {
struct passwd *passwd = Get_Pwnam_alloc(NULL, lp_guest_account());
if (!passwd) {
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 161030fed8b..ab632dc596f 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -1306,7 +1306,7 @@ static bool tdbsam_is_responsible_for_builtin(struct pdb_methods *m)
}
/*********************************************************************
- Initialize the tdb sam backend. Setup the dispath table of methods,
+ Initialize the tdb sam backend. Setup the dispatch table of methods,
open the tdb, etc...
*********************************************************************/
diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 2d5b2ab5705..7982654b6bc 100644
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -3698,7 +3698,7 @@ static PyMethodDef py_pdb_methods[] = {
Get account policy information as a dictionary." },
{ "set_account_policy", py_pdb_set_account_policy, METH_VARARGS,
"get_account_policy(Mapping) -> None\n\n \
- Set account policy settings from a dicionary." },
+ Set account policy settings from a dictionary." },
/* get_seq_num */
{ "search_users", py_pdb_search_users, METH_VARARGS,
"search_users(acct_flags) -> List\n\n \
diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index 335bc7f4e75..835140216f0 100644
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -340,8 +340,8 @@ parse lpq on an aix system
Queue Dev Status Job Files User PP % Blks Cp Rnk
------- ----- --------- --- ------------------ ---------- ---- -- ----- --- ---
-lazer lazer READY
-lazer lazer RUNNING 537 6297doc.A kvintus at IE 0 10 2445 1 1
+laser laser READY
+laser laser RUNNING 537 6297doc.A kvintus at IE 0 10 2445 1 1
QUEUED 538 C.ps root at IEDVB 124 1 2
QUEUED 539 E.ps root at IEDVB 28 1 3
QUEUED 540 L.ps root at IEDVB 172 1 4
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 4b4d12f25d5..7907fb4b229 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -596,7 +596,7 @@ static int handle_ne_file(files_struct *fsp,
}
/*
- * Potential match data crosses buf boundry,
+ * Potential match data crosses buf boundary,
* move it to beginning of buf, and fill the
* buf with as much as it will hold.
*/
@@ -1161,7 +1161,7 @@ static uint32_t get_correct_cversion(const struct auth_session_info *session_inf
/*
* This is a Microsoft'ism. See references in MSDN to VER_FILEVERSION
* for more details. Version in this case is not just the version of the
- * file, but the version in the sense of kernal mode (2) vs. user mode
+ * file, but the version in the sense of kernel mode (2) vs. user mode
* (3) drivers. Other bits of the version fields are the version info.
* JRR 010716
*/
@@ -1277,7 +1277,7 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
* we can get .\driver.dll
* or worse c:\windows\system\driver.dll !
*/
- /* using an intermediate string to not have overlaping memcpy()'s */
+ /* using an intermediate string to not have overlapping memcpy()'s */
strip_driver_path(mem_ctx, *driver_path);
strip_driver_path(mem_ctx, *data_file);
@@ -1809,7 +1809,7 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
/* now check the error code */
if ( W_ERROR_IS_OK(werr) ) {
- /* it's ok to remove the driver, we have other architctures left */
+ /* it's ok to remove the driver, we have other architectures left */
in_use = false;
talloc_free(driver);
}
@@ -2192,7 +2192,7 @@ bool delete_driver_files(const struct auth_session_info *session_info,
/*
A printer and a printer driver are 2 different things.
- NT manages them separatelly, Samba does the same.
+ NT manages them separately, Samba does the same.
Why ? Simply because it's easier and it makes sense !
Now explanation: You have 3 printers behind your samba server,
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 0056786ad49..4d5991e6dc7 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -464,7 +464,7 @@ static WERROR nt_printer_info_to_mods(TALLOC_CTX *ctx,
}
ads_mod_str(ctx, mods, SPOOL_REG_VERSIONNUMBER, info_str);
- /* empty strings in the mods list result in an attrubute error */
+ /* empty strings in the mods list result in an attribute error */
if (strlen(info2->drivername) != 0)
ads_mod_str(ctx, mods, SPOOL_REG_DRIVERNAME, info2->drivername);
if (strlen(info2->location) != 0)
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index f10dee08c4a..6600d954ded 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -9,12 +9,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -229,7 +229,7 @@ static int iprint_cache_add_printer(http_t *http,
"security-enabled",
"printer-info",
"smb-enabled"
- };
+ };
request = ippNew();
@@ -269,7 +269,7 @@ static int iprint_cache_add_printer(http_t *http,
/*
* Ignore printers that cannot be queried without credentials
*/
- if (lastErr == IPP_FORBIDDEN ||
+ if (lastErr == IPP_FORBIDDEN ||
lastErr == IPP_NOT_AUTHENTICATED ||
lastErr == IPP_NOT_AUTHORIZED)
goto out;
@@ -345,7 +345,7 @@ static int iprint_cache_add_printer(http_t *http,
* disabled for the printer
*/
- if (name != NULL && !secure && smb_enabled)
+ if (name != NULL && !secure && smb_enabled)
pcap_cache_add_specific(pcache, name, info, NULL);
}
@@ -391,7 +391,7 @@ bool iprint_cache_reload(struct pcap_cache **_pcache)
http = httpConnect(iprint_server(), ippPort());
#endif
if (http == NULL) {
- DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
+ DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
iprint_server(), strerror(errno)));
goto out;
}
@@ -523,7 +523,7 @@ static int iprint_job_delete(const char *sharename, const char *lprm_command, st
http = httpConnect(iprint_server(), ippPort());
#endif
if (http == NULL) {
- DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
+ DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
iprint_server(), strerror(errno)));
goto out;
}
@@ -635,7 +635,7 @@ static int iprint_job_pause(int snum, struct printjob *pjob)
http = httpConnect(iprint_server(), ippPort());
#endif
if (http == NULL) {
- DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
+ DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
iprint_server(), strerror(errno)));
goto out;
}
@@ -749,7 +749,7 @@ static int iprint_job_resume(int snum, struct printjob *pjob)
http = httpConnect(iprint_server(), ippPort());
#endif
if (http == NULL) {
- DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
+ DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
iprint_server(), strerror(errno)));
goto out;
}
@@ -864,7 +864,7 @@ static int iprint_job_submit(int snum, struct printjob *pjob,
http = httpConnect(iprint_server(), ippPort());
#endif
if (http == NULL) {
- DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
+ DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
iprint_server(), strerror(errno)));
goto out;
}
@@ -962,7 +962,7 @@ static int iprint_job_submit(int snum, struct printjob *pjob,
static int iprint_queue_get(const char *sharename,
enum printing_types printing_type,
char *lpq_command,
- print_queue_struct **q,
+ print_queue_struct **q,
print_status_struct *status)
{
fstring printername;
@@ -1008,10 +1008,10 @@ static int iprint_queue_get(const char *sharename,
*q = NULL;
- /* HACK ALERT!!! The porblem with support the 'printer name'
- option is that we key the tdb off the sharename. So we will
- overload the lpq_command string to pass in the printername
- (which is basically what we do for non-cups printers ... using
+ /* HACK ALERT!!! The problem with support the 'printer name'
+ option is that we key the tdb off the sharename. So we will
+ overload the lpq_command string to pass in the printername
+ (which is basically what we do for non-cups printers ... using
the lpq_command to get the queue listing). */
fstrcpy( printername, lpq_command );
@@ -1041,7 +1041,7 @@ static int iprint_queue_get(const char *sharename,
http = httpConnect(iprint_server(), ippPort());
#endif
if (http == NULL) {
- DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
+ DEBUG(0,("Unable to connect to iPrint server %s - %s\n",
iprint_server(), strerror(errno)));
goto out;
}
@@ -1056,7 +1056,7 @@ static int iprint_queue_get(const char *sharename,
/*
* For Linux iPrint servers from OES SP1 on, the iPrint server
* uses Unix time for job start times unless it detects the iPrint
- * client in an http User-Agent header. (This was done to accomodate
+ * client in an http User-Agent header. (This was done to accommodate
* CUPS broken behavior. According to RFC 2911, section 4.3.14, job
* start times are supposed to be relative to how long the printer has
* been up.) Since libcups doesn't allow us to set that header before
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index f7911244398..5cf170d4dae 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1433,7 +1433,7 @@ static void print_queue_update_internal(struct tevent_context *ev,
/****************************************************************************
Update the internal database from the system print queue for a queue.
- obtain a lock on the print queue before proceeding (needed when mutiple
+ obtain a lock on the print queue before proceeding (needed when multiple
smbd processes maytry to update the lpq cache concurrently).
****************************************************************************/
@@ -1705,7 +1705,7 @@ bool print_notify_register_pid(int snum)
/* if (snum == -1), then the change notify request was
on a print server handle and we need to register on
- all print queus */
+ all print queues */
if (snum == -1)
{
@@ -1887,7 +1887,7 @@ bool print_job_exists(const char* sharename, uint32_t jobid)
}
/****************************************************************************
- Return the device mode asigned to a specific print job.
+ Return the device mode assigned to a specific print job.
Only valid for the process doing the spooling and when the job
has not been spooled.
****************************************************************************/
@@ -1997,7 +1997,7 @@ static bool print_job_delete1(struct tevent_context *ev,
/* Hrm - we need to be able to cope with deleting a job before it
has reached the spooler. Just mark it as LPQ_DELETING and
- let the print_queue_update() code rmeove the record */
+ let the print_queue_update() code remove the record */
if (pjob->sysjob == -1) {
@@ -2462,10 +2462,10 @@ static WERROR allocate_print_jobid(struct tdb_print_db *pdb, int snum,
/* Store a dummy placeholder. */
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list