s4:operational LDB module - fix attribute names to be right up/down-cased

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Mar  4 23:56:07 CET 2011 on sn-devel-104

2 files changed, 10 insertions, 10 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 40f962190f..dcc047f13e 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -25,11 +25,11 @@
  */
 
 /*
-  createTimestamp: HIDDEN, searchable, ldaptime, alias for whenCreated
-  modifyTimestamp: HIDDEN, searchable, ldaptime, alias for whenChanged
+  createTimeStamp: HIDDEN, searchable, ldaptime, alias for whenCreated
+  modifyTimeStamp: HIDDEN, searchable, ldaptime, alias for whenChanged
 
      for the above two, we do the search as normal, and if
-     createTimestamp or modifyTimestamp is asked for, then do
+     createTimeStamp or modifyTimeStamp is asked for, then do
      additional searches for whenCreated and whenChanged and fill in
      the resulting values
 
@@ -587,8 +587,8 @@ static const struct {
 	const char *attr;
 	const char *replace;
 } parse_tree_sub[] = {
-	{ "createTimestamp", "whenCreated" },
-	{ "modifyTimestamp", "whenChanged" }
+	{ "createTimeStamp", "whenCreated" },
+	{ "modifyTimeStamp", "whenChanged" }
 };
 
 
@@ -602,8 +602,8 @@ static const struct {
 	const char *extra_attr;
 	int (*constructor)(struct ldb_module *, struct ldb_message *, enum ldb_scope, struct ldb_request *);
 } search_sub[] = {
-	{ "createTimestamp", "whenCreated", NULL , NULL },
-	{ "modifyTimestamp", "whenChanged", NULL , NULL },
+	{ "createTimeStamp", "whenCreated", NULL , NULL },
+	{ "modifyTimeStamp", "whenChanged", NULL , NULL },
 	{ "structuralObjectClass", "objectClass", NULL , NULL },
 	{ "canonicalName", NULL, NULL , construct_canonical_name },
 	{ "primaryGroupToken", "objectClass", "objectSid", construct_primary_group_token },
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 36c6ed154b..1a9be96102 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2664,12 +2664,12 @@ nTSecurityDescriptor:: """ + desc_base64
         print "Tests operational attributes"""
 
         res = self.ldb.search(self.base_dn, scope=SCOPE_BASE,
-                              attrs=["createTimestamp", "modifyTimestamp",
+                              attrs=["createTimeStamp", "modifyTimeStamp",
                                      "structuralObjectClass", "whenCreated",
                                      "whenChanged"])
         self.assertEquals(len(res), 1)
-        self.assertTrue("createTimestamp" in res[0])
-        self.assertTrue("modifyTimestamp" in res[0])
+        self.assertTrue("createTimeStamp" in res[0])
+        self.assertTrue("modifyTimeStamp" in res[0])
         self.assertTrue("structuralObjectClass" in res[0])
         self.assertTrue("whenCreated" in res[0])
         self.assertTrue("whenChanged" in res[0])