[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Wed Dec 22 05:06:03 MST 2010
The branch, master has been updated
via 6857bbc dsdb:ldap.py - transform a test call into the new "msg.add" syntax
via 07bcf61 lib/util/time.c - make the "strftime" output locale independant ("%c" is not)
via 4ef842c ldb:pyldb.c - remove unused variable
from 935b985 s4-tests: Tests for Validated-SPN implementation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6857bbc8997b2afb89a83f072c090129533b17c8
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Dec 22 11:57:31 2010 +0100
dsdb:ldap.py - transform a test call into the new "msg.add" syntax
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Wed Dec 22 13:05:53 CET 2010 on sn-devel-104
commit 07bcf6197d9fbdc038513ae3db7f83a9bb8a6cd9
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Dec 22 09:53:27 2010 +0100
lib/util/time.c - make the "strftime" output locale independant ("%c" is not)
So that it also works on Solaris.
commit 4ef842c0d29e09d5876d11eee885b45a11f8c08d
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Dec 22 09:56:01 2010 +0100
ldb:pyldb.c - remove unused variable
-----------------------------------------------------------------------
Summary of changes:
lib/util/time.c | 9 ++++-----
source4/dsdb/tests/python/ldap.py | 13 +++++--------
source4/lib/ldb/pyldb.c | 2 +-
3 files changed, 10 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/time.c b/lib/util/time.c
index 7c1532a..770ebc4 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -384,11 +384,10 @@ _PUBLIC_ char *timestring(TALLOC_CTX *mem_ctx, time_t t)
}
#ifdef HAVE_STRFTIME
- /* some versions of gcc complain about using %c. This is a bug
- in the gcc warning, not a bug in this code. See a recent
- strftime() manual page for details.
- */
- strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
+ /* Some versions of gcc complain about using some special format
+ * specifiers. This is a bug in gcc, not a bug in this code. See a
+ * recent strftime() manual page for details. */
+ strftime(tempTime,sizeof(tempTime)-1,"%a %b %e %X %Y %Z",tm);
TimeBuf = talloc_strdup(mem_ctx, tempTime);
#else
TimeBuf = talloc_strdup(mem_ctx, asctime(tm));
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 810289e..6972ce3 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -276,14 +276,11 @@ class BasicTests(unittest.TestCase):
self.assertEquals(num, ERR_OBJECT_CLASS_VIOLATION)
# More than one change operation is allowed
- ldb.modify_ldif("""
-dn: cn=ldaptestuser,cn=users, """ + self.base_dn + """
-changetype: modify
-delete: objectClass
-objectClass: bootableDevice
-add: objectClass
-objectClass: bootableDevice
-""")
+ m = Message()
+ m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
+ m.add(MessageElement("bootableDevice", FLAG_MOD_DELETE, "objectClass"))
+ m.add(MessageElement("bootableDevice", FLAG_MOD_ADD, "objectClass"))
+ ldb.modify(m)
# We cannot remove all object classes by an empty replace
m = Message()
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 57e932f..d67d53f 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -2142,7 +2142,7 @@ static PyObject *py_ldb_msg_add(PyLdbMessageObject *self, PyObject *args)
{
struct ldb_message *msg = PyLdbMessage_AsMessage(self);
PyObject *py_element;
- int flags, ret;
+ int ret;
struct ldb_message_element *el;
if (!PyArg_ParseTuple(args, "O!", &PyLdbMessageElement, &py_element))
--
Samba Shared Repository
More information about the samba-cvs
mailing list