[SCM] Samba Shared Repository - branch master updated

Wed May 15 23:50:02 MDT 2013

The branch, master has been updated
       via  7ff3cbd source4/winbind/wb_samba3_cmd.c: Fix typo in comment.
       via  b07d97d source4/dsdb/schema/schema_convert_to_ol.c: Fix typo in comment.
       via  7a06a93 source4/dsdb/samdb/ldb_modules/local_password.c: Fix typo in comment.
       via  30be420 source4/auth/kerberos/kerberos-notes.txt: Fix typo.
       via  bf26c7e source4/TODO: Fix typo.
       via  8673d0d source3/utils/ntlm_auth.c: Fix typo in debug message.
       via  dcbe45b source3/modules/vfs_catia.c: Fix typo in comment.
       via  c2ab0ad source3/libsmb/ntlmssp.c: Fix typo.
       via  948ef97 samba_tool/base.py: Fix typo.
       via  86a58b0 netcmd/group.py: Fix typo.
       via  618fd8e Wireshark/Conformance.pm: Fix typo.
       via  6175c27 pidl/TODO: Fix typo.
       via  b82d334 lib/testtools/testtools/tests/test_testresult.py: Fix typos.
       via  70aec09 lib/subunit/README: Fix typo.
       via  8961ca8 docs-xml: Fix typo in vfs_smb_traffic_analyzer.8.xml.
      from  26b6e28 gensec: Make gensec_security_oids_from_ops static

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


- Log -----------------------------------------------------------------
commit 7ff3cbdabf8be6c323e1b5e9d68e0370d32f574e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:24:42 2013 +0200

    source4/winbind/wb_samba3_cmd.c: Fix typo in comment.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May 16 07:49:24 CEST 2013 on sn-devel-104

commit b07d97d7f5ab61da1cc5d228561230705ab32052
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:23:49 2013 +0200

    source4/dsdb/schema/schema_convert_to_ol.c: Fix typo in comment.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 7a06a93fdf7544dfa013a5f20d4eb6017ea345ee
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:22:39 2013 +0200

    source4/dsdb/samdb/ldb_modules/local_password.c: Fix typo in comment.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 30be42073a636da389789ee20e1e25b8b4079e0a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:21:52 2013 +0200

    source4/auth/kerberos/kerberos-notes.txt: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit bf26c7ef402ed231e05e4ced169ff1c6b00ced00
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:20:42 2013 +0200

    source4/TODO: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8673d0d16b68bf403b18aa29f502b36c9bbc2ab1
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:19:36 2013 +0200

    source3/utils/ntlm_auth.c: Fix typo in debug message.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit dcbe45b945ce16b58173c78ac22958d51f53c890
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:18:07 2013 +0200

    source3/modules/vfs_catia.c: Fix typo in comment.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit c2ab0ad8d05cf3002b1efd200960eff9a91ec3f4
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:16:51 2013 +0200

    source3/libsmb/ntlmssp.c: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 948ef97f08dc329c75a5061f86a653d227e654c1
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:16:03 2013 +0200

    samba_tool/base.py: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 86a58b01e0cd2f05b3767789bedd27d185421d52
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:15:18 2013 +0200

    netcmd/group.py: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 618fd8e4de6c1a7847798c05bf0e82a7e5ac07e0
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:13:44 2013 +0200

    Wireshark/Conformance.pm: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 6175c277ec74f1ced5715e577201ec44bbcc467a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:12:52 2013 +0200

    pidl/TODO: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit b82d3346feb4ab8f18711b95157d0c6030ed318b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:11:10 2013 +0200

    lib/testtools/testtools/tests/test_testresult.py: Fix typos.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 70aec093a9008502934749dfabc378345b55d3ff
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:09:51 2013 +0200

    lib/subunit/README: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8961ca8c367e23e2934940c516c49a6a7dd5086b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 15 18:08:51 2013 +0200

    docs-xml: Fix typo in vfs_smb_traffic_analyzer.8.xml.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml |    2 +-
 lib/subunit/README                               |    2 +-
 lib/testtools/testtools/tests/test_testresult.py |    6 +++---
 pidl/TODO                                        |    2 +-
 pidl/lib/Parse/Pidl/Wireshark/Conformance.pm     |    2 +-
 python/samba/netcmd/group.py                     |    4 ++--
 python/samba/tests/samba_tool/base.py            |    2 +-
 source3/libsmb/ntlmssp.c                         |    2 +-
 source3/modules/vfs_catia.c                      |    2 +-
 source3/utils/ntlm_auth.c                        |    2 +-
 source4/TODO                                     |    2 +-
 source4/auth/kerberos/kerberos-notes.txt         |    2 +-
 source4/dsdb/samdb/ldb_modules/local_password.c  |    2 +-
 source4/dsdb/schema/schema_convert_to_ol.c       |    2 +-
 source4/winbind/wb_samba3_cmd.c                  |    2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
