[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Jun 23 14:52:02 UTC 2023
The branch, master has been updated
via c837ecf442c python:samba: Fix code spelling
via d4798967c00 python:samba:tests: Fix code spelling
via ab3792931b3 python:samba:subunit: Fix code spelling
via cac56ae4b8f python:samba:samba3: Fix code spelling
via e5476ecfb07 python:samba:provision: Fix code spelling
via e046986d04c python:samba:netcmd: Fix code spelling
via de2c4879cef python:samba:kcc: Fix code spelling
via 97fb06a2607 python:samba:gp_parse: Fix code spelling
via f3b2814d842 python:samba:gp: Fix code spelling
via a15b8611ceb python:samba:emulate: Fix code spelling
via 535617a840d pidl: Fix code spelling
via 35500dc4e34 packaging:systemd: Fix code spelling
via 51bec2206e0 nsswitch: Fix code spelling
via eba5b05a511 librpc:rpc: Fix code spelling
via 4ec8ecce076 librpc:ndr: Fix code spelling
via ba02d89be10 librpc:idl: Fix code spelling
via 5d759393e5c libgpo:admx: Fix code spelling
via 232f281bd40 libcli:smbreadline: Fix code spelling
from 91eb3f1d223 testprogs/blackbox: add --recursive tests to test_samba-tool_ntacl.sh
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c837ecf442cfb8e19abaa917ff61f323a41829fd
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:31:52 2023 +0200
python:samba: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Jun 23 14:51:14 UTC 2023 on atb-devel-224
commit d4798967c00bd78f102acb9cba8641390072fbdc
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:28:13 2023 +0200
python:samba:tests: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ab3792931b38d1941cb915d0d79d4035111afbd1
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:23:25 2023 +0200
python:samba:subunit: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit cac56ae4b8f253482f8441c7c35ba6f5a77462f5
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:22:56 2023 +0200
python:samba:samba3: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e5476ecfb0751d83ba5568a632052700c691ef9e
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:22:19 2023 +0200
python:samba:provision: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e046986d04cb9323a5853f565ca1e5e422f1d976
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:17:58 2023 +0200
python:samba:netcmd: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit de2c4879cefd83a9ca7d91b236669fa54806a22e
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:14:39 2023 +0200
python:samba:kcc: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 97fb06a26072e61ea8f2b9efd94e13d50fb30e3d
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:13:28 2023 +0200
python:samba:gp_parse: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f3b2814d842809e5e95e2eba094ab08fe71057e2
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:13:15 2023 +0200
python:samba:gp: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit a15b8611cebc7161e68444143174ce087a5df8ef
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:12:45 2023 +0200
python:samba:emulate: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 535617a840d24c4502e52c0eae192df5f2dd00f7
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:04:46 2023 +0200
pidl: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 35500dc4e34bc6315948fd6fb415510c9c2c9cf2
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:02:02 2023 +0200
packaging:systemd: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 51bec2206e02979ffd9abc635d862e332ee6caab
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:01:27 2023 +0200
nsswitch: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit eba5b05a511ce1de1c5609d11a32903b536a1b41
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 13:00:06 2023 +0200
librpc:rpc: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4ec8ecce07615a4e6ac208bc600e0b1cacb058da
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 12:59:25 2023 +0200
librpc:ndr: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ba02d89be104ad1bd5e5712af8fde3bd90d0d2ea
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 12:58:34 2023 +0200
librpc:idl: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5d759393e5c3279edfb10c8d09a400699078fb25
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 12:54:17 2023 +0200
libgpo:admx: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 232f281bd40c39498e69a6f4ae6759d8acafcfc0
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jun 6 12:51:39 2023 +0200
libcli:smbreadline: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/smbreadline/smbreadline.c | 2 +-
libgpo/admx/en-US/samba.adml | 18 ++++++-------
libgpo/admx/ru-RU/samba.adml | 2 +-
librpc/idl/atsvc.idl | 4 +--
librpc/idl/auth.idl | 2 +-
librpc/idl/backupkey.idl | 6 ++---
librpc/idl/claims.idl | 2 +-
librpc/idl/drsblobs.idl | 2 +-
librpc/idl/drsuapi.idl | 6 ++---
librpc/idl/lsa.idl | 2 +-
librpc/idl/netlogon.idl | 2 +-
librpc/idl/ntlmssp.idl | 2 +-
librpc/idl/oxidresolver.idl | 2 +-
librpc/idl/samr.idl | 4 +--
librpc/idl/security.idl | 8 +++---
librpc/idl/smb_acl.idl | 2 +-
librpc/idl/spoolss.idl | 2 +-
librpc/idl/wscript_build | 12 ++++-----
librpc/idl/xattr.idl | 2 +-
librpc/ndr/ndr.c | 4 +--
librpc/ndr/ndr_backupkey.c | 4 +--
librpc/ndr/ndr_compression.c | 10 ++++----
librpc/ndr/ndr_string.c | 30 +++++++++++-----------
librpc/ndr/ndr_table.c | 4 +--
librpc/rpc/dcerpc_util.c | 8 +++---
librpc/rpc/dcerpc_util.h | 4 +--
librpc/rpc/dcesrv_core.c | 2 +-
nsswitch/libwbclient/wbclient.h | 14 +++++-----
nsswitch/winbind_nss_aix.c | 2 +-
nsswitch/winbind_nss_linux.c | 2 +-
nsswitch/winbind_nss_solaris.c | 2 +-
packaging/systemd/README | 4 +--
pidl/lib/Parse/Pidl/ODL.pm | 2 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm | 4 +--
python/samba/__init__.py | 6 ++---
python/samba/dbchecker.py | 2 +-
python/samba/descriptor.py | 2 +-
python/samba/dnsserver.py | 2 +-
python/samba/domain_update.py | 2 +-
python/samba/drs_utils.py | 2 +-
python/samba/emulate/traffic.py | 10 ++++----
python/samba/gp/gpclass.py | 2 +-
python/samba/gp_parse/__init__.py | 2 +-
python/samba/gp_parse/gp_inf.py | 2 +-
python/samba/join.py | 4 +--
python/samba/kcc/__init__.py | 14 +++++-----
python/samba/kcc/graph.py | 2 +-
python/samba/kcc/kcc_utils.py | 16 ++++++------
python/samba/kcc/ldif_import_export.py | 10 ++++----
python/samba/ms_forest_updates_markdown.py | 2 +-
python/samba/netcmd/__init__.py | 6 ++---
python/samba/netcmd/common.py | 2 +-
python/samba/netcmd/dns.py | 2 +-
python/samba/netcmd/domain/backup.py | 2 +-
python/samba/netcmd/domain/classicupgrade.py | 2 +-
python/samba/netcmd/domain/provision.py | 4 +--
python/samba/netcmd/domain/trust.py | 4 +--
python/samba/netcmd/drs.py | 4 +--
python/samba/netcmd/gpo.py | 3 ++-
python/samba/netcmd/ldapcmp.py | 6 ++---
python/samba/netcmd/ou.py | 14 +++++-----
python/samba/netcmd/schema.py | 2 +-
python/samba/netcmd/user.py | 8 +++---
python/samba/netcmd/visualize.py | 2 +-
python/samba/ntacls.py | 4 +--
python/samba/policies.py | 2 +-
python/samba/provision/__init__.py | 10 ++++----
python/samba/provision/common.py | 4 +--
python/samba/provision/sambadns.py | 6 ++---
python/samba/remove_dc.py | 4 +--
python/samba/samba3/__init__.py | 2 +-
python/samba/samdb.py | 4 +--
python/samba/subunit/__init__.py | 2 +-
python/samba/subunit/run.py | 2 +-
.../blackbox/smbcacls_dfs_propagate_inherit.py | 2 +-
.../blackbox/smbcacls_propagate_inhertance.py | 6 ++---
python/samba/tests/compression.py | 6 ++---
python/samba/tests/core.py | 2 +-
python/samba/tests/dcerpc/dnsserver.py | 2 +-
python/samba/tests/dcerpc/srvsvc.py | 2 +-
python/samba/tests/dcerpc/string_tests.py | 2 +-
python/samba/tests/dns_aging.py | 2 +-
python/samba/tests/domain_backup.py | 6 ++---
python/samba/tests/dsdb.py | 2 +-
python/samba/tests/getdcname.py | 16 ++++++------
python/samba/tests/krb5/claims_in_pac.py | 2 +-
python/samba/tests/krb5/claims_tests.py | 2 +-
python/samba/tests/krb5/fast_tests.py | 2 +-
python/samba/tests/krb5/kpasswd_tests.py | 2 +-
.../krb5/ms_kile_client_principal_lookup_tests.py | 2 +-
python/samba/tests/krb5_credentials.py | 2 +-
python/samba/tests/ldap_referrals.py | 16 ++++++------
python/samba/tests/ldap_upn_sam_account.py | 2 +-
python/samba/tests/net_join_no_spnego.py | 2 +-
python/samba/tests/param.py | 4 +--
python/samba/tests/samba_tool/contact.py | 2 +-
python/samba/tests/samba_tool/dnscmd.py | 4 +--
.../samba_tool/drs_clone_dc_data_lmdb_size.py | 2 +-
python/samba/tests/samba_tool/passwordsettings.py | 2 +-
.../samba/tests/samba_tool/promote_dc_lmdb_size.py | 2 +-
.../samba/tests/samba_tool/provision_lmdb_size.py | 2 +-
python/samba/tests/samba_tool/user.py | 2 +-
.../samba/tests/samba_tool/user_virtualCryptSHA.py | 2 +-
.../user_virtualCryptSHA_userPassword.py | 2 +-
python/samba/tests/smb-notify.py | 2 +-
python/samba/tests/smbd_base.py | 2 +-
python/samba/tests/xattr.py | 6 +++--
python/samba/upgradehelpers.py | 12 ++++-----
108 files changed, 244 insertions(+), 241 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
index 6929209be20..0a95c6319e5 100644
--- a/libcli/smbreadline/smbreadline.c
+++ b/libcli/smbreadline/smbreadline.c
@@ -124,7 +124,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
#ifdef HAVE_LIBREADLINE
- /* Aargh! Readline does bizzare things with the terminal width
+ /* Aargh! Readline does bizarre things with the terminal width
that mucks up expect(1). Set CLI_NO_READLINE in the environment
to force readline not to be used. */
diff --git a/libgpo/admx/en-US/samba.adml b/libgpo/admx/en-US/samba.adml
index c073758b004..3bfb30c5649 100755
--- a/libgpo/admx/en-US/samba.adml
+++ b/libgpo/admx/en-US/samba.adml
@@ -234,16 +234,16 @@ Example: searching</string>
Example: off</string>
<string id="POL_E31CD0A8_5A4A_5657_8ACA_123A200C6E06">ldap group suffix</string>
- <string id="POL_E31CD0A8_5A4A_5657_8ACA_123A200C6E06_Help">This parameter specifies the suffix that is used for groups when these are added to the LDAP directory. If this parameter is unset, the value of will be used instead. The suffix string is pre-pended to the
+ <string id="POL_E31CD0A8_5A4A_5657_8ACA_123A200C6E06_Help">This parameter specifies the suffix that is used for groups when these are added to the LDAP directory. If this parameter is unset, the value of will be used instead. The suffix string is prepended to the
string so use a partial DN.
Example: ou=Groups</string>
<string id="POL_FC4495FC_4C6E_50C8_9B37_08D9955A883B">ldap idmap suffix</string>
- <string id="POL_FC4495FC_4C6E_50C8_9B37_08D9955A883B_Help">This parameters specifies the suffix that is used when storing idmap mappings. If this parameter is unset, the value of will be used instead. The suffix string is pre-pended to the string so use a partial DN.
+ <string id="POL_FC4495FC_4C6E_50C8_9B37_08D9955A883B_Help">This parameters specifies the suffix that is used when storing idmap mappings. If this parameter is unset, the value of will be used instead. The suffix string is prepended to the string so use a partial DN.
Example: ou=Idmap</string>
<string id="POL_2ED1402F_4CF6_5CED_BE40_9B112E1238DC">ldap machine suffix</string>
- <string id="POL_2ED1402F_4CF6_5CED_BE40_9B112E1238DC_Help">It specifies where machines should be added to the ldap tree. If this parameter is unset, the value of will be used instead. The suffix string is pre-pended to the string so use a partial DN.
+ <string id="POL_2ED1402F_4CF6_5CED_BE40_9B112E1238DC_Help">It specifies where machines should be added to the ldap tree. If this parameter is unset, the value of will be used instead. The suffix string is prepended to the string so use a partial DN.
Example: ou=Computers</string>
<string id="POL_12C5B04D_D734_576A_99F1_7475BC9E90D7">ldap page size</string>
@@ -301,7 +301,7 @@ Example: dc=samba,dc=org</string>
<string id="POL_40F4D046_B9E1_53B0_9DC9_1AE4DE9B1976">ldap timeout</string>
<string id="POL_40F4D046_B9E1_53B0_9DC9_1AE4DE9B1976_Help">This parameter defines the number of seconds that Samba should use as timeout for LDAP operations.</string>
<string id="POL_26984E46_7C64_57A4_B4BF_C2C2B13C330E">ldap user suffix</string>
- <string id="POL_26984E46_7C64_57A4_B4BF_C2C2B13C330E_Help">This parameter specifies where users are added to the tree. If this parameter is unset, the value of will be used instead. The suffix string is pre-pended to the string so use a partial DN.
+ <string id="POL_26984E46_7C64_57A4_B4BF_C2C2B13C330E_Help">This parameter specifies where users are added to the tree. If this parameter is unset, the value of will be used instead. The suffix string is prepended to the string so use a partial DN.
Example: ou=people</string>
<string id="POL_AB95F2C5_BFBC_5955_8062_8B446AF7E84C">ldap max anonymous request size</string>
@@ -602,7 +602,7 @@ Example: \\remote_smb_server\%U</string>
The share and the path must be readable by the user for the preferences and directories to be loaded onto the Windows NT client. The share must be writeable when the user logs in for the first time, in order that the Windows NT client can create the NTuser.dat and other directories. Thereafter, the directories and any of the contents can, if required, be made read-only. It is not advisable that the NTuser.dat file be made read-only - rename it to NTuser.man to achieve the desired effect (a MANdatory profile).
Windows clients can sometimes maintain a connection to the [homes] share, even though there is no user logged in. Therefore, it is vital that the logon path does not include a reference to the homes share (i.e. setting this parameter to \\%N\homes\profile_path will cause problems).
This option takes the standard substitutions, allowing you to have separate logon scripts for each user or machine.
- Do not quote the value. Setting this as \\%N\profile\%U will break profile handling. Where the tdbsam or ldapsam passdb backend is used, at the time the user account is created the value configured for this parameter is written to the passdb backend and that value will over-ride the parameter value present in the smb.conf file. Any error present in the passdb backend account record must be editted using the appropriate tool (pdbedit on the command-line, or any other locally provided system tool).
+ Do not quote the value. Setting this as \\%N\profile\%U will break profile handling. Where the tdbsam or ldapsam passdb backend is used, at the time the user account is created the value configured for this parameter is written to the passdb backend and that value will over-ride the parameter value present in the smb.conf file. Any error present in the passdb backend account record must be edited using the appropriate tool (pdbedit on the command-line, or any other locally provided system tool).
Note that this option is only useful if Samba is set up as a domain controller.
Disable the use of roaming profiles by setting the value of this parameter to the empty string. For example, "". Take note that even if the default setting in the smb.conf file is the empty string, any value specified in the user account settings in the passdb backend will over-ride the effect of setting this parameter to null. Disabling of all roaming profile use requires that the user account settings must also be blank.
An example of use is:
@@ -1222,7 +1222,7 @@ Example: LANMAN1</string>
Example: NT1</string>
<string id="POL_89A40B64_721B_55DF_841D_C3481F32C2FF">client use spnego</string>
<string id="POL_89A40B64_721B_55DF_841D_C3481F32C2FF_Help">This variable controls whether Samba clients will try
- to use Simple and Protected NEGOciation (as specified by rfc2478) with
+ to use Simple and Protected NEGOtiation (as specified by rfc2478) with
supporting servers (including WindowsXP, Windows2000 and Samba
3.0) to agree upon an authentication
mechanism. This enables Kerberos authentication in particular.
@@ -2446,7 +2446,7 @@ Example: DOMAIN</string>
controller, providing domain logon services to Windows and Samba
clients of an NT4-like domain. Clients must be joined to the domain to
create a secure, trusted path across the network. There must be
- only one PDC per NetBIOS scope (typcially a broadcast network or
+ only one PDC per NetBIOS scope (typically a broadcast network or
clients served by a single WINS server).
SERVER ROLE = CLASSIC BACKUP DOMAIN CONTROLLER
@@ -2836,7 +2836,7 @@ Example: IPTOS_LOWDELAY</string>
depend on mmap working correctly on the running system. Samba requires a coherent
mmap/read-write system memory cache. Currently only OpenBSD and HPUX do not have such a
coherent cache, and on those platforms this parameter is overridden internally
- to be effeceively no. On all systems this parameter should be left alone. This
+ to be effectively no. On all systems this parameter should be left alone. This
parameter is provided to help the Samba developers track down problems with
the tdb internal code.</string>
<string id="POL_77FC1090_5D4B_587E_BD3B_DAE9F7A9682F">get quota command</string>
@@ -3158,7 +3158,7 @@ General rule structure:
"priority": "priority"
},
"source [not] address | mac | ipset": "address[/mask] | mac-address | ipset",
- "destination [not] adress": "address[/mask]",
+ "destination [not] address": "address[/mask]",
"service name": "service name",
"port": {
"port": "port value",
diff --git a/libgpo/admx/ru-RU/samba.adml b/libgpo/admx/ru-RU/samba.adml
index d6b8cf3bc45..0ca7c02ead8 100644
--- a/libgpo/admx/ru-RU/samba.adml
+++ b/libgpo/admx/ru-RU/samba.adml
@@ -2034,7 +2034,7 @@ NT1</string>
То есть в будущем параметр 'client use spnego' будет установлен по умолчанию.
-Эта переменная определяет, будут ли клиенты Samba пытаться использовать простой и защищенный NEGOciation (как указано в rfc2478) с поддерживающими серверами (включая WindowsXP, Windows2000 и Samba 3.0) для согласования механизма аутентификации. Это, в частности, включает проверку подлинности Kerberos.
+Эта переменная определяет, будут ли клиенты Samba пытаться использовать простой и защищенный NEGOgiation (как указано в rfc2478) с поддерживающими серверами (включая WindowsXP, Windows2000 и Samba 3.0) для согласования механизма аутентификации. Это, в частности, включает проверку подлинности Kerberos.
Когда этот параметр установлен, для использования NTLMv2 только в рамках NTLMSSP требуется расширенная безопасность (SPNEGO). Такое поведение было введено в исправлениях для CVE-2016-2111.
diff --git a/librpc/idl/atsvc.idl b/librpc/idl/atsvc.idl
index 75e1daa882c..e72c211b21f 100644
--- a/librpc/idl/atsvc.idl
+++ b/librpc/idl/atsvc.idl
@@ -28,7 +28,7 @@
Sixteenth = 0x00008000,
Seventeenth = 0x00010000,
Eighteenth = 0x00020000,
- Ninteenth = 0x00040000,
+ Nineteenth = 0x00040000,
Twentyth = 0x00080000,
Twentyfirst = 0x00100000,
Twentysecond = 0x00200000,
@@ -60,7 +60,7 @@
DAYSOFWEEK_SATURDAY = 0x20,
DAYSOFWEEK_SUNDAY = 0x40
} atsvc_DaysOfWeek;
-
+
typedef struct {
uint32 job_time;
atsvc_DaysOfMonth days_of_month;
diff --git a/librpc/idl/auth.idl b/librpc/idl/auth.idl
index 351a2fcfb18..ab5675ef8c5 100644
--- a/librpc/idl/auth.idl
+++ b/librpc/idl/auth.idl
@@ -84,7 +84,7 @@ interface auth
* the type of the ticket; TGT, or non-TGT (i.e. service ticket). If
* unset, the type is unknown. This indicator is useful for the KDC and
* the kpasswd service, which share the same account and keys. By
- * ensuring it is provided with the appopriate ticket type, each service
+ * ensuring it is provided with the appropriate ticket type, each service
* avoids accepting a ticket meant for the other.
*
* The heuristic used to determine the type is the presence or absence
diff --git a/librpc/idl/backupkey.idl b/librpc/idl/backupkey.idl
index 3a43f47b79f..d2359511996 100644
--- a/librpc/idl/backupkey.idl
+++ b/librpc/idl/backupkey.idl
@@ -19,7 +19,7 @@ interface backupkey
/*
* The magic values are really what they are there is no name it's just remarkable values
- * that are here to check that what is transmited or decoded is really what the client or
+ * that are here to check that what is transmitted or decoded is really what the client or
* the server expect.
*/
[public] typedef struct {
@@ -80,7 +80,7 @@ interface backupkey
uint8 payload_key[48];
} bkrp_encrypted_secret_v3;
- /* Due to alignement constraint we can generate the structure only via pidl*/
+ /* Due to alignment constraint we can generate the structure only via pidl*/
[public, nopush, nopull] typedef struct {
[value(0x00000001)] uint32 magic;
uint32 nonce_len;
@@ -89,7 +89,7 @@ interface backupkey
uint8 hash[20];
} bkrp_access_check_v2;
- /* Due to alignement constraint we can generate the structure only via pidl*/
+ /* Due to alignment constraint we can generate the structure only via pidl*/
[public,nopush,nopull] typedef struct {
[value(0x00000001)] uint32 magic;
uint32 nonce_len;
diff --git a/librpc/idl/claims.idl b/librpc/idl/claims.idl
index 388965a4239..d190988fb98 100644
--- a/librpc/idl/claims.idl
+++ b/librpc/idl/claims.idl
@@ -8,7 +8,7 @@
For ease of implementation, the full IDL for the data types used for
claims is provided
- The below was intially obtained from MS-ADTS which is
+ The below was initially obtained from MS-ADTS which is
Copyright © 2022 Microsoft Corporation as permitted
by the Open Specifications terms reproduced in IDL_LICENCE.txt
*/
diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index 8e66042c407..9d495698716 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -420,7 +420,7 @@ interface drsblobs {
* Password hashes stored in a scheme compatible with
* OpenLDAP's userPassword attribute. The Package is named
* Primary:userPassword each calculated hash,
- * which is typically caclulated via crypt(), the scheme is stored.
+ * which is typically calculated via crypt(), the scheme is stored.
* The scheme name and the {scheme} format is re-used from OpenLDAP's
* use for userPassword to aid interopability when exported.
*
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index a45855be12c..99fbca6c7b7 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -175,7 +175,7 @@ interface drsuapi
[case(48)][subcontext(0), subcontext_size(48)] drsuapi_DsBindInfo48 info48;
[case(52)][subcontext(0), subcontext_size(52)] drsuapi_DsBindInfo52 info52;
/*
- * The size for the defaut case is a bit arbitrary it in fact the value
+ * The size for the default case is a bit arbitrary it in fact the value
* of the switch but we can't reference it.
* As we hand(un-)marshall this structure it has 0 impact and makes
* pidl happy for wireshark too
@@ -200,7 +200,7 @@ interface drsuapi
[size_is(cb)] BYTE rgb[];
} DRS_EXTENSIONS;
- But we use a subcontext which has a slighly different signification on how
+ But we use a subcontext which has a slightly different signification on how
data are laid out.
With the MS-DRSR definition we will have
size_is_cb cv rgb_array
@@ -356,7 +356,7 @@ interface drsuapi
* the following table shows the mapping used between the two representations
* e.g. - objectClass 'nTDSDSA' has governsID: 1.2.840.113556.1.5.7000.47
* and a UINT32-ID of '0x0017002F'.
- * - so the OID 1.2.840.113556.1.5.7000.47 is splitted into a
+ * - so the OID 1.2.840.113556.1.5.7000.47 is split into a
* OID-prefix: 1.2.840.113556.1.5.7000
* and a value: 47 => 0x2F
* - the mapping table gives a UINT32-prefix: 0x00170000
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index 39ed3be8262..5f16fc06765 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -273,7 +273,7 @@ import "misc.idl", "security.idl";
STANDARD_RIGHTS_READ_ACCESS); /* 0x0002000C */
- /* notice the screwup with the system_name - thats why MS created
+ /* notice the screwup with the system_name - that's why MS created
OpenPolicy2 */
[public] NTSTATUS lsa_OpenPolicy (
[in,unique] uint16 *system_name,
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 95487638bbb..48a8c8f9310 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -1726,7 +1726,7 @@ interface netlogon
/****************/
/* Function 0x2d */
- /* this is the ADS varient. I don't yet know what the "flags" are for */
+ /* this is the ADS variant. I don't yet know what the "flags" are for */
NTSTATUS netr_LogonSamLogonWithFlags(
[in,unique] [string,charset(UTF16)] uint16 *server_name,
[in,unique] [string,charset(UTF16)] uint16 *computer_name,
diff --git a/librpc/idl/ntlmssp.idl b/librpc/idl/ntlmssp.idl
index dd4c0b91640..0b4a7ac96df 100644
--- a/librpc/idl/ntlmssp.idl
+++ b/librpc/idl/ntlmssp.idl
@@ -277,7 +277,7 @@ interface ntlmssp
NEGOTIATE NegotiateFlags;
[switch_is(NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION)] ntlmssp_Version Version;
/* MIC (Message Integrity) is only included when the client has
- * sent a timestap Av struct in the CHALLENGE_MESSAGE AvPair */
+ * sent a timestamp Av struct in the CHALLENGE_MESSAGE AvPair */
/* [flag(NDR_REMAINING)] ntlmssp_MIC mic; */
} AUTHENTICATE_MESSAGE;
diff --git a/librpc/idl/oxidresolver.idl b/librpc/idl/oxidresolver.idl
index 07700d51991..9700a1bf375 100644
--- a/librpc/idl/oxidresolver.idl
+++ b/librpc/idl/oxidresolver.idl
@@ -58,7 +58,7 @@ interface IOXIDResolver
[in, size_is(cAddToSet)] OID AddToSet[],
/*remove these OIDs from the set */
[in, size_is(cDelFromSet)] OID DelFromSet[],
- [out,ref] uint16 *PingBackoffFactor/* 2^factor = multipler */
+ [out,ref] uint16 *PingBackoffFactor/* 2^factor = multiplier */
);
/* In some cases the client maybe unsure that a particular */
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index 911f540729e..5da0fd75851 100644
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -31,7 +31,7 @@ import "misc.idl", "lsa.idl", "security.idl";
ACB_SVRTRUST = 0x00000100, /* 1 = Server trust account */
ACB_PWNOEXP = 0x00000200, /* 1 = User password does not expire */
ACB_AUTOLOCK = 0x00000400, /* 1 = Account auto locked */
- ACB_ENC_TXT_PWD_ALLOWED = 0x00000800, /* 1 = Encryped text password is allowed */
+ ACB_ENC_TXT_PWD_ALLOWED = 0x00000800, /* 1 = Encrypted text password is allowed */
ACB_SMARTCARD_REQUIRED = 0x00001000, /* 1 = Smart Card required */
ACB_TRUSTED_FOR_DELEGATION = 0x00002000, /* 1 = Trusted for Delegation */
ACB_NOT_DELEGATED = 0x00004000, /* 1 = Not delegated */
@@ -1081,7 +1081,7 @@ import "misc.idl", "lsa.idl", "security.idl";
/* Function 0x26 */
/*
this is a password change interface that doesn't give
- the server the plaintext password. Depricated.
+ the server the plaintext password. Deprecated.
*/
NTSTATUS samr_ChangePasswordUser(
[in,ref] policy_handle *user_handle,
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 05c40618a10..eacef0309c4 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -11,7 +11,7 @@ import "misc.idl";
just a dom sid, but with the sub_auths represented as a conformant
array. As with all in-structure conformant arrays, the array length
is placed before the start of the structure. That's what gives rise
- to the extra num_auths elemenent. We don't want the Samba code to
+ to the extra num_auths element. We don't want the Samba code to
have to bother with such esoteric NDR details, so its easier to just
define it as a dom_sid and use pidl magic to make it all work. It
just means you need to mark a sid as a "dom_sid2" in the IDL when you
@@ -480,8 +480,8 @@ interface security
/* Bitmap of privilege values for internal use only. We need
- * our own bitmap here as privilages.tdb records these values
- * as a bitmap (privilages.ldb uses the string forms).
+ * our own bitmap here as privileges.tdb records these values
+ * as a bitmap (privileges.ldb uses the string forms).
*/
typedef [bitmap64bit] bitmap {
SEC_PRIV_MACHINE_ACCOUNT_BIT = 0x00000010,
@@ -495,7 +495,7 @@ interface security
SEC_PRIV_BACKUP_BIT = 0x00000200,
SEC_PRIV_RESTORE_BIT = 0x00000400,
SEC_PRIV_TAKE_OWNERSHIP_BIT = 0x00000800,
- /* End of privilages implemented before merge to common code */
+ /* End of privileges implemented before merge to common code */
SEC_PRIV_INCREASE_QUOTA_BIT = 0x00001000,
SEC_PRIV_SECURITY_BIT = 0x00002000,
diff --git a/librpc/idl/smb_acl.idl b/librpc/idl/smb_acl.idl
index a7a76c98ea5..a1532ac031d 100644
--- a/librpc/idl/smb_acl.idl
+++ b/librpc/idl/smb_acl.idl
@@ -23,7 +23,7 @@
* Allow the smb_acl interface to be pushed into an NDR blob and
* read/written in python.
*
- * The exact layout of these stuctures is CRITICAL, as a SHA-256 hash is
+ * The exact layout of these structures is CRITICAL, as a SHA-256 hash is
* taken over these after they are pushed as NDR blobs, and stored in an
* xattr for ACL verification.
*/
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 9569af07bb8..14489534c83 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1676,7 +1676,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
nstring directory_name;
} spoolss_DriverDirectoryInfo1;
- /* NOTE: it's seems that w2k3 completly ignores the level
+ /* NOTE: It seems that w2k3 completely ignores the level
in its server code
*/
typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union {
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index e05e4795921..ef92c82d00d 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -15,7 +15,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
# The interface names here are not the same as the IDL name, so the
-# auto-genration of the fuzzer fails to link
+# auto-generation of the fuzzer fails to link
bld.SAMBA_PIDL_LIST('PIDL',
'''echo.idl
fsrvp.idl
@@ -38,7 +38,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
# The interface names here are not the same as the IDL name, so the
-# auto-genration of the fuzzer fails to link
+# auto-generation of the fuzzer fails to link
bld.SAMBA_PIDL_LIST('PIDL',
'''dfs.idl''',
options='--header --ndr-parser --client --python --server-compat',
@@ -55,7 +55,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
# DCOM stuff
# The interface names here are not the same as the IDL name, so the
-# auto-genration of the fuzzer fails to link
+# auto-generation of the fuzzer fails to link
bld.SAMBA_PIDL_LIST('PIDL',
'''oxidresolver.idl remact.idl''',
options='--header --ndr-parser --client',
@@ -63,7 +63,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
generate_fuzzers=False)
# The interface names here are not the same as the IDL name, so the
-# auto-genration of the fuzzer fails to link
+# auto-generation of the fuzzer fails to link
bld.SAMBA_PIDL_LIST('PIDL',
'wmi.idl dcom.idl',
options='--header --ndr-parser --server --client --dcom-proxy --com-header',
@@ -123,7 +123,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
# The interface names here are not the same as the IDL name, so the
-# auto-genration of the fuzzer fails to link
+# auto-generation of the fuzzer fails to link
bld.SAMBA_PIDL_LIST('PIDL',
'''
@@ -135,7 +135,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr',
generate_fuzzers=False)
-# Non-DCE/RPC protocls with Python bindings
+# Non-DCE/RPC protocols with Python bindings
# (for structures or constants)
bld.SAMBA_PIDL_LIST('PIDL',
diff --git a/librpc/idl/xattr.idl b/librpc/idl/xattr.idl
index d1cf913e9d8..e2f7cb4ec44 100644
--- a/librpc/idl/xattr.idl
+++ b/librpc/idl/xattr.idl
@@ -31,7 +31,7 @@ interface xattr
* it's used to pass the information from
* the old hex string attrib information
* we have a handwritten parser which converts
- * the hex string to the xattr_DosInfoFFFFCompat strucure
+ * the hex string to the xattr_DosInfoFFFFCompat structure
*/
typedef struct {
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 25765880d8b..44cf524867d 100644
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -43,7 +43,7 @@
* malicious packet.
*
* In an ideal world this would be controlled by range() restrictions
- * on array sizes and careful IDL construction to avoid arbitary
+ * on array sizes and careful IDL construction to avoid arbitrary
* linked lists, but this is a backstop for now.
*/
#define NDR_TOKEN_MAX_LIST_SIZE 65535
@@ -169,7 +169,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_pop(struct ndr_pull *ndr)
/*
* we need to keep up to 7 bytes
- * in order to get the aligment right.
+ * in order to get the alignment right.
*/
skip = ndr->offset & 0xFFFFFFF8;
diff --git a/librpc/ndr/ndr_backupkey.c b/librpc/ndr/ndr_backupkey.c
index adb6e393287..635c9fa3700 100644
--- a/librpc/ndr/ndr_backupkey.c
+++ b/librpc/ndr/ndr_backupkey.c
@@ -134,7 +134,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_bkrp_access_check_v2(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->nonce, r->nonce_len));
NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, &r->sid));
/* We articially increment the offset of 20 bytes (size of hash
- * comming after the pad) so that ndr_align can determine easily
+ * coming after the pad) so that ndr_align can determine easily
* the correct pad size to make the whole struct 8 bytes aligned
*/
ofs = ndr->offset + 20;
@@ -185,7 +185,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_bkrp_access_check_v3(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->nonce, r->nonce_len));
NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, &r->sid));
/* We articially increment the offset of 64 bytes (size of hash
- * comming after the pad) so that ndr_align can determine easily
+ * coming after the pad) so that ndr_align can determine easily
* the correct pad size to make the whole struct 16 bytes aligned
*/
ofs = ndr->offset + 64;
diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c
index 4c961f84f4e..e79c430362e 100644
--- a/librpc/ndr/ndr_compression.c
+++ b/librpc/ndr/ndr_compression.c
@@ -362,7 +362,7 @@ static enum ndr_err_code ndr_pull_compression_mszip_chunk(struct ndr_pull *ndrpu
z->total_out = 0;
if (!z->opaque) {
- /* the first time we need to intialize completely */
+ /* the first time we need to initialize completely */
z->zalloc = ndr_zlib_alloc;
z->zfree = ndr_zlib_free;
z->opaque = ndrpull;
@@ -376,7 +376,7 @@ static enum ndr_err_code ndr_pull_compression_mszip_chunk(struct ndr_pull *ndrpu
}
}
- /* call inflate untill we get Z_STREAM_END or an error */
+ /* call inflate until we get Z_STREAM_END or an error */
while (true) {
z_ret = inflate(z, Z_BLOCK);
if (z_ret != Z_OK) break;
@@ -475,7 +475,7 @@ static enum ndr_err_code ndr_push_compression_mszip_chunk(struct ndr_push *ndrpu
z->total_out = 0;
--
Samba Shared Repository
More information about the samba-cvs
mailing list