[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1397-g03e84a2
Matthias Dieter Wallnöfer
mdw at samba.org
Sun Sep 6 04:36:29 MDT 2009
The branch, master has been updated
via 03e84a22a85754958de931bda9806eef4c02ae61 (commit)
from 65541baf4b82b89a139744244f27a8c9d0b37701 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 03e84a22a85754958de931bda9806eef4c02ae61
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Wed Aug 26 00:12:44 2009 +0200
s4:simple_ldap_map - Enhance it for supporting "primaryGroupID" in the right way
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/simple_ldap_map.c | 39 ++++++++++++++--------
1 files changed, 25 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 21b80dc..b6a0ee0 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -450,8 +450,8 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "nsuniqueid",
.convert_local = guid_ns_string,
.convert_remote = encode_ns_guid,
- },
- },
+ }
+ }
},
/* objectSid */
{
@@ -462,8 +462,8 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "objectSid",
.convert_local = sid_always_binary,
.convert_remote = val_copy,
- },
- },
+ }
+ }
},
{
.local_name = "whenCreated",
@@ -491,8 +491,8 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "objectCategory",
.convert_local = objectCategory_always_dn,
.convert_remote = val_copy,
- },
- },
+ }
+ }
},
{
.local_name = "distinguishedName",
@@ -504,6 +504,17 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
}
},
{
+ .local_name = "primaryGroupID",
+ .type = MAP_CONVERT,
+ .u = {
+ .convert = {
+ .remote_name = "primaryGroupID",
+ .convert_local = normalise_to_signed32,
+ .convert_remote = val_copy,
+ }
+ }
+ },
+ {
.local_name = "groupType",
.type = MAP_CONVERT,
.u = {
@@ -511,7 +522,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "groupType",
.convert_local = normalise_to_signed32,
.convert_remote = val_copy,
- },
+ }
}
},
{
@@ -522,7 +533,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "userAccountControl",
.convert_local = normalise_to_signed32,
.convert_remote = val_copy,
- },
+ }
}
},
{
@@ -533,7 +544,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "sAMAccountType",
.convert_local = normalise_to_signed32,
.convert_remote = val_copy,
- },
+ }
}
},
{
@@ -544,7 +555,7 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "systemFlags",
.convert_local = normalise_to_signed32,
.convert_remote = val_copy,
- },
+ }
}
},
{
@@ -555,8 +566,8 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "modifyTimestamp",
.convert_local = usn_to_timestamp,
.convert_remote = timestamp_to_usn,
- },
- },
+ }
+ }
},
{
.local_name = "usnCreated",
@@ -566,8 +577,8 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
.remote_name = "createTimestamp",
.convert_local = usn_to_timestamp,
.convert_remote = timestamp_to_usn,
- },
- },
+ }
+ }
},
{
.local_name = "*",
--
Samba Shared Repository
More information about the samba-cvs
mailing list