[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Tue Jun 12 01:22:04 MDT 2012


The branch, master has been updated
       via  25216d7 s4:smbd: fix typos
       via  23a73c5 s4:kerberos: fix typos in kerberos-notes.txt
       via  6b2175c s4:gensec: fix a comment typo
       via  7dd22bd s4:torture: fix use of non-existent word (existant)
       via  2a1ab92 s4:tests: fix use of a non-existent word (existant)
       via  cec6ebf s4:provision: fix use of non-existent word (existant)
       via  acd3a6b s4:registry:testsuite: fix use of non-existent word (existant)
       via  d91182c s4:heimdal: fix use of a non-existent word (existant)
       via  72a92b8 s3:torture: fix use of non-existent word (existant)
       via  51a1936 s3:printing: fix use of a non-existent word (existant)
       via  21a36aa s3:vfs:scannedonly: fix use of non-existent word (existant)
       via  33ebba9 libsmbclient: fix use of a non-existent word (existant)
       via  08e9b17 selftest: fix use of a non-existent word (existant)
       via  9995257 lib/testtools: fix use of a non-existent word (existant)
       via  0688cf1 tdb:tests: fix use of a non-existent word (existant)
       via  ff053de ldb:tests: fix use of a non-existent word (existant)
       via  d93d041 pidl/tests: fix use of a non-existent word (existant)
       via  89f95c0 lib/util: fix use of a non-existent word (existant) in a comment
       via  6977cb3 nsstest: fix use of a non-existent word (existant)
      from  fac6191 s3: Make vfswrap_audit_file static

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 25216d753742c68fc921b84208c0a92b958c15c9
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 12 00:32:19 2012 +0200

    s4:smbd: fix typos
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Jun 12 09:21:15 CEST 2012 on sn-devel-104

commit 23a73c51acf33f7c5473cf6bd1b93dcf05c0d880
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 12 00:30:42 2012 +0200

    s4:kerberos: fix typos in kerberos-notes.txt

commit 6b2175c83416e7e5bcd76c79cf927ad806d4a562
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 12 00:29:11 2012 +0200

    s4:gensec: fix a comment typo

commit 7dd22bdb476e7565a755bf44040ed505d84e07a9
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:58:02 2012 +0200

    s4:torture: fix use of non-existent word (existant)

commit 2a1ab927932675b5ea3a22628f55f34882f7c682
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:52:57 2012 +0200

    s4:tests: fix use of a non-existent word (existant)

commit cec6ebf4c33c3bbb9bdb4466f25964c96275e2e0
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:51:51 2012 +0200

    s4:provision: fix use of non-existent word (existant)

commit acd3a6bb6c1d050ac3cf3cc845f2b10607aeb105
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:51:05 2012 +0200

    s4:registry:testsuite: fix use of non-existent word (existant)

commit d91182c5ae0466773d59894abc5bb29cfd2c80ad
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:50:22 2012 +0200

    s4:heimdal: fix use of a non-existent word (existant)

commit 72a92b8c4cf59c5198edfa2e7d8f9719807f7ff3
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:49:15 2012 +0200

    s3:torture: fix use of non-existent word (existant)

commit 51a19364ffa5b4d24078cba640224645c60cf5e7
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:48:32 2012 +0200

    s3:printing: fix use of a non-existent word (existant)

commit 21a36aa2e85c0871577dd71f9006e6e407e34ca2
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:47:58 2012 +0200

    s3:vfs:scannedonly: fix use of non-existent word (existant)

commit 33ebba9c5a43ab5f295b34f8e6320c08b3a75ab6
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:47:04 2012 +0200

    libsmbclient: fix use of a non-existent word (existant)

commit 08e9b1774f429ea82b851ba7e51e00990daa064a
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:38:28 2012 +0200

    selftest: fix use of a non-existent word (existant)

commit 99952571277c1d496fd4a8e5fa82f901dbb6b7e1
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:37:44 2012 +0200

    lib/testtools: fix use of a non-existent word (existant)

commit 0688cf102d2a513875d1832ad0de6052b837a72a
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:37:13 2012 +0200

    tdb:tests: fix use of a non-existent word (existant)

commit ff053de0965f0a66db7da491ca9169ca9d2c2dbf
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:36:38 2012 +0200

    ldb:tests: fix use of a non-existent word (existant)

commit d93d04124cedb6a15a132c922885f9c8d41aee96
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:35:11 2012 +0200

    pidl/tests: fix use of a non-existent word (existant)

commit 89f95c00275dbe21fb5f3f0f8f5c4543b119c4f9
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:24:20 2012 +0200

    lib/util: fix use of a non-existent word (existant) in a comment

commit 6977cb34ae4c0fb09f717c7f260cb52ccb949e84
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 11 17:24:20 2012 +0200

    nsstest: fix use of a non-existent word (existant)

-----------------------------------------------------------------------

Summary of changes:
 lib/ldb/tests/python/api.py                        |    2 +-
 lib/tdb/python/tests/simple.py                     |    4 ++--
 lib/testtools/testtools/tests/test_compat.py       |    2 +-
 lib/util/string_wrappers.h                         |    2 +-
 nsswitch/nsstest.c                                 |    8 ++++----
 pidl/tests/typelist.pl                             |    4 ++--
 selftest/tests/test_target.py                      |    2 +-
 source3/libsmb/clirap2.c                           |    2 +-
 source3/modules/vfs_scannedonly.c                  |   10 +++++-----
 source3/printing/nt_printing.c                     |    2 +-
 source3/torture/torture.c                          |    6 +++---
 source4/auth/gensec/gensec_krb5.c                  |    2 +-
 source4/auth/kerberos/kerberos-notes.txt           |    4 ++--
 source4/heimdal/lib/krb5/fcache.c                  |    2 +-
 source4/lib/registry/tests/hive.c                  |    6 +++---
 .../scripting/python/samba/provision/__init__.py   |    2 +-
 source4/scripting/python/samba/tests/hostconfig.py |    2 +-
 source4/scripting/python/samba/tests/param.py      |    4 ++--
 .../python/samba/tests/samba_tool/timecmd.py       |    2 +-
 source4/smbd/process_single.c                      |    2 +-
 source4/smbd/process_standard.c                    |    4 ++--
 source4/torture/raw/lookuprate.c                   |    2 +-
 source4/torture/raw/notify.c                       |    4 ++--
 source4/torture/raw/open.c                         |    4 ++--
 source4/torture/raw/streams.c                      |    6 +++---
 source4/torture/raw/unlink.c                       |    2 +-
 source4/torture/rpc/samr.c                         |    2 +-
 source4/torture/smb2/notify.c                      |    4 ++--
 source4/torture/smb2/streams.c                     |    6 +++---
 29 files changed, 52 insertions(+), 52 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py
index 97dd020..7cd8f03 100755
--- a/lib/ldb/tests/python/api.py
+++ b/lib/ldb/tests/python/api.py
@@ -372,7 +372,7 @@ class DnTests(TestCase):
         x = ldb.Dn(self.ldb, "dc=foo16,bar=bloe")
         self.assertEquals("bar=bloe", x.parent().__str__())
 
-    def test_parent_nonexistant(self):
+    def test_parent_nonexistent(self):
         x = ldb.Dn(self.ldb, "@BLA")
         self.assertEquals(None, x.parent())
 
diff --git a/lib/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
index 2877092..c37ef83 100644
--- a/lib/tdb/python/tests/simple.py
+++ b/lib/tdb/python/tests/simple.py
@@ -13,8 +13,8 @@ import os, tempfile
 
 class OpenTdbTests(TestCase):
 
-    def test_nonexistant_read(self):
-        self.assertRaises(IOError, tdb.Tdb, "/some/nonexistant/file", 0,
+    def test_nonexistent_read(self):
+        self.assertRaises(IOError, tdb.Tdb, "/some/nonexistent/file", 0,
                 tdb.DEFAULT, os.O_RDWR)
 
 class CloseTdbTests(TestCase):
diff --git a/lib/testtools/testtools/tests/test_compat.py b/lib/testtools/testtools/tests/test_compat.py
index 5e385bf..4b2446e 100644
--- a/lib/testtools/testtools/tests/test_compat.py
+++ b/lib/testtools/testtools/tests/test_compat.py
@@ -147,7 +147,7 @@ class TestGetSourceEncoding(testtools.TestCase):
                 self.addCleanup(os.remove, self.filename)
                 self.addCleanup(linecache.cache.pop, self.filename, None)
 
-    def test_nonexistant_file_as_ascii(self):
+    def test_nonexistent_file_as_ascii(self):
         """When file can't be found, the encoding should default to ascii"""
         self.assertEquals("ascii", _get_source_encoding(self.filename))
 
diff --git a/lib/util/string_wrappers.h b/lib/util/string_wrappers.h
index c39ff1f..5f9d568 100644
--- a/lib/util/string_wrappers.h
+++ b/lib/util/string_wrappers.h
@@ -57,7 +57,7 @@ do { \
 #ifdef HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS
 
 /* We need a number of different prototypes for our
-   non-existant fuctions */
+   non-existent fuctions */
 char * __unsafe_string_function_usage_here__(void);
 
 size_t __unsafe_string_function_usage_here_size_t__(void);
diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c
index e2b39bc..39d0342 100644
--- a/nsswitch/nsstest.c
+++ b/nsswitch/nsstest.c
@@ -451,25 +451,25 @@ static void nss_test_errors(void)
 	pwd = getpwnam("nosuchname");
 	if (pwd || last_error != NSS_STATUS_NOTFOUND) {
 		total_errors++;
-		printf("ERROR Non existant user gave error %d\n", last_error);
+		printf("ERROR Non existent user gave error %d\n", last_error);
 	}
 
 	pwd = getpwuid(0xFFF0);
 	if (pwd || last_error != NSS_STATUS_NOTFOUND) {
 		total_errors++;
-		printf("ERROR Non existant uid gave error %d\n", last_error);
+		printf("ERROR Non existent uid gave error %d\n", last_error);
 	}
 
 	grp = getgrnam("nosuchgroup");
 	if (grp || last_error != NSS_STATUS_NOTFOUND) {
 		total_errors++;
-		printf("ERROR Non existant group gave error %d\n", last_error);
+		printf("ERROR Non existent group gave error %d\n", last_error);
 	}
 
 	grp = getgrgid(0xFFF0);
 	if (grp || last_error != NSS_STATUS_NOTFOUND) {
 		total_errors++;
-		printf("ERROR Non existant gid gave error %d\n", last_error);
+		printf("ERROR Non existent gid gave error %d\n", last_error);
 	}
 }
 
diff --git a/pidl/tests/typelist.pl b/pidl/tests/typelist.pl
index e99b016..681c0ea 100755
--- a/pidl/tests/typelist.pl
+++ b/pidl/tests/typelist.pl
@@ -52,14 +52,14 @@ is(1, typeIs("uint32", "SCALAR"));
 is(0, typeIs("uint32", "ENUM"));
 
 is(1, hasType("foo"));
-is(0, hasType("nonexistant"));
+is(0, hasType("nonexistent"));
 is(0, hasType({TYPE => "ENUM", NAME => "someUnknownType"}));
 is(1, hasType({TYPE => "ENUM", NAME => "foo"}));
 is(1, hasType({TYPE => "ENUM"}));
 is(1, hasType({TYPE => "STRUCT"}));
 
 is(1, is_scalar("uint32"));
-is(0, is_scalar("nonexistant"));
+is(0, is_scalar("nonexistent"));
 is(1, is_scalar({TYPE => "ENUM"}));
 is(0, is_scalar({TYPE => "STRUCT"}));
 is(1, is_scalar({TYPE => "TYPEDEF", DATA => {TYPE => "ENUM" }}));
diff --git a/selftest/tests/test_target.py b/selftest/tests/test_target.py
index 4cdc028..00b7126 100644
--- a/selftest/tests/test_target.py
+++ b/selftest/tests/test_target.py
@@ -125,5 +125,5 @@ class EnvironmentManagerTests(TestCase):
         env = self.mgr.setup_env("something", "prefix")
         self.assertIs(env, self.mgr.get_running_env("something"))
 
-    def test_get_running_env_nonexistant(self):
+    def test_get_running_env_nonexistent(self):
         self.assertIs(None, self.mgr.get_running_env("something"))
diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index ce94041..1333f46 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -1127,7 +1127,7 @@ int cli_NetFileClose(struct cli_state *cli, uint32 file_id )
 		if (res == 0) {
 			/* nothing to do */
 		} else if (res == 2314){
-			DEBUG(1, ("NetFileClose2 - attempt to close non-existant file open instance\n"));
+			DEBUG(1, ("NetFileClose2 - attempt to close non-existent file open instance\n"));
 		} else {
 			DEBUG(4,("NetFileClose2 res=%d\n", res));
 		}
diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c
index b43c6df..c48c21a 100644
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -362,7 +362,7 @@ fullpath is a full path starting from / or a relative path to the
 current working directory
 shortname is the filename without directory components
 basename, is the directory without file name component
-allow_nonexistant return TRUE if stat() on the requested file fails
+allow_nonexistent return TRUE if stat() on the requested file fails
 recheck_time, the time in milliseconds to wait for the daemon to
 create a .scanned file
 recheck_tries, the number of tries to wait
@@ -375,7 +375,7 @@ static bool scannedonly_allow_access(vfs_handle_struct * handle,
 				     struct smb_filename *smb_fname,
 				     const char *shortname,
 				     const char *base_name,
-				     int allow_nonexistant,
+				     int allow_nonexistent,
 				     int recheck_time, int recheck_tries,
 				     int recheck_size, int loop)
 {
@@ -403,9 +403,9 @@ static bool scannedonly_allow_access(vfs_handle_struct * handle,
 		if (retval != 0) {
 			/* failed to stat this file?!? --> hide it */
 			DEBUG(SCANNEDONLY_DEBUG,("no valid stat, return"
-						 " allow_nonexistant=%d\n",
-						 allow_nonexistant));
-			return allow_nonexistant;
+						 " allow_nonexistent=%d\n",
+						 allow_nonexistent));
+			return allow_nonexistent;
 		}
 	}
 	if (!S_ISREG(smb_fname->st.st_ex_mode)) {
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f52b6ae..9e7ca40 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1627,7 +1627,7 @@ bool delete_driver_files(const struct auth_session_info *session_info,
 	2: file doesn't exist
 	3: can't allocate memory
 	4: can't free memory
-	5: non existant struct
+	5: non existent struct
 */
 
 /*
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 08294e6..5fa6330 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -6071,7 +6071,7 @@ bool torture_chkpath_test(int dummy)
 		ret = check_error(__LINE__, status, ERRDOS, ERRbadfile,
 				  NT_STATUS_OBJECT_NAME_NOT_FOUND);
 	} else {
-		printf("* chkpath on a non existant file should fail\n");
+		printf("* chkpath on a non existent file should fail\n");
 		ret = False;
 	}
 
@@ -6211,10 +6211,10 @@ static bool run_eatest(int dummy)
 		correct = False;
 	}
 
-	/* Try and delete a non existant EA. */
+	/* Try and delete a non existent EA. */
 	status = cli_set_ea_path(cli, fname, "foo", "", 0);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("deleting non-existant EA 'foo' should succeed. %s\n",
+		printf("deleting non-existent EA 'foo' should succeed. %s\n",
 		       nt_errstr(status));
 		correct = False;
 	}
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 6209c2e..140a165 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -262,7 +262,7 @@ static NTSTATUS gensec_krb5_common_client_start(struct gensec_security *gensec_s
 	gensec_krb5_state->ap_req_options = AP_OPTS_USE_SUBKEY;
 
 	if (gensec_krb5_state->gssapi) {
-		/* The Fake GSSAPI modal emulates Samba3, which does not do mutual authentication */
+		/* The Fake GSSAPI model emulates Samba3, which does not do mutual authentication */
 		if (gensec_setting_bool(gensec_security->settings, "gensec_fake_gssapi_krb5", "mutual", false)) {
 			gensec_krb5_state->ap_req_options |= AP_OPTS_MUTUAL_REQUIRED;
 		}
diff --git a/source4/auth/kerberos/kerberos-notes.txt b/source4/auth/kerberos/kerberos-notes.txt
index 78efe17..f15f3f9 100644
--- a/source4/auth/kerberos/kerberos-notes.txt
+++ b/source4/auth/kerberos/kerberos-notes.txt
@@ -527,11 +527,11 @@ SHA-1.  So, nowadays, this password-based in-memory keytab is seen as too
 slow, and is falling into disuse.
 
 Traditional 'MIT' behaviour is to use a keytab, containing salted key
-data, extracted from the KDC.  (In this modal, there is no 'service
+data, extracted from the KDC.  (In this model, there is no 'service
 password', instead the keys are often simply application of random
 bytes).  Heimdal also implements this behaviour.
 
-The windows modal is very different - instead of sharing a keytab with
+The windows model is very different - instead of sharing a keytab with
 each member server, a random utf-16 pseudo-textual password is stored 
 for the whole machine.  
 The password is set with non-kerberos mechanisms (particularly SAMR, 
diff --git a/source4/heimdal/lib/krb5/fcache.c b/source4/heimdal/lib/krb5/fcache.c
index 731f293..781d4f0 100644
--- a/source4/heimdal/lib/krb5/fcache.c
+++ b/source4/heimdal/lib/krb5/fcache.c
@@ -925,7 +925,7 @@ fcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id)
 	    return ret;
 	fn = expandedfn;
     }
-    /* check if file exists, don't return a non existant "next" */
+    /* check if file exists, don't return a non existent "next" */
     if (strncasecmp(fn, "FILE:", 5) == 0) {
 	struct stat sb;
 	ret = stat(fn + 5, &sb);
diff --git a/source4/lib/registry/tests/hive.c b/source4/lib/registry/tests/hive.c
index c5632b8..2bc2e57 100644
--- a/source4/lib/registry/tests/hive.c
+++ b/source4/lib/registry/tests/hive.c
@@ -29,7 +29,7 @@
 #include "libcli/security/security.h"
 #include "lib/registry/tests/proto.h"
 
-static bool test_del_nonexistant_key(struct torture_context *tctx,
+static bool test_del_nonexistent_key(struct torture_context *tctx,
 				     const void *test_data)
 {
 	const struct hive_key *root = (const struct hive_key *)test_data;
@@ -346,8 +346,8 @@ static bool test_hive_security(struct torture_context *tctx, const void *_data)
 
 static void tcase_add_tests(struct torture_tcase *tcase)
 {
-	torture_tcase_add_simple_test_const(tcase, "del_nonexistant_key",
-						test_del_nonexistant_key);
+	torture_tcase_add_simple_test_const(tcase, "del_nonexistent_key",
+						test_del_nonexistent_key);
 	torture_tcase_add_simple_test_const(tcase, "add_subkey",
 						test_add_subkey);
 	torture_tcase_add_simple_test(tcase, "flush_key",
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 5f64d77..65835ce 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -624,7 +624,7 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir,
 
     if lp is None:
         lp = samba.param.LoadParm()
-    #Load non-existant file
+    #Load non-existent file
     if os.path.exists(smbconf):
         lp.load(smbconf)
 
diff --git a/source4/scripting/python/samba/tests/hostconfig.py b/source4/scripting/python/samba/tests/hostconfig.py
index 8f42a2b..85cb1df 100644
--- a/source4/scripting/python/samba/tests/hostconfig.py
+++ b/source4/scripting/python/samba/tests/hostconfig.py
@@ -63,7 +63,7 @@ class ShareTests(TestCase):
         shares = self._get_shares({"global": {}})
         self.assertEquals(0, len(shares))
 
-    def test_getitem_nonexistant(self):
+    def test_getitem_nonexistent(self):
         shares = self._get_shares({"global": {}})
         self.assertRaises(KeyError, shares.__getitem__, "bla")
 
diff --git a/source4/scripting/python/samba/tests/param.py b/source4/scripting/python/samba/tests/param.py
index 49dd7fb..f539eba 100644
--- a/source4/scripting/python/samba/tests/param.py
+++ b/source4/scripting/python/samba/tests/param.py
@@ -51,7 +51,7 @@ class LoadParmTestCase(samba.tests.TestCase):
         file = param.LoadParm()
         file.load_default()
 
-    def test_section_nonexistant(self):
+    def test_section_nonexistent(self):
         samba_lp = param.LoadParm()
         samba_lp.load_default()
-        self.assertRaises(KeyError, samba_lp.__getitem__, "nonexistant")
+        self.assertRaises(KeyError, samba_lp.__getitem__, "nonexistent")
diff --git a/source4/scripting/python/samba/tests/samba_tool/timecmd.py b/source4/scripting/python/samba/tests/samba_tool/timecmd.py
index a488a66..000f0f2 100644
--- a/source4/scripting/python/samba/tests/samba_tool/timecmd.py
+++ b/source4/scripting/python/samba/tests/samba_tool/timecmd.py
@@ -36,7 +36,7 @@ class TimeCmdTestCase(SambaToolCmdTest):
         self.assertTrue((servertime > (now - delta) and (servertime < (now + delta)), "Time is now"))
 
     def test_timefail(self):
-        """Run time against a non-existant server, and make sure it fails"""
+        """Run time against a non-existent server, and make sure it fails"""
         (result, out, err) = self.runcmd("time", "notaserver")
         self.assertEquals(result, -1, "check for result code")
         self.assertTrue(err.strip().endswith("NT_STATUS_OBJECT_NAME_NOT_FOUND"), "ensure right error string")
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index e1af2d4..742eac1 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -92,7 +92,7 @@ static void single_new_task(struct tevent_context *ev,
        
 	/* We use 1 so we cannot collide in with cluster ids generated
 	 * in the accept connection above, and unlikly to collide with
-	 * PIDs from process modal standard (don't run samba as
+	 * PIDs from process model standard (don't run samba as
 	 * init) */
 	new_task(ev, lp_ctx, cluster_id(1, taskid++), private_data);
 }
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 1e9b8ed..dd5f958 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -140,7 +140,7 @@ static void standard_accept_connection(struct tevent_context *ev,
 	talloc_free(c);
 	talloc_free(s);
 
-	/* setup this new connection.  Cluster ID is PID based for this process modal */
+	/* setup this new connection.  Cluster ID is PID based for this process model */
 	new_conn(ev, lp_ctx, sock2, cluster_id(pid, 0), private_data);
 
 	/* we can't return to the top level here, as that event context is gone,
@@ -190,7 +190,7 @@ static void standard_new_task(struct tevent_context *ev,
 
 	setproctitle("task %s server_id[%d]", service_name, (int)pid);
 
-	/* setup this new task.  Cluster ID is PID based for this process modal */
+	/* setup this new task.  Cluster ID is PID based for this process model */
 	new_task(ev, lp_ctx, cluster_id(pid, 0), private_data);
 
 	/* we can't return to the top level here, as that event context is gone,
diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c
index 3b9fbe1..7c0251a 100644
--- a/source4/torture/raw/lookuprate.c
+++ b/source4/torture/raw/lookuprate.c
@@ -225,7 +225,7 @@ static bool remove_working_directory(struct smbcli_tree *tree,
 
 /* Verify that looking up a file name takes constant time.
  *
- * This test samples the lookup rate for a non-existant filename in a
+ * This test samples the lookup rate for a non-existent filename in a
  * directory, while varying the number of files in the directory. The
  * lookup rate should continue to approximate the lookup rate for the
  * empty directory case.
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 2a16d6e..d9253f0 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -189,7 +189,7 @@ static bool test_notify_dir(struct torture_context *mem_ctx,
 	notify.nttrans.in.file.fnum = fnum;
 	req = smb_raw_changenotify_send(cli->tree, &notify);
 
-	status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt");
+	status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistent.txt");
 	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
 
 	/* (1st unlink) as the 2nd notify directly returns,
@@ -219,7 +219,7 @@ static bool test_notify_dir(struct torture_context *mem_ctx,
 	printf("(3rd notify) this notify will only see the 1st unlink\n");
 	req = smb_raw_changenotify_send(cli->tree, &notify);
 
-	status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt");
+	status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistent.txt");
 	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
 
 	printf("Testing notify on wildcard unlink for %d files\n", count-1);
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 21cc32e..145651b 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -1703,7 +1703,7 @@ static bool test_chained_ntcreatex_readx(struct torture_context *tctx, struct sm
 	torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR);
 
 	torture_comment(tctx, "Checking RAW_NTCREATEX_READX chained on "
-			      "non-existant file \n");
+			      "non-existent file \n");
 
 	/* ntcreatex parameters */
 	io.generic.level = RAW_OPEN_NTCREATEX_READX;
@@ -1727,7 +1727,7 @@ static bool test_chained_ntcreatex_readx(struct torture_context *tctx, struct sm
 	io.ntcreatexreadx.in.remaining = 0;
 	io.ntcreatexreadx.out.data = (uint8_t *)buf2;
 
-	/* try to open the non-existant file */
+	/* try to open the non-existent file */
 	status = smb_raw_open(cli->tree, mem_ctx, &io);
 	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
 	fnum = io.ntcreatexreadx.out.file.fnum;
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 2aace2b..d48c555 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -203,7 +203,7 @@ static bool test_stream_dir(struct torture_context *tctx,
 	basedir_data = talloc_asprintf(tctx, "%s::$DATA", BASEDIR);
 	sname1 = talloc_asprintf(tctx, "%s:%s", fname, "Stream One");
 
-	printf("(%s) opening non-existant directory stream\n", __location__);
+	printf("(%s) opening non-existent directory stream\n", __location__);
 	io.generic.level = RAW_OPEN_NTCREATEX;
 	io.ntcreatex.in.root_fid.fnum = 0;
 	io.ntcreatex.in.flags = 0;
@@ -282,7 +282,7 @@ static bool test_stream_io(struct torture_context *tctx,
 	sname1 = talloc_asprintf(tctx, "%s:%s", fname, "Stream One");
 	sname2 = talloc_asprintf(tctx, "%s:%s:$DaTa", fname, "Second Stream");
 
-	printf("(%s) creating a stream on a non-existant file\n", __location__);
+	printf("(%s) creating a stream on a non-existent file\n", __location__);
 	io.generic.level = RAW_OPEN_NTCREATEX;
 	io.ntcreatex.in.root_fid.fnum = 0;
 	io.ntcreatex.in.flags = 0;
@@ -509,7 +509,7 @@ static bool test_stream_delete(struct torture_context *tctx,
 
 	sname1 = talloc_asprintf(tctx, "%s:%s", fname, "Stream One");
 
-	printf("(%s) opening non-existant file stream\n", __location__);
+	printf("(%s) opening non-existent file stream\n", __location__);
 	io.generic.level = RAW_OPEN_NTCREATEX;
 	io.ntcreatex.in.root_fid.fnum = 0;
 	io.ntcreatex.in.flags = 0;
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 4ca5406..25edb5e 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -48,7 +48,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli)
 
 	torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR);
 
-	printf("Trying non-existant file\n");
+	printf("Trying non-existent file\n");
 	io.unlink.in.pattern = fname;
 	io.unlink.in.attrib = 0;
 	status = smb_raw_unlink(cli->tree, &io);
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index bf1d713..a460211 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -7950,7 +7950,7 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p,
 	r.out.rep = &repp;
 
 	ZERO_STRUCT(req);
-	req.req3.account.string = "non-existant-account-aklsdji";
+	req.req3.account.string = "non-existent-account-aklsdji";
 
 	for (i=0; passwords[i]; i++) {
 		req.req3.password.string = passwords[i];
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index e4e2636..7a4e562 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -367,7 +367,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture,
 	notify.smb2.in.file.handle = h1;
 	req = smb2_notify_send(tree1, &(notify.smb2));
 
-	status = smb2_util_unlink(tree1, BASEDIR "\\nonexistant.txt");
+	status = smb2_util_unlink(tree1, BASEDIR "\\nonexistent.txt");
 	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
 
 	/* (1st unlink) as the 2nd notify directly returns,
@@ -400,7 +400,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture,
 		"(3rd notify) this notify will only see the 1st unlink\n");
 	req = smb2_notify_send(tree1, &(notify.smb2));
 
-	status = smb2_util_unlink(tree1, BASEDIR "\\nonexistant.txt");
+	status = smb2_util_unlink(tree1, BASEDIR "\\nonexistent.txt");
 	CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
 
 	for (i=1;i<count;i++) {
diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c


-- 
Samba Shared Repository


More information about the samba-cvs mailing list