[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  74fad25... s4:ldb_msg_element_compare - fix typo in comment
       via  6ad27cd... s4:lib/ldb/pyldb_util.c - add a cast to quiet a warning
      from  e799de2... SMB2: Fix rename on Windows 7.

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


- Log -----------------------------------------------------------------
commit 74fad2568db8e218cb142703078034ec138943fd
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Wed Jun 2 09:30:54 2010 +0200

    s4:ldb_msg_element_compare - fix typo in comment

commit 6ad27cd7fe3e5f014821953c67ab93dbfed38a60
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Jun 1 19:59:56 2010 +0200

    s4:lib/ldb/pyldb_util.c - add a cast to quiet a warning
    
    Jelmer, please fix if it isn't correct.

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

Summary of changes:
 source4/lib/ldb/common/ldb_msg.c |    2 +-
 source4/lib/ldb/pyldb_util.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c
index 2cfc449..59bd320 100644
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/source4/lib/ldb/common/ldb_msg.c
@@ -299,7 +299,7 @@ int ldb_msg_add_fmt(struct ldb_message *msg,
 
 /*
   compare two ldb_message_element structures
-  assumes case senistive comparison
+  assumes case sensitive comparison
 */
 int ldb_msg_element_compare(struct ldb_message_element *el1, 
 			    struct ldb_message_element *el2)
diff --git a/source4/lib/ldb/pyldb_util.c b/source4/lib/ldb/pyldb_util.c
index fb06946..41bcb55 100644
--- a/source4/lib/ldb/pyldb_util.c
+++ b/source4/lib/ldb/pyldb_util.c
@@ -71,7 +71,7 @@ bool PyObject_AsDn(TALLOC_CTX *mem_ctx, PyObject *object,
 	if (PyLdb_Dn_Type == NULL)
 		return false;
 
-	if (PyObject_TypeCheck(object, PyLdb_Dn_Type)) {
+	if (PyObject_TypeCheck(object, (PyTypeObject *) PyLdb_Dn_Type)) {
 		*dn = PyLdbDn_AsDn(object);
 		return true;
 	}


-- 
Samba Shared Repository