[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Apr 11 10:09:01 UTC 2023
The branch, master has been updated
via ad7418d23f8 lib:replace: Fix snprintf of rep_inet_ntop()
via f1209a7a15d lib:replace: Fix code spelling
via 8c32a475e4a lib:pthreadpool: Fix code spelling
via 25e1987e155 lib:param: Fix code spelling
via 4b12dc1fb5a lib:messaging: Fix code spelling
via 5e9bfcf4b2e lib:ldb: Fix code spelling
via e288aca9d8e examples: Fix spelling
via bca9c059c39 dynconfig: Fix code spelling
via 3c96f7d80e5 docs-xml: Fix spelling
via 8f18fadd31d ctdb: Fix code spelling
via 9580d66b149 Makefile: Fix spelling
from 0cd66fe6bd4 libsmb: Fix test for smbc_getxattr
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ad7418d23f891227bb8302d0514f82fcd438280c
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 16:17:16 2023 +0200
lib:replace: Fix snprintf of rep_inet_ntop()
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Apr 11 10:08:54 UTC 2023 on atb-devel-224
commit f1209a7a15dc9a08071873d27946953558dfc15c
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 16:16:19 2023 +0200
lib:replace: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 8c32a475e4a9ae94a450be30bcd5e5d12b9e20fe
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 16:05:03 2023 +0200
lib:pthreadpool: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 25e1987e155e189e6c7e2984914820bcaad4e47c
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 16:04:08 2023 +0200
lib:param: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 4b12dc1fb5abb94eafdb99c8a3f2451849f6657b
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 16:02:58 2023 +0200
lib:messaging: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 5e9bfcf4b2e31ac45b4212f5894c4b698839ca37
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 16:01:33 2023 +0200
lib:ldb: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit e288aca9d8ed378e4763ad567543a2910187128a
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 15:54:30 2023 +0200
examples: Fix spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit bca9c059c398ed61960bdabbb0756c9dd4d68a6d
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 15:52:49 2023 +0200
dynconfig: Fix code spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 3c96f7d80e5f300aa5f53666a14bc9e02080969e
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 15:51:35 2023 +0200
docs-xml: Fix spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 8f18fadd31d2be93234f37eac312cd87759022d0
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 15:45:07 2023 +0200
ctdb: Fix code spelling
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
commit 9580d66b1497cd2b3a33df05ee091f5a7a20b480
Author: Andreas Schneider <asn at samba.org>
Date: Thu Apr 6 15:43:10 2023 +0200
Makefile: Fix spelling
Best reviewed with: `git show --word-diff`.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
ctdb/config/events/README | 2 +-
ctdb/config/events/legacy/10.interface.script | 2 +-
ctdb/config/functions | 2 +-
docs-xml/Samba-Developers-Guide/internals.xml | 2 +-
docs-xml/build/DTD/samba.entities | 6 +++---
docs-xml/smbdotconf/protocol/clientusespnego.xml | 4 ++--
docs-xml/xslt/docbook2pearson.xsl | 2 +-
docs-xml/xslt/strip-references.xsl | 2 +-
dynconfig/wscript | 2 +-
examples/LDAP/samba-schema.IBMSecureWay | 2 +-
lib/ldb/ldb_mdb/ldb_mdb.c | 2 +-
lib/ldb/man/ldb.3.xml | 2 +-
lib/ldb/tests/ldb_filter_attrs_in_place_test.c | 4 ++--
lib/ldb/tools/ldbutil.c | 2 +-
lib/messaging/messages_dgm.c | 2 +-
lib/param/README | 4 ++--
lib/param/loadparm.c | 6 +++---
lib/param/loadparm.h | 2 +-
lib/pthreadpool/pthreadpool_tevent.c | 2 +-
lib/replace/inet_ntop.c | 14 ++++++++------
lib/replace/snprintf.c | 6 +++---
lib/replace/strptime.c | 2 +-
lib/replace/system/wscript_configure | 4 ++--
lib/replace/xattr.c | 2 +-
25 files changed, 42 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile b/Makefile
index ec571050a09..5308d745e49 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ bin/%: FORCE
FORCE:
# Having .NOTPARALLEL will force make to do target once 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 parralel builds if
+# 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
.NOTPARALLEL: %
.PHONY: FORCE everything testsuite check torture
diff --git a/ctdb/config/events/README b/ctdb/config/events/README
index 766cb4f1064..6ee6e6fae78 100644
--- a/ctdb/config/events/README
+++ b/ctdb/config/events/README
@@ -168,7 +168,7 @@ ipreallocated
events, even though these events may not run on some nodes if
there are no relevant changes. That is, the "ipreallocated"
event is triggered unconditionally, even on nodes where public
- IP addresses assignements have not changed.
+ IP addresses assignments have not changed.
This event is used to reconfigure services.
diff --git a/ctdb/config/events/legacy/10.interface.script b/ctdb/config/events/legacy/10.interface.script
index 7dfacd317d6..fead88c014f 100755
--- a/ctdb/config/events/legacy/10.interface.script
+++ b/ctdb/config/events/legacy/10.interface.script
@@ -250,7 +250,7 @@ updateip)
$CTDB gratarp "$ip" "$niface"
# tickle all existing connections, so that dropped packets
- # are retransmited and the tcp streams work
+ # are retransmitted and the tcp streams work
tickle_tcp_connections "$ip"
;;
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 328b4b0ab50..3e46fb496a3 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -744,7 +744,7 @@ ctdb_counter_get () {
_ctdb_counter_common "$1"
# unary counting!
_val=$(wc -c < "$_counter_file" 2>/dev/null || echo 0)
- # Strip leading spaces from ouput of wc (on freebsd)
+ # Strip leading spaces from output of wc (on freebsd)
# shellcheck disable=SC2086
echo $_val
}
diff --git a/docs-xml/Samba-Developers-Guide/internals.xml b/docs-xml/Samba-Developers-Guide/internals.xml
index 04097ae8270..b3fa5282e95 100644
--- a/docs-xml/Samba-Developers-Guide/internals.xml
+++ b/docs-xml/Samba-Developers-Guide/internals.xml
@@ -361,7 +361,7 @@ An adjustment which tells the amount by which pointers in the returned
data should be adjusted. This value should be read with SVAL(). Basically,
the address of the start of the returned data buffer should have the returned
pointer value added to it and then have this value subtracted from it in
-order to obtain the currect offset into the returned data buffer.
+order to obtain the correct offset into the returned data buffer.
</para></listitem>
<listitem><para>
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index bba0c2c396b..6351a3af3e3 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -1,5 +1,5 @@
<!--
- vim:ft=dtd
+ vim:ft=dtd
-->
<!-- Email Address' -->
@@ -387,7 +387,7 @@
This option is used to determine what naming services
and in what order to resolve host names to IP
addresses. The option takes a space-separated string of
- different name resolution options. The best ist to wrap
+ different name resolution options. The best is to wrap
the whole --name-resolve=NAME-RESOLVE-ORDER into
quotes.
</para>
@@ -860,7 +860,7 @@
<term>-k|--kerberos=yes|no</term>
<listitem>
<para>
- Wether to use kerberos authentication. This option is
+ Whether to use kerberos authentication. This option is
deprecated. Migrate to --use-kerberos!
</para>
</listitem>
diff --git a/docs-xml/smbdotconf/protocol/clientusespnego.xml b/docs-xml/smbdotconf/protocol/clientusespnego.xml
index 2d45f912f17..6740b8c1a9f 100644
--- a/docs-xml/smbdotconf/protocol/clientusespnego.xml
+++ b/docs-xml/smbdotconf/protocol/clientusespnego.xml
@@ -11,8 +11,8 @@
<command>client use spnego = yes</command>
will be the enforced behaviour.</para>
- <para> This variable controls whether Samba clients will try
- to use Simple and Protected NEGOciation (as specified by rfc2478) with
+ <para> This variable controls whether Samba clients will try
+ 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.</para>
diff --git a/docs-xml/xslt/docbook2pearson.xsl b/docs-xml/xslt/docbook2pearson.xsl
index ebe2a955a27..196941ae718 100644
--- a/docs-xml/xslt/docbook2pearson.xsl
+++ b/docs-xml/xslt/docbook2pearson.xsl
@@ -837,7 +837,7 @@
<xsl:otherwise>
<xsl:if test="$refelem != ''">
<xsl:message>
- <xsl:text>Cant't handle xref to </xsl:text>
+ <xsl:text>Can't handle xref to </xsl:text>
<xsl:value-of select="$refelem"/>
<xsl:text>:</xsl:text>
<xsl:value-of select="@linkend"/>
diff --git a/docs-xml/xslt/strip-references.xsl b/docs-xml/xslt/strip-references.xsl
index 951d4be174c..56b782a2c14 100644
--- a/docs-xml/xslt/strip-references.xsl
+++ b/docs-xml/xslt/strip-references.xsl
@@ -1,5 +1,5 @@
<?xml version='1.0'?>
-<!-- Removes particular (unuseful for the book) elements from references -->
+<!-- Removes particular (useless for the book) elements from references -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.1">
<xsl:template match="reference/refentry/refsect1[title='VERSION' or title='AUTHOR']"/>
diff --git a/dynconfig/wscript b/dynconfig/wscript
index c62afa25399..347e5ddbabc 100644
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -71,7 +71,7 @@ class SambaIndentedHelpFormatter (optparse.IndentedHelpFormatter):
# We may overwrite the related path. (Default: False)
#
# 'DELAY' - The option refers to other options in the dynconfig list.
-# We delay the initalization into a later stage. This
+# We delay the initialization into a later stage. This
# makes sure the recursion works. (Default: False)
#
dynconfig = {
diff --git a/examples/LDAP/samba-schema.IBMSecureWay b/examples/LDAP/samba-schema.IBMSecureWay
index 1fca4a749a6..c45a3340978 100644
--- a/examples/LDAP/samba-schema.IBMSecureWay
+++ b/examples/LDAP/samba-schema.IBMSecureWay
@@ -2,7 +2,7 @@
## Submitted by Dirk Kastens <Dirk.Kastens at Uni-Osnabrueck.de>
##
## I translated the samba.schema to be used with IBM
-## SecureWay directoy server 3.2.2. You have to load
+## SecureWay directory server 3.2.2. You have to load
## it in your slapd32.conf with:
##
## dn: cn=IBM SecureWay, cn=Schemas, cn=Configuration
diff --git a/lib/ldb/ldb_mdb/ldb_mdb.c b/lib/ldb/ldb_mdb/ldb_mdb.c
index c4c53015b4b..e979cfab7d4 100644
--- a/lib/ldb/ldb_mdb/ldb_mdb.c
+++ b/lib/ldb/ldb_mdb/ldb_mdb.c
@@ -369,7 +369,7 @@ done:
}
/*
- * Explicity invalidate the data, as the delete has done this
+ * Explicitly invalidate the data, as the delete has done this
*/
data.length = 0;
data.data = NULL;
diff --git a/lib/ldb/man/ldb.3.xml b/lib/ldb/man/ldb.3.xml
index b832d0c2e7f..1c0a2ece552 100644
--- a/lib/ldb/man/ldb.3.xml
+++ b/lib/ldb/man/ldb.3.xml
@@ -41,7 +41,7 @@ architecture.
<para>
In a taxonomy of databases ldb would sit half way between key/value
-pair databases (such as berkley db or tdb) and a full LDAP
+pair databases (such as berkeley db or tdb) and a full LDAP
database. With a structured attribute oriented API like LDAP and good
indexing capabilities, ldb can be used for quite sophisticated
applications that need a light weight database, without the
diff --git a/lib/ldb/tests/ldb_filter_attrs_in_place_test.c b/lib/ldb/tests/ldb_filter_attrs_in_place_test.c
index 35c778d2080..bf370164191 100644
--- a/lib/ldb/tests/ldb_filter_attrs_in_place_test.c
+++ b/lib/ldb/tests/ldb_filter_attrs_in_place_test.c
@@ -53,7 +53,7 @@ struct ldbtest_ctx {
*
* This test checks the current behaviour of the function, however
* this is not in a public ABI and many of the tested behaviours are
- * not ideal. If the behaviour is deliberatly improved, this test
+ * not ideal. If the behaviour is deliberately improved, this test
* should be updated without worry to the new better behaviour.
*
* In particular the test is particularly to ensure the current
@@ -209,7 +209,7 @@ static void test_filter_attrs_in_place_two_attr_matched_attrs(void **state)
struct ldb_message *msg = ldb_msg_new(ctx);
- /* deliberatly the other order */
+ /* deliberately the other order */
const char *attrs[] = {"bar", "foo", NULL};
char value1[] = "The value.......end";
diff --git a/lib/ldb/tools/ldbutil.c b/lib/ldb/tools/ldbutil.c
index 9ff7fada76f..52a9b2763e2 100644
--- a/lib/ldb/tools/ldbutil.c
+++ b/lib/ldb/tools/ldbutil.c
@@ -35,7 +35,7 @@
#include "ldbutil.h"
-/* autostarts a transacion if none active */
+/* autostarts a transaction if none active */
static int ldb_do_autotransaction(struct ldb_context *ldb,
struct ldb_request *req)
{
diff --git a/lib/messaging/messages_dgm.c b/lib/messaging/messages_dgm.c
index f71b49cc01f..1c96b2f94ed 100644
--- a/lib/messaging/messages_dgm.c
+++ b/lib/messaging/messages_dgm.c
@@ -166,7 +166,7 @@ static void messaging_dgm_out_idle_handler(struct tevent_context *ev,
}
/*
- * Setup the idle handler to fire afer 1 second if the
+ * Setup the idle handler to fire after 1 second if the
* queue is zero.
*/
diff --git a/lib/param/README b/lib/param/README
index d83fe9a7a3a..11422f5c4c2 100644
--- a/lib/param/README
+++ b/lib/param/README
@@ -63,14 +63,14 @@ There is a lot of generated code, here, what generates what?
The regular format of the CPP macros in param_functions.c is used to
generate up the prototypes (mkproto.pl, mks3param_proto.pl), the service
and globals table (mkparamdefs.pl), the glue table (mmks3param.pl) and
-the initilisation of the glue table (mks3param_ctx_table.pl).
+the initialisation of the glue table (mks3param_ctx_table.pl).
I have tried combining some of these, but it just makes the scripts more
complex.
The CPP macros are defined in and expand in lib/param/loadparm.c and
source3/param/loadparm.c to read the values from the generated
-stuctures. They are CPP #included into these files so that the same
+structures. They are CPP #included into these files so that the same
macro has two definitions, depending on the system it is loading into.
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 16cb0d47f31..15322b391f0 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -173,7 +173,7 @@ static const char *lpcfg_string(const char *s)
* for code compatibility between existing Samba4 and Samba3 code.
*/
-/* this global context supports the lp_*() function varients */
+/* this global context supports the lp_*() function variants */
static struct loadparm_context *global_loadparm_context;
#define FN_GLOBAL_SUBSTITUTED_STRING(fn_name,var_name) \
@@ -2111,7 +2111,7 @@ bool lpcfg_set_option(struct loadparm_context *lp_ctx, const char *option)
void lpcfg_print_parameter(struct parm_struct *p, void *ptr, FILE * f)
{
- /* For the seperation of lists values that we print below */
+ /* For the separation of lists values that we print below */
const char *list_sep = ", ";
int i;
switch (p->type)
@@ -3361,7 +3361,7 @@ static bool lpcfg_load_internal(struct loadparm_context *lp_ctx,
setenv("SMB_CONF_PATH", filename, 1);
/* set the context used by the lp_*() function
- varients */
+ variants */
global_loadparm_context = lp_ctx;
lp_ctx->loaded = true;
}
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index af6b530366a..06e40f25c84 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -169,7 +169,7 @@ struct file_lists {
/*
* This should be under the HAVE_KRB5 flag but since they're used
- * in lp_kerberos_method(), they ned to be always available
+ * in lp_kerberos_method(), they need to be always available
* If you add any entries to KERBEROS_VERIFY defines, please modify USE.*KEYTAB macros
* so they remain accurate.
*/
diff --git a/lib/pthreadpool/pthreadpool_tevent.c b/lib/pthreadpool/pthreadpool_tevent.c
index 389bb06b54c..a66f444d193 100644
--- a/lib/pthreadpool/pthreadpool_tevent.c
+++ b/lib/pthreadpool/pthreadpool_tevent.c
@@ -27,7 +27,7 @@
struct pthreadpool_tevent_job_state;
/*
- * We need one pthreadpool_tevent_glue object per unique combintaion of tevent
+ * We need one pthreadpool_tevent_glue object per unique combination of tevent
* contexts and pthreadpool_tevent objects. Maintain a list of used tevent
* contexts in a pthreadpool_tevent.
*/
diff --git a/lib/replace/inet_ntop.c b/lib/replace/inet_ntop.c
index fb3d8e90c8a..d6d4158d975 100644
--- a/lib/replace/inet_ntop.c
+++ b/lib/replace/inet_ntop.c
@@ -65,20 +65,22 @@ rep_inet_ntop(int af, const void *src, char *dst, socklen_t size)
* format an IPv4 address
* return:
* `dst' (as a const)
- * notes:
- * (1) uses no statics
- * (2) takes a unsigned char* not an in_addr as input
* author:
* Paul Vixie, 1996.
*/
static const char *
inet_ntop4(const unsigned char *src, char *dst, socklen_t size)
{
- static const char *fmt = "%u.%u.%u.%u";
- char tmp[sizeof "255.255.255.255"];
+ char tmp[sizeof("255.255.255.255")];
size_t len;
- len = snprintf(tmp, sizeof tmp, fmt, src[0], src[1], src[2], src[3]);
+ len = snprintf(tmp,
+ sizeof(tmp),
+ "%hhu.%hhu.%hhu.%hhu",
+ src[0],
+ src[1],
+ src[2],
+ src[3]);
if (len >= size) {
errno = ENOSPC;
return (NULL);
diff --git a/lib/replace/snprintf.c b/lib/replace/snprintf.c
index de814af4164..dd878fca113 100644
--- a/lib/replace/snprintf.c
+++ b/lib/replace/snprintf.c
@@ -20,7 +20,7 @@
* for string length. This covers a nasty loophole.
*
* The other functions are there to prevent NULL pointers from
- * causing nast effects.
+ * causing nasty effects.
*
* More Recently:
* Brandon Long <blong at fiction.net> 9/15/96 for mutt 0.43
@@ -77,7 +77,7 @@
* Fix incorrect zpadlen handling in fmtfp.
* Thanks to Ollie Oldham <ollie.oldham at metro-optix.com> for spotting it.
* few mods to make it easier to compile the tests.
- * addedd the "Ollie" test to the floating point ones.
+ * added the "Ollie" test to the floating point ones.
*
* Martin Pool (mbp at samba.org) April 2003
* Remove NO_CONFIG_H so that the test case can be built within a source
@@ -550,7 +550,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args_in
}
for (i = 1; i < clist[pnum].num; i++) {
if (clist[pnum].chunks[0]->type != clist[pnum].chunks[i]->type) {
- /* nooo noo no!
+ /* nooo no no!
* all the references to a parameter
* must be of the same type
*/
diff --git a/lib/replace/strptime.c b/lib/replace/strptime.c
index bbc742277de..56ea1e01903 100644
--- a/lib/replace/strptime.c
+++ b/lib/replace/strptime.c
@@ -287,7 +287,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
}
/* Any character but `%' must be matched by the same character
- in the iput string. */
+ in the input string. */
if (*fmt != '%')
{
match_char (*fmt++, *rp++);
diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure
index ecd9964b533..b51d9179cc7 100644
--- a/lib/replace/system/wscript_configure
+++ b/lib/replace/system/wscript_configure
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# solaris varients of getXXent_r
+# solaris variants of getXXent_r
conf.CHECK_C_PROTOTYPE('getpwent_r',
'struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)',
define='SOLARIS_GETPWENT_R', headers='pwd.h')
@@ -8,7 +8,7 @@ conf.CHECK_C_PROTOTYPE('getgrent_r',
'struct group *getgrent_r(struct group *src, char *buf, int buflen)',
define='SOLARIS_GETGRENT_R', headers='grp.h')
-# the irix varients
+# the irix variants
conf.CHECK_C_PROTOTYPE('getpwent_r',
'struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)',
define='SOLARIS_GETPWENT_R', headers='pwd.h')
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 1044942f4b9..6d014a83a73 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -42,7 +42,7 @@ static int solaris_openat(int fildes, const char *path, int oflag, mode_t mode);
#endif
/**************************************************************************
- Wrappers for extented attribute calls. Based on the Linux package with
+ Wrappers for extended attribute calls. Based on the Linux package with
support for IRIX and (Net|Free)BSD also. Expand as other systems have them.
****************************************************************************/
--
Samba Shared Repository
More information about the samba-cvs
mailing list