index 842856b..0daafc6 100644
--- a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
@@ -95,7 +95,7 @@
 	<listitem>
 		<para>
 			<command>Problematic parsing - </command>
-			Protocol version 1 uses hyphen and comma to seperate blocks of data. Once there is a
+			Protocol version 1 uses hyphen and comma to separate blocks of data. Once there is a
 			filename with a hyphen, you will run into problems because the receiver decodes the
 			data in a wrong way.
 		</para>
diff --git a/lib/subunit/README b/lib/subunit/README
index 103a32c..47a9734 100644
--- a/lib/subunit/README
+++ b/lib/subunit/README
@@ -35,7 +35,7 @@ A number of useful things can be done easily with subunit:
    can be shown as a seamless whole.
  * Test archiving: A test run may be recorded and replayed later.
  * Test isolation: Tests that may crash or otherwise interact badly with each
-   other can be run seperately and then aggregated, rather than interfering
+   other can be run separately and then aggregated, rather than interfering
    with each other.
  * Grid testing: subunit can act as the necessary serialisation and
    deserialiation to get test runs on distributed machines to be reported in
diff --git a/lib/testtools/testtools/tests/test_testresult.py b/lib/testtools/testtools/tests/test_testresult.py
index c935b14..68fcc38 100644
--- a/lib/testtools/testtools/tests/test_testresult.py
+++ b/lib/testtools/testtools/tests/test_testresult.py
@@ -1558,13 +1558,13 @@ class TestNonAsciiResults(TestCase):
 
     def _test_external_case(self, testline, coding="ascii", modulelevel="",
             suffix=""):
-        """Create and run a test case in a seperate module"""
+        """Create and run a test case in a separate module"""
         self._setup_external_case(testline, coding, modulelevel, suffix)
         return self._run_external_case()
 
     def _setup_external_case(self, testline, coding="ascii", modulelevel="",
             suffix=""):
-        """Create a test case in a seperate module"""
+        """Create a test case in a separate module"""
         _, prefix, self.modname = self.id().rsplit(".", 2)
         self.dir = tempfile.mkdtemp(prefix=prefix, suffix=suffix)
         self.addCleanup(shutil.rmtree, self.dir)
@@ -1580,7 +1580,7 @@ class TestNonAsciiResults(TestCase):
             "        %s\n" % (coding, modulelevel, testline))
 
     def _run_external_case(self):
-        """Run the prepared test case in a seperate module"""
+        """Run the prepared test case in a separate module"""
         sys.path.insert(0, self.dir)
         self.addCleanup(sys.path.remove, self.dir)
         module = __import__(self.modname)
diff --git a/pidl/TODO b/pidl/TODO
index 87ae0c5..36ae5e9 100644
--- a/pidl/TODO
+++ b/pidl/TODO
@@ -14,7 +14,7 @@
 
 - --explain-ndr option that dumps out parse tree ?
 
-- seperate tables for NDR and DCE/RPC
+- separate tables for NDR and DCE/RPC
  - maybe no tables for NDR at all? we only need them for ndrdump 
    and that can use dlsym()
 
diff --git a/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm b/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
index 1dec647..fbdaa9a 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
@@ -21,7 +21,7 @@ files.
 
 Conformance files are simple text files with a single command on each line.
 Empty lines and lines starting with a '#' character are ignored.
-Arguments to commands are seperated by spaces.
+Arguments to commands are separated by spaces.
 
 The following commands are currently supported:
 
diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 4004a7d..1a24e5f 100644
--- a/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
@@ -173,7 +173,7 @@ Example2 deletes group Group2 from the local server.  The command is run under r
 class cmd_group_add_members(Command):
     """Add members to an AD group.
 
-This command adds one or more members to an existing Active Directory group.  The command accepts one or more group member names seperated by commas.  A group member may be a user or computer account or another Active Directory group.
+This command adds one or more members to an existing Active Directory group. The command accepts one or more group member names separated by commas.  A group member may be a user or computer account or another Active Directory group.
 
 When a member is added to a group the member may inherit permissions and rights from the group.  Likewise, when permission or rights of a group are changed, the changes may reflect in the members through inheritance.
 
@@ -225,7 +225,7 @@ Example2 shows how to add a single user account, User2, to the supergroup AD gro
 class cmd_group_remove_members(Command):
     """Remove members from an AD group.
 
-This command removes one or more members from an existing Active Directory group.  The command accepts one or more group member names seperated by commas.  A group member may be a user or computer account or another Active Directory group that is a member of the group specified on the command.
+This command removes one or more members from an existing Active Directory group.  The command accepts one or more group member names separated by commas.  A group member may be a user or computer account or another Active Directory group that is a member of the group specified on the command.
 
 When a member is removed from a group, inherited permissions and rights will no longer apply to the member.
 
diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index 60ccaa5..c931af7 100644
--- a/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
@@ -72,7 +72,7 @@ class SambaToolCmdTest(samba.tests.TestCaseInTempDir):
 
     def runsubcmd(self, name, sub, *args):
         """run a command with sub commands"""
