sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

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

Browse Source 
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Mar  4 23:56:07 CET 2011 on sn-devel-104
This commit is contained in:
Matthias Dieter Wallnöfer 2011-03-04 23:02:29 +01:00
parent 5a722f187f
commit eade61ae03
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/dsdb/samdb/ldb_modules/operational.c
View File

@ -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 },

6
source4/dsdb/tests/python/ldap.py
View File

@ -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])