[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Sep 11 03:37:01 UTC 2023
The branch, master has been updated
via 65b2110937c auth:credentials: Check if password_obtained > obtained
via 8cdb4f29850 netapi: Pass net's cmdline credentials to libnetapi_net_init()
via 5cad8278109 netapi: Pass loadparm_context to libnetapi_net_init()
via da841a80e3b s3:rpc: bump named_pipe_auth_req_info version number
via a842c14dc8a .gitlab-ci.yml: Move coverity build to internal Heimdal
via ebdaaf92238 s4:wrepl_server: Fix code spelling
via 39a88a83f3d s4:torture: Fix code spelling
via 882a4674c0e s4:samba: Fix code spelling
via 36ccc9cf26b s4:rpc_server: Fix code spelling
via b1e2315528d s4:ntvfs: Fix code spelling
via 1bb5cfef875 s4:libnet: Fix code spelling
via 0cef5dafdc4 s4:libcli: Fix code spelling
via 0834b30921d s4:kdc: Fix code spelling
via 65c26c0b725 s4:dsdb: Fix code spelling
via 8a93a4fa6c0 s4:dns_server: Fix code spelling
via 20ab21e698f s4:client: Fix code spelling
via 354eff14eb2 s4:auth: Fix code spelling
via 4e74350fbbd s3:winbindd: Fix code spelling
via c6c1b55ac4e s3:utils: Fix code spelling
via b60f86a0b8c s3:smbd: Fix code spelling
via 72e79e13095 s3:rpc_server: Fix code spelling
via 32a1e7428c7 s3:rpc_client: Fix code spelling
via c4a02d8ee14 s3:registry: Fix code spelling
via 47dcdb31263 s3:nmbd: Fix code spelling
via bbd9fabf5f5 s3:librpc: Fix code spelling
via d7331a68215 s3:libnet: Fix code spelling
via 06816117efa s3:libads: Fix code spelling
via 2a4d35edee1 s3:lib: Fix code spelling
via 9e2a93d54b3 s3:auth: Fix code spelling
via 26fd734d566 selftest: Fix code spelling
via bb79de4cbe9 python:tests: Fix code spelling
via c87504289f5 pidl: Fix code spelling
via df24eced484 librpc: Fix code spelling
via 5292c774a57 libgpo: Fix code spelling
via 87749b5518e libcli: Fix code spelling
via dd2b568721d lib:charset: Fix code spelling
via 6a303be56c1 tevent: Fix code spelling
via 53caec3c36b tdb: Fix code spelling
via 9d699895adc lib:printer_driver: Fix code spelling
via 5fbbf9b9ba1 ldb: Fix code spelling
via 7d9edb82c47 lib:krb5_wrap: Fix spelling in documentation
via 74580daac96 lib:crypto: Fix code spelling
via 1c35195ff76 lib:compression: Fix code spelling
via f6ff6f7cdf8 docs-xml: Fix spelling
via c62491473a5 ctdb: Fix code spelling
via e69ba9a0a38 auth: Fix code spelling
via f51efc4008d Makefile: Fix spelling
from ebb6eb9c2fc libsmb: Fix parsing symlink reparse points
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 65b2110937c4b97be4030ecb49aa0801fc940bf8
Author: Samuel Cabrero <scabrero at samba.org>
Date: Thu Sep 7 14:51:15 2023 +0200
auth:credentials: Check if password_obtained > obtained
Fixes reading the password from STDIN or environment vars if it was already
given in the command line:
$ export PASSWD_FD=0
$ ./bin/net offlinejoin composeodj <...> --password=FOO
<Waiting to read password from STDIN>
Signed-off-by: Samuel Cabrero <scabrero at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Sep 11 03:36:28 UTC 2023 on atb-devel-224
commit 8cdb4f2985075b12201d3295f640bddcfbfe5962
Author: Samuel Cabrero <scabrero at samba.org>
Date: Thu Sep 7 14:53:22 2023 +0200
netapi: Pass net's cmdline credentials to libnetapi_net_init()
Avoid unnecessary credentials allocation and initialization by passing the
net's cmdline creds to libnetapi_net_init() directly.
Fixes the problem of running cli_credentials_guess() (which runs password
callbacks) twice, one for the net's cmdline creds and a second time for the
creds initialized in libnetapi_net_init(), just to override them immediately
after.
Example:
$ export PASSWD_FD=0
$ ./bin/net offlinejoin composeodj <...>
foo
bar
Password is read from STDIN twice.
Signed-off-by: Samuel Cabrero <scabrero at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5cad827810975084f061f56548006fdd2d15dc7b
Author: Samuel Cabrero <scabrero at samba.org>
Date: Thu Sep 7 14:34:36 2023 +0200
netapi: Pass loadparm_context to libnetapi_net_init()
The net's tool cmdline lp_ctx can be reused, no need to init a new one except
for external library users.
Signed-off-by: Samuel Cabrero <scabrero at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit da841a80e3b9a3560488c3ddcb0b366b33eb14c1
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri Sep 8 09:35:51 2023 +1200
s3:rpc: bump named_pipe_auth_req_info version number
This is because commit f893cf85cc387b66c496661e11073b1215270022
changed the security token in secuirty.idl, and bumping the version
was missed.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit a842c14dc8acb17c6d58682955f9738221338878
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Aug 30 14:45:49 2023 +1200
.gitlab-ci.yml: Move coverity build to internal Heimdal
The opensuse155 image has MIT 1.20, not the required MIT 1.21, so build
with intenral Heimdal instead.
The opensuse155 image was chosen deliberatly in commit
f2eb411646bbc3cbedd4aecaba98bd363a6cd3df so this changes
the KDC choice rather than the image. Eventually we will
need to do both.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit ebdaaf92238f694337d9eb217da85b6ca6ccb4bf
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Sep 6 12:06:26 2023 +1200
s4:wrepl_server: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 39a88a83f3dc887d23b773ee02e9c8714c084b27
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Sep 6 11:33:59 2023 +1200
s4:torture: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 882a4674c0e6c3659238b118f14e1aadbe76d0ff
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:24:56 2023 +1200
s4:samba: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 36ccc9cf26bfe03ed517ad93ffea58dc9aba9adf
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:18:24 2023 +1200
s4:rpc_server: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b1e2315528db8ec66979ac8cb267441116412556
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:18:06 2023 +1200
s4:ntvfs: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1bb5cfef875bd4f92659a5b53358849c6b12171d
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:17:44 2023 +1200
s4:libnet: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0cef5dafdc40b1b6572159c42ecfd00569b680b1
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 16:34:04 2023 +1200
s4:libcli: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0834b30921d1d67962b9921d5b06394cb9afbd0c
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 16:52:57 2023 +1200
s4:kdc: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 65c26c0b7254f8b2c7276f5cc2a5048d1be91172
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Fri Sep 1 13:30:37 2023 +1200
s4:dsdb: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8a93a4fa6c05a5dd34586c25e62507502358f492
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Sep 6 16:34:33 2023 +1200
s4:dns_server: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 20ab21e698fc20da24bce8a66c073924c8f0fc77
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:12:03 2023 +1200
s4:client: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 354eff14eb202e502df5e481f0e063e55838af47
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Tue Sep 5 16:04:28 2023 +1200
s4:auth: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 4e74350fbbdce4b40159ca09b8da66c72acf8cd1
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 14:17:35 2023 +1200
s3:winbindd: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c6c1b55ac4ed25d692316ccc548a527fe506ad6c
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Tue Sep 5 16:04:18 2023 +1200
s3:utils: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b60f86a0b8c51dda2a0c29af44f03f408586e7b0
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:09:38 2023 +1200
s3:smbd: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 72e79e13095791570cb103a028aeda5af2ec66a1
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:09:20 2023 +1200
s3:rpc_server: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 32a1e7428c7be6120de52b231dbe76c76c5aa225
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:08:57 2023 +1200
s3:rpc_client: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c4a02d8ee14b64d53066285fe6b8ec8854c6ae63
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:08:34 2023 +1200
s3:registry: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 47dcdb31263780f7d1ab56be12c3a9edf5fa3b70
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:08:17 2023 +1200
s3:nmbd: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit bbd9fabf5f59248f5bf4523537b32290f86db010
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Tue Sep 5 16:03:58 2023 +1200
s3:librpc: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit d7331a682150a73f91be78dac10b87a5241b9b07
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:07:41 2023 +1200
s3:libnet: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 06816117efaded8bbf61a5ab343e03a3adaaaa60
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Fri Sep 1 13:39:18 2023 +1200
s3:libads: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 2a4d35edee1db1a551a6ce243ebc0788487fcf2f
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:05:38 2023 +1200
s3:lib: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9e2a93d54b35aa0acb5f1bcda207529fc171ab90
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:05:13 2023 +1200
s3:auth: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 26fd734d56656532fb8353dc4c57c6c26bf47a7b
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:04:41 2023 +1200
selftest: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit bb79de4cbe97e28a6691d808410eee05a685b3cc
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 10:22:42 2023 +1200
python:tests: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c87504289f52aa8b59810878390b75e286903bce
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Aug 23 15:53:59 2023 +1200
pidl: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit df24eced484e6da5c9b6b796d4fe790de827f140
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Aug 30 15:18:19 2023 +1200
librpc: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5292c774a57c2e761ecb1b281856a2e0a14441da
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 16:01:50 2023 +1200
libgpo: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 87749b5518e448bfe3833d4720a1aebc052d4fa0
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Sep 6 10:54:46 2023 +1200
libcli: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit dd2b568721dd6900ce0daa5fc171ba71045066ca
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 15:57:53 2023 +1200
lib:charset: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6a303be56c128514173d331010cb501f944f1a22
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 15:57:14 2023 +1200
tevent: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 53caec3c36b6b68a4c41d0ea800e0250a468565f
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 15:56:56 2023 +1200
tdb: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 9d699895adc01d2f0cb7e304250f90541badc9ec
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 15:56:20 2023 +1200
lib:printer_driver: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5fbbf9b9ba109fea6f45c93885a766ae40968678
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Wed Sep 6 10:54:35 2023 +1200
ldb: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 7d9edb82c47f11582b567829c242eaa33b2ce82c
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 16:46:10 2023 +1200
lib:krb5_wrap: Fix spelling in documentation
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 74580daac96ea435a940db776762e4ceb8b2911f
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 15:52:26 2023 +1200
lib:crypto: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1c35195ff764de7ee011b54b6d3017d61b673583
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 16:43:20 2023 +1200
lib:compression: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f6ff6f7cdf8d72572cf095c1c140eca875c834ef
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Sep 4 12:14:58 2023 +1200
docs-xml: Fix spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit c62491473a53ade68a8968046ca1abd5890c3cbb
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu Sep 7 15:47:05 2023 +1200
ctdb: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit e69ba9a0a38ff63cb19eaad73501e186a1101d20
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Tue Sep 5 16:02:59 2023 +1200
auth: Fix code spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f51efc4008d34fa4a3baf2c0e47c127a81d0ad6b
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Mon Aug 21 14:23:25 2023 +1200
Makefile: Fix spelling
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 2 +-
Makefile | 6 +-
auth/auth_sam_reply.c | 2 +-
auth/credentials/credentials.c | 4 +
auth/credentials/credentials_krb5.c | 6 +-
auth/gensec/gensec_start.c | 2 +-
auth/ntlmssp/ntlmssp_sign.c | 4 +-
ctdb/server/ctdb_vacuum.c | 2 +-
docs-xml/manpages/net.8.xml | 4 +-
docs-xml/manpages/pam_winbind.conf.5.xml | 8 +-
docs-xml/manpages/samba-dcerpcd.8.xml | 2 +-
docs-xml/manpages/samba-tool.8.xml | 4 +-
docs-xml/manpages/vfs_fileid.8.xml | 6 +-
docs-xml/manpages/vfs_fruit.8.xml | 2 +-
docs-xml/manpages/vfs_shadow_copy.8.xml | 2 +-
docs-xml/smbdotconf/security/clientusekerberos.xml | 2 +-
lib/compression/lzxpress_huffman.c | 8 +-
lib/crypto/gnutls_arcfour_confounded_md5.c | 2 +-
lib/krb5_wrap/krb5_samba.c | 10 +-
lib/ldb/common/ldb.c | 2 +-
lib/ldb/common/ldb_msg.c | 4 +-
lib/ldb/include/ldb.h | 4 +-
lib/ldb/ldb_key_value/ldb_kv.c | 2 +-
lib/ldb/ldb_key_value/ldb_kv_index.c | 4 +-
lib/printer_driver/printer_driver.c | 2 +-
lib/tdb/common/hash.c | 2 +-
lib/tevent/tevent.h | 2 +-
lib/util/charset/charset.h | 4 +-
lib/util/charset/util_str.c | 10 +-
libcli/named_pipe_auth/npa_tstream.c | 122 ++++++++++-----------
libcli/named_pipe_auth/npa_tstream.h | 4 +-
libcli/smb/smbXcli_base.c | 2 +-
libgpo/gpo_filesync.c | 2 +-
librpc/idl/named_pipe_auth.idl | 8 +-
librpc/rpc/rpc_common.h | 2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 4 +-
python/samba/tests/samba_tool/base.py | 2 +-
selftest/target/Samba4.pm | 6 +-
source3/auth/pampass.c | 2 +-
.../examples/netdomjoin-gui/netdomjoin-gui.c | 2 +-
source3/lib/netapi/netapi.c | 35 +++---
source3/lib/netapi/netapi_net.h | 4 +-
source3/libads/kerberos_keytab.c | 2 +-
source3/libads/ldap.c | 10 +-
source3/libnet/libnet_join.c | 2 +-
source3/librpc/crypto/gse.c | 2 +-
source3/librpc/idl/rpc_host.idl | 2 +-
source3/nmbd/nmbd_serverlistdb.c | 2 +-
source3/registry/reg_parse_prs.c | 2 +-
source3/rpc_client/cli_spoolss.c | 34 +++---
source3/rpc_client/local_np.c | 44 ++++----
source3/rpc_server/mdssvc/mdssvc_tracker.c | 4 +-
source3/rpc_server/rpc_host.c | 68 ++++++------
source3/rpc_server/rpc_worker.c | 50 ++++-----
source3/smbd/posix_acls.c | 2 +-
source3/smbd/smb2_negprot.c | 2 +-
source3/smbd/smb2_trans2.c | 2 +-
source3/utils/clirap2.c | 4 +-
source3/utils/net_dom.c | 7 +-
source3/utils/net_offlinejoin.c | 9 +-
source3/utils/net_rpc.c | 38 +------
source3/utils/net_rpc_conf.c | 2 +-
source3/utils/net_rpc_rights.c | 2 +-
source3/utils/net_rpc_shell.c | 6 +-
source3/utils/ntlm_auth_diagnostics.c | 2 +-
source3/utils/smbcacls.c | 2 +-
source3/winbindd/winbindd_pam.c | 4 +-
source3/winbindd/winbindd_pam_chauthtok.c | 2 +-
source3/winbindd/winbindd_util.c | 4 +-
source4/auth/gensec/gensec_gssapi.c | 6 +-
source4/client/client.c | 2 +-
source4/dns_server/dnsserver_common.c | 2 +-
source4/dsdb/common/util.c | 10 +-
source4/dsdb/kcc/kcc_service.h | 2 +-
source4/dsdb/repl/drepl_service.h | 6 +-
source4/dsdb/samdb/ldb_modules/acl.c | 6 +-
source4/dsdb/samdb/ldb_modules/dirsync.c | 18 +--
source4/dsdb/samdb/ldb_modules/operational.c | 4 +-
source4/dsdb/samdb/ldb_modules/password_hash.c | 8 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 2 +-
.../dsdb/samdb/ldb_modules/tests/test_audit_util.c | 2 +-
.../ldb_modules/tests/test_unique_object_sids.c | 2 +-
source4/dsdb/samdb/ldb_modules/util.c | 2 +-
source4/dsdb/schema/schema_info_attr.c | 6 +-
source4/kdc/db-glue.c | 12 +-
source4/kdc/mit_samba.c | 2 +-
source4/libcli/wrepl/winsrepl.c | 2 +-
source4/libnet/libnet_group.c | 2 +-
source4/ntvfs/simple/svfs_util.c | 2 +-
source4/rpc_server/backupkey/dcesrv_backupkey.c | 6 +-
source4/samba/process_single.c | 4 +-
source4/torture/libnetapi/libnetapi.c | 8 +-
source4/torture/nbt/winsreplication.c | 6 +-
source4/torture/ndr/lsa.c | 2 +-
source4/torture/raw/lock.c | 10 +-
source4/torture/rpc/drsuapi_cracknames.c | 2 +-
source4/torture/rpc/netlogon.c | 8 +-
source4/wrepl_server/wrepl_in_call.c | 2 +-
source4/wrepl_server/wrepl_server.h | 4 +-
100 files changed, 369 insertions(+), 402 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 30c1980209f..3925d48e330 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -529,7 +529,7 @@ coverity:
script:
- wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz
- tar xf /tmp/coverity_tool.tgz
- - ./configure.developer --with-cluster-support --with-system-mitkrb5 --with-experimental-mit-ad-dc
+ - ./configure.developer --with-cluster-support
- cov-analysis-linux64-*/bin/cov-build --dir cov-int make -j$(nproc)
- tar czf cov-int.tar.gz cov-int
- curl
diff --git a/Makefile b/Makefile
index 5308d745e49..09700af32c2 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ ctags:
pep8:
$(WAF) pep8
-# Adding force on the dependencies will force the target to be always rebuild form the Make
+# Adding force on the dependencies will force the target to be always rebuilt from the Make
# point of view forcing make to invoke waf
bin/smbd: FORCE
@@ -117,7 +117,7 @@ bin/smbclient: FORCE
# this allows for things like "make bin/smbtorture"
# mainly for the binary that don't have a broken mode like smbd that must
-# be build with smbd/smbd
+# be built with smbd/smbd
bin/%: FORCE
$(WAF) --targets=$(subst bin/,,$@)
@@ -128,7 +128,7 @@ bin/%: FORCE
# This rule has to be the last one
FORCE:
-# Having .NOTPARALLEL will force make to do target once at a time but still -j
+# Having .NOTPARALLEL will force make to do targets one at a time but still -j
# will be present in the MAKEFLAGS that are in turn interpreted by WAF
# so only 1 waf at a time will be called but it will still be able to do parallel builds if
# instructed to do so
diff --git a/auth/auth_sam_reply.c b/auth/auth_sam_reply.c
index 27f04e86434..8c0ebe5f156 100644
--- a/auth/auth_sam_reply.c
+++ b/auth/auth_sam_reply.c
@@ -460,7 +460,7 @@ NTSTATUS auth_convert_user_info_dc_saminfo2(TALLOC_CTX *mem_ctx,
sam2->base = sam6->base;
/*
* We have nowhere to put sam6->sids, so we follow Windows here and drop
- * it. Any resource groups it happened to be contain are lost.
+ * it. Any resource groups it happened to contain are lost.
*/
sam2->base.user_flags &= ~NETLOGON_EXTRA_SIDS;
TALLOC_FREE(sam6->sids);
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index 3690ac8c3a4..ab5efd90f26 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -1555,6 +1555,10 @@ _PUBLIC_ bool cli_credentials_parse_password_fd(struct cli_credentials *credenti
char *p;
char pass[128];
+ if (credentials->password_obtained >= obtained) {
+ return false;
+ }
+
for(p = pass, *p = '\0'; /* ensure that pass is null-terminated */
p && p - pass < sizeof(pass) - 1;) {
switch (read(fd, p, 1)) {
diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index 0ce70557c58..7d7d0248cb4 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -506,7 +506,7 @@ static krb5_error_code krb5_cc_remove_cred_wrap(struct ccache_container *ccc,
#endif
/*
- * Indicate the we failed to log in to this service/host with these
+ * Indicate that we failed to log in to this service/host with these
* credentials. The caller passes an unsigned int which they
* initialise to the number of times they would like to retry.
*
@@ -856,7 +856,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
DEBUG(3, ("Credentials for %s will expire shortly (%u sec), must refresh credentials cache\n", cli_credentials_get_principal(cred, cred), lifetime));
expired = true;
} else if (maj_stat != GSS_S_COMPLETE) {
- *error_string = talloc_asprintf(cred, "inquiry of credential lifefime via GSSAPI gss_inquire_cred failed: %s\n",
+ *error_string = talloc_asprintf(cred, "inquiry of credential lifetime via GSSAPI gss_inquire_cred failed: %s\n",
gssapi_error_string(cred, maj_stat, min_stat, NULL));
return EINVAL;
}
@@ -1050,7 +1050,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
gcc->creds = gssapi_cred;
talloc_set_destructor(gcc, free_gssapi_creds);
- /* set the clinet_gss_creds_obtained here, as it just
+ /* set the client_gss_creds_obtained here, as it just
got set to UNINITIALISED by the calls above */
cred->client_gss_creds_obtained = obtained;
cred->client_gss_creds = gcc;
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index b6979812ac0..3a3165b52eb 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -76,7 +76,7 @@ bool gensec_security_ops_enabled(const struct gensec_security_ops *ops, struct g
* only add non-kerberos mechs
*
* Once we get things like NegoEx or moonshot, this will of course get
- * more compplex.
+ * more complex.
*/
static const struct gensec_security_ops **gensec_use_kerberos_mechs(
diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c
index b9be182e3f2..404129a0ecd 100644
--- a/auth/ntlmssp/ntlmssp_sign.c
+++ b/auth/ntlmssp/ntlmssp_sign.c
@@ -359,7 +359,7 @@ NTSTATUS ntlmssp_seal_packet(struct ntlmssp_state *ntlmssp_state,
* The order of these two operations matters - we
* must first seal the packet, then seal the
* sequence number - this is because the
- * send_seal_hash is not constant, but is is rather
+ * send_seal_hash is not constant, but is rather
* updated with each iteration
*/
nt_status = ntlmssp_make_packet_signature(ntlmssp_state,
@@ -411,7 +411,7 @@ NTSTATUS ntlmssp_seal_packet(struct ntlmssp_state *ntlmssp_state,
* The order of these two operations matters - we
* must first seal the packet, then seal the
* sequence number - this is because the ntlmv1_arc4_state
- * is not constant, but is is rather updated with
+ * is not constant, but is rather updated with
* each iteration
*/
dump_arc4_state("ntlmv1 arc4 state:\n",
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 35297b9daa2..7ff79ac5745 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -1821,7 +1821,7 @@ static int insert_record_into_delete_queue(struct ctdb_db_context *ctdb_db,
}
/**
- * Schedule a record for deletetion.
+ * Schedule a record for deletion.
* Called from the parent context.
*/
int32_t ctdb_control_schedule_for_deletion(struct ctdb_context *ctdb,
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index d758bd0e908..95bbac7a827 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -1504,7 +1504,7 @@ Adds a new keytab entry, the entry can be either;
</para>
<para>
Unlike old versions no computer AD objects are modified by this command. To
-preserve the bevhaviour of older clients 'net ads keytab ad_update_ads' is
+preserve the behaviour of older clients 'net ads keytab ad_update_ads' is
available.
</para>
</refsect2>
@@ -1514,7 +1514,7 @@ available.
<para>
Adds a new keytab entry (see section for net ads keytab add). In addition to
-adding entries to the keytab file corrosponding Windows SPNs are created
+adding entries to the keytab file corresponding Windows SPNs are created
from the entry passed to this command. These SPN(s) added to the AD computer
account object associated with the client machine running this command for
the following entry types;
diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
index 185f539454c..3d9cb491505 100644
--- a/docs-xml/manpages/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
@@ -132,14 +132,14 @@
<quote>KEYRING:persistent:UID</quote>, which uses the Linux
kernel keyring to store credentials on a per-UID basis.
The KEYRING has its limitations. As it is secure kernel memory,
- for example bulk sorage of credentils is for not possible.</para>
+ for example bulk storage of credentials is not possible.</para>
- <para>When using th KCM type, the supported mechanism is
+ <para>When using the KCM type, the supported mechanism is
<quote>KCM:UID</quote>, which uses a Kerberos credential
- manaager to store credentials on a per-UID basis similar to
+ manager to store credentials on a per-UID basis similar to
KEYRING. This is the recommended choice on latest Linux
distributions, offering a Kerberos Credential Manager. If not
- we suggest to use KEYRING as those are the most secure and
+ we suggest to use KEYRING as that is the most secure and
predictable method.</para>
<para>It is also possible to define custom filepaths and use the "%u"
diff --git a/docs-xml/manpages/samba-dcerpcd.8.xml b/docs-xml/manpages/samba-dcerpcd.8.xml
index 1e6f1918a17..2df4f27c206 100644
--- a/docs-xml/manpages/samba-dcerpcd.8.xml
+++ b/docs-xml/manpages/samba-dcerpcd.8.xml
@@ -26,7 +26,7 @@
<command>samba</command> process that invokes
<command>smbd</command> will still provide its normal DCERPC
services, not <command>samba-dcerpcd</command>. When
- separately invoked by system startup scripts or a a daemon,
+ separately invoked by system startup scripts or a daemon,
the global smb.conf option <smbconfoption name="rpc start on
demand helpers">false</smbconfoption> MUST be set to allow
<command>samba-dcerpcd</command> to start standalone.
diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml
index a0ade78c6d1..55e714dbed4 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -126,7 +126,7 @@
<varlistentry>
<term>--description=DESCRIPTION</term>
<listitem><para>
- The new computers's description.
+ The new computer's description.
</para></listitem>
</varlistentry>
@@ -246,7 +246,7 @@
<varlistentry>
<term>--description=DESCRIPTION</term>
<listitem><para>
- The new contacts's description.
+ The new contact's description.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages/vfs_fileid.8.xml b/docs-xml/manpages/vfs_fileid.8.xml
index 8732f951121..ed4d4347011 100644
--- a/docs-xml/manpages/vfs_fileid.8.xml
+++ b/docs-xml/manpages/vfs_fileid.8.xml
@@ -171,11 +171,11 @@
<term>fileid:nolock_max_slots = NUMBER(1-18446744073709551615)</term>
<listitem>
<para>This option alters the behavior of the <command>nolock</command> algorithm
- in a ways that it also breaks the lock coherency between individual processes
+ in a way that it also breaks the lock coherency between individual processes
on the same host. The default is to have just 1 concurrent slot available per host.
- By incressing the number of slots you can specify how many concurrent processes
+ By increasing the number of slots you can specify how many concurrent processes
can work on a given inode without contention, the number should typically be larger
- than the a number of logical cpus, maybe 2 times of num_cpus.
+ than the number of logical cpus, maybe 2 times num_cpus.
</para>
</listitem>
</varlistentry>
diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml
index 2215f031312..7ae17c65976 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -168,7 +168,7 @@
<listitem>
<para>Controls where the OS X resource fork is stored.</para>
- <para>Due to a spelling bug in all Samba versions older then
+ <para>Due to a spelling bug in all Samba versions older than
4.6.0, this option can also be given as
<emphasis>fruit:ressource</emphasis>, ie with two s.</para>
diff --git a/docs-xml/manpages/vfs_shadow_copy.8.xml b/docs-xml/manpages/vfs_shadow_copy.8.xml
index 4f8468d5a1e..5699a5dc5e7 100644
--- a/docs-xml/manpages/vfs_shadow_copy.8.xml
+++ b/docs-xml/manpages/vfs_shadow_copy.8.xml
@@ -50,7 +50,7 @@
<para>Filesystem snapshots must be mounted on
specially named directories in order to be recognized by
<command>vfs_shadow_copy</command>. The snapshot mount points must
- be immediate children of a the directory being shared.</para>
+ be immediate children of the directory being shared.</para>
<para>The snapshot naming convention is @GMT-YYYY.MM.DD-hh.mm.ss,
where:
diff --git a/docs-xml/smbdotconf/security/clientusekerberos.xml b/docs-xml/smbdotconf/security/clientusekerberos.xml
index ad35dcf3aca..1ccf88e06f3 100644
--- a/docs-xml/smbdotconf/security/clientusekerberos.xml
+++ b/docs-xml/smbdotconf/security/clientusekerberos.xml
@@ -26,7 +26,7 @@
<para>
<emphasis>required</emphasis> - Kerberos
authentication will be required. There will be no
- falllback to NTLM or a different alternative.
+ fallback to NTLM or a different alternative.
</para>
</listitem>
diff --git a/lib/compression/lzxpress_huffman.c b/lib/compression/lzxpress_huffman.c
index 4d69cc406ec..30744332e6e 100644
--- a/lib/compression/lzxpress_huffman.c
+++ b/lib/compression/lzxpress_huffman.c
@@ -568,7 +568,7 @@ static int generate_huffman_codes(struct huffman_node *leaf_nodes,
if (tail_branch == n_leaves) {
/*
* We're not getting here, no way, never ever.
- * Unless we made a terible mistake.
+ * Unless we made a terrible mistake.
*
* That is, in a binary tree with n leaves,
* there are ALWAYS n-1 internal nodes.
@@ -607,7 +607,7 @@ static int generate_huffman_codes(struct huffman_node *leaf_nodes,
}
/*
- * requantize by halfing and rounding up, so that small counts
+ * requantize by halving and rounding up, so that small counts
* become relatively bigger. This will lead to a flatter tree.
*/
for (i = 0; i < n_leaves; i++) {
@@ -1739,11 +1739,11 @@ static ssize_t lzx_huffman_decompress_block(struct bitstream *input,
* # input bytes are read for match lengths.
*
* Note that we *don't* specifically check for the EOF marker (symbol
- * 256) in this loop, because the a precondition for stopping for the
+ * 256) in this loop, because the precondition for stopping for the
* EOF marker is that the output buffer is full (otherwise, you
* wouldn't know which 256 is EOF, rather than an actual symbol), and
* we *always* want to stop when the buffer is full. So we work out if
- * there is an EOF in in another loop after we stop writing.
+ * there is an EOF in another loop after we stop writing.
*/
index = 0;
diff --git a/lib/crypto/gnutls_arcfour_confounded_md5.c b/lib/crypto/gnutls_arcfour_confounded_md5.c
index b99e611df75..7f1bf94c2da 100644
--- a/lib/crypto/gnutls_arcfour_confounded_md5.c
+++ b/lib/crypto/gnutls_arcfour_confounded_md5.c
@@ -22,7 +22,7 @@
*/
/*
- * This (arcfour over data with a key combined from two imputs, one
+ * This (arcfour over data with a key combined from two inputs, one
* the key another the confounder), is a common pattern in pre-AES
* windows cryptography
*
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 9177cd7b5dd..20f3000c277 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -150,7 +150,7 @@ const krb5_data *krb5_princ_component(krb5_context context,
/* HEIMDAL */
/**
- * @brief Stores the address of a 'struct sockaddr_storage' a krb5_address
+ * @brief Stores the address of a 'struct sockaddr_storage' into a krb5_address
*
* @param[in] paddr A pointer to a 'struct sockaddr_storage to extract the
* address from.
@@ -183,7 +183,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
/* MIT */
/**
- * @brief Stores the address of a 'struct sockaddr_storage' a krb5_address
+ * @brief Stores the address of a 'struct sockaddr_storage' into a krb5_address
*
* @param[in] paddr A pointer to a 'struct sockaddr_storage to extract the
* address from.
@@ -865,7 +865,7 @@ krb5_error_code smb_krb5_parse_name(krb5_context context,
*
* @param[in] principal The principal.
*
- * @param[out] unix_name A string representation of the princpial name as with
+ * @param[out] unix_name A string representation of the principal name as with
* unix charset.
*
* Use talloc_free() to free the string representation if it is no longer
@@ -1644,7 +1644,7 @@ krb5_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
*
* @param[in] keep_old_kvno Keep the entries with the previous kvno.
*
- * @param[in] kvno The kvnco to use.
+ * @param[in] kvno The kvno to use.
*
* @param[in] enctype_only Only evaluate the enctype argument if true
*
@@ -2351,7 +2351,7 @@ done:
*
* @param[in] password The password (or NULL).
*
- * @param[in] impersonate_principal The impersonatiion principal (or NULL).
+ * @param[in] impersonate_principal The impersonation principal (or NULL).
*
* @param[in] self_service The local service for S4U2Self if
* impersonate_principal is specified).
diff --git a/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c
index fe7c4d18f5c..c1c33d8ad9c 100644
--- a/lib/ldb/common/ldb.c
+++ b/lib/ldb/common/ldb.c
@@ -986,7 +986,7 @@ struct ldb_db_lock_context {
};
/*
- * We have to have a the unlock on a destructor so that we unlock the
+ * We have to have the unlock on a destructor so that we unlock the
* DB if a caller calls talloc_free(req). We trust that the ldb
* context has not already gone away.
*/
diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
index 8ffbced940a..a9f59006173 100644
--- a/lib/ldb/common/ldb_msg.c
+++ b/lib/ldb/common/ldb_msg.c
@@ -1576,7 +1576,7 @@ char *ldb_timestring(TALLOC_CTX *mem_ctx, time_t t)
return NULL;
}
- /* we now exactly how long this string will be */
+ /* we know exactly how long this string will be */
ts = talloc_array(mem_ctx, char, 18);
/* formatted like: 20040408072012.0Z */
@@ -1692,7 +1692,7 @@ char *ldb_timestring_utc(TALLOC_CTX *mem_ctx, time_t t)
return NULL;
}
- /* we now exactly how long this string will be */
+ /* we know exactly how long this string will be */
ts = talloc_array(mem_ctx, char, 14);
/* formatted like: 20040408072012.0Z => 040408072012Z */
diff --git a/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h
index 154671bc3a6..825df7401bb 100644
--- a/lib/ldb/include/ldb.h
+++ b/lib/ldb/include/ldb.h
@@ -1471,7 +1471,7 @@ int ldb_extended_default_callback(struct ldb_request *req, struct ldb_reply *are
\param ldb the context associated with the database (from ldb_init())
\param mem_ctx a talloc memory context (used as parent of ret_req)
\param oid the OID of the extended operation.
- \param data a void pointer a the extended operation specific parameters,
+ \param data a void pointer to the extended operation specific parameters,
it needs to be NULL or a valid talloc pointer! talloc_get_type() will be used on it
\param controls an array of controls
\param context the callback function context
@@ -1495,7 +1495,7 @@ int ldb_build_extended_req(struct ldb_request **ret_req,
\param ldb the context associated with the database (from ldb_init())
\param oid the OID of the extended operation.
- \param data a void pointer a the extended operation specific parameters,
+ \param data a void pointer to the extended operation specific parameters,
it needs to be NULL or a valid talloc pointer! talloc_get_type() will be used on it
\param res the result of the extended operation
diff --git a/lib/ldb/ldb_key_value/ldb_kv.c b/lib/ldb/ldb_key_value/ldb_kv.c
index 875061c98b8..347b4fbfd8a 100644
--- a/lib/ldb/ldb_key_value/ldb_kv.c
+++ b/lib/ldb/ldb_key_value/ldb_kv.c
@@ -861,7 +861,7 @@ static int ldb_kv_find_element(const struct ldb_message *msg, const char *name)
/*
add an element to an existing record. Assumes a elements array that we
- can call re-alloc on, and assumed that we can re-use the data pointers from
+ can call re-alloc on, and assumes that we can reuse the data pointers from
the passed in additional values. Use with care!
returns 0 on success, -1 on failure (and sets errno)
diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index bcbd903f6fb..f76087de6af 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -55,7 +55,7 @@ dn: @INDEX:NAME:DNSUPDATEPROXY
In this format, @IDX is multi-valued, one entry for each match
-The corrosponding entry is stored in a TDB record with key:
+The corresponding entry is stored in a TDB record with key:
DN=CN=DNSUPDATEPROXY,CN=USERS,DC=ADDOM,DC=SAMBA,DC=EXAMPLE,DC=COM
@@ -79,7 +79,7 @@ by the @IDXGUID attribute on @INDEXLIST.
If there are multiple values the @IDX value simply becomes longer,
in multiples of 16.
-The corrosponding entry is stored in a TDB record with key:
+The corresponding entry is stored in a TDB record with key:
GUID=<binary GUID>
diff --git a/lib/printer_driver/printer_driver.c b/lib/printer_driver/printer_driver.c
index 35260c29075..e41f665aacd 100644
--- a/lib/printer_driver/printer_driver.c
+++ b/lib/printer_driver/printer_driver.c
@@ -1153,7 +1153,7 @@ static NTSTATUS setup_driver_by_name(TALLOC_CTX *mem_ctx,
}
/****************************************************************
- parse the a printer inf file
+ parse a printer inf file
****************************************************************/
NTSTATUS driver_inf_parse(TALLOC_CTX *mem_ctx,
diff --git a/lib/tdb/common/hash.c b/lib/tdb/common/hash.c
index 4de7ba94d2c..ca4cac3ab97 100644
--- a/lib/tdb/common/hash.c
+++ b/lib/tdb/common/hash.c
@@ -56,7 +56,7 @@ if SELF_TEST is defined. You can use this free for any purpose. It's in
the public domain. It has no warranty.
You probably want to use hashlittle(). hashlittle() and hashbig()
--
Samba Shared Repository
More information about the samba-cvs
mailing list