-        # The reason we need this function seperate from runcmd is
+        # The reason we need this function separate from runcmd is
         # that the .outf StringIO assignment is overriden if we use
         # runcmd, so we can't capture stdout and stderr
         cmd = cmd_sambatool.subcommands[name].subcommands[sub]
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index fb41c3c..3fe1515 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -146,7 +146,7 @@ NTSTATUS ntlmssp_set_domain(struct ntlmssp_state *ntlmssp_state, const char *dom
  * Request features for the NTLMSSP negotiation
  *
  * @param ntlmssp_state NTLMSSP state
- * @param feature_list List of space seperated features requested from NTLMSSP.
+ * @param feature_list List of space separated features requested from NTLMSSP.
  */
 void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *feature_list)
 {
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 3d710bd..73b45b3 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -155,7 +155,7 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings)
 	 * catia mappings are of the form :
 	 * UNIX char (in 0xnn hex) : WINDOWS char (in 0xnn hex)
 	 *
-	 * multiple mappings are comma seperated in smb.conf
+	 * multiple mappings are comma separated in smb.conf
 	 */
 	for (i=0;mappings[i];i++) {
 		fstrcpy(mapping, mappings[i]);
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 6b45354..62cba62 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -388,7 +388,7 @@ static bool get_require_membership_sid(void) {
 	if (!parse_ntlm_auth_domain_user(require_membership_of, 
 					 request.data.name.dom_name, 
 					 request.data.name.name)) {
-		DEBUG(0, ("Could not parse %s into seperate domain/name parts!\n", 
+		DEBUG(0, ("Could not parse %s into separate domain/name parts!\n",
 			  require_membership_of));
 		return False;
 	}
diff --git a/source4/TODO b/source4/TODO
index f8bc7b2..e621e27 100644
--- a/source4/TODO
+++ b/source4/TODO
@@ -2,7 +2,7 @@ lib/registry/TODO
 ../lib/tdr/TODO
 ../pidl/TODO
 
-- seperate adminlog mechanism (as opposed to the current DEBUG log,
+- separate adminlog mechanism (as opposed to the current DEBUG log,
   which is not really aimed at administrators but more at developers)
   Perhaps similar to eventlog so we can also use eventlog to retrieve the data?
 
diff --git a/source4/auth/kerberos/kerberos-notes.txt b/source4/auth/kerberos/kerberos-notes.txt
index f15f3f9..d7c65c6 100644
--- a/source4/auth/kerberos/kerberos-notes.txt
+++ b/source4/auth/kerberos/kerberos-notes.txt
@@ -159,7 +159,7 @@ some GSSAPI tokens' checksums.  During initial work to implement an AD client,
 it was easier to make an acceptable solution (to Windows servers) than to 
 correctly implement the GSSAPI specification, particularly on top of the 
 (inflexible) MIT Kerberos API.  It did not seem possible to write a correct, 
-seperate GSSAPI implementation on top of MIT Kerberos's public krb5lib API, 
+separate GSSAPI implementation on top of MIT Kerberos's public krb5lib API,
 and at the time, the effort did not need to extend beyond what Windows would 
 require.  
 
diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c b/source4/dsdb/samdb/ldb_modules/local_password.c
index c0e1e9a..4adf180 100644
--- a/source4/dsdb/samdb/ldb_modules/local_password.c
+++ b/source4/dsdb/samdb/ldb_modules/local_password.c
@@ -43,7 +43,7 @@
    server.
 
    This allows the password database to be synchronised in a multi-master
-   fashion, seperate to the more difficult concerns of the main
+   fashion, separate to the more difficult concerns of the main
    database. (With passwords, the last writer always wins)
 
    Each incoming add/modify is split into a remote, and a local request, done
diff --git a/source4/dsdb/schema/schema_convert_to_ol.c b/source4/dsdb/schema/schema_convert_to_ol.c
index 0e42f20..71a417e 100644
--- a/source4/dsdb/schema/schema_convert_to_ol.c
+++ b/source4/dsdb/schema/schema_convert_to_ol.c
@@ -209,7 +209,7 @@ char *dsdb_convert_schema_to_openldap(struct ldb_context *ldb, char *target_str,
 		return NULL;
 	}
 
-	/* The mappings are line-seperated, and specify details such as OIDs to skip etc */
+	/* The mappings are line-separated, and specify details such as OIDs to skip etc */
 	while (1) {
 		line = next_line;
 		next_line = strchr(line, '\n');
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index cb323dd..091e93e 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -625,7 +625,7 @@ NTSTATUS wbsrv_samba3_pam_logoff(struct wbsrv_samba3_call *s3call)
 
   The return value (in the async reply) may include the 'info3'
   (effectivly most things you would want to know about the user), or
-  the NT and LM session keys seperated.
+  the NT and LM session keys separated.
 */
 
 static void pam_auth_crap_recv(struct composite_context *ctx);


-- 
Samba Shared Repository
