[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Wed Oct 21 07:47:02 MDT 2009


The branch, master has been updated
       via  95ce7df... S4: ldb_map modules uses defines that are reserved
       via  6e5dad4... S4: Building on a system with libintl
      from  0944931... lib/tdb: make tdbtool use tdb_check() for "check" command

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


- Log -----------------------------------------------------------------
commit 95ce7dff20d5629eff16cc6f7527c542987d8eb0
Author: Torgeir Lerkerød <torgeir.lerkerod at gmail.com>
Date:   Tue Oct 20 18:33:25 2009 +0200

    S4: ldb_map modules uses defines that are reserved
    
    On OpenSolaris MAP_RENAME and friends are defined in <sys/mman.h> e.g. mmap and friends. So on these systems MAP_* have a meaning. Cleaned up LDB name space by adding LDB_ in front of MAP_* e.g. MAP_RENAME => LDB_MAP_RENAME
    
    Signed-off-by: Torgeir Lerkerød <torgeir.lerkerod at gmail.com>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 6e5dad49d9cfc8e8a3fc6c1e60733d6e25865ef7
Author: Torgeir Lerkerød <torgeir.lerkerod at gmail.com>
Date:   Tue Oct 20 18:25:53 2009 +0200

    S4: Building on a system with libintl
    
    Heimdal's internal buildsystem uses a different define for checking for libintl than what samba uses. LIBINTL vs HAVE_LIBINTL_H. Since changing heimdals defineswould brake dropin merges of heimdal. This is a simple workaround in line with others in heimdal_build catalog.
    
    Signed-off-by: Torgeir Lerkerød <torgeir.lerkerod at gmail.com>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/samba3sam.c       |  168 +++++++++++-----------
 source4/dsdb/samdb/ldb_modules/simple_ldap_map.c |   66 +++++-----
 source4/heimdal_build/config.h                   |    5 +
 source4/lib/ldb/ldb_map/ldb_map.c                |   58 ++++----
 source4/lib/ldb/ldb_map/ldb_map.h                |   10 +-
 source4/lib/ldb/ldb_map/ldb_map_inbound.c        |   10 +-
 source4/lib/ldb/ldb_map/ldb_map_outbound.c       |   38 +++---
 7 files changed, 180 insertions(+), 175 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index f5ddff9..61013d1 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -308,7 +308,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaNextRid -> nextRid */
 	{
 		.local_name = "nextRid",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaNextRid",
@@ -319,7 +319,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaBadPasswordTime -> badPasswordtime*/
 	{
 		.local_name = "badPasswordTime",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaBadPasswordTime",
@@ -330,7 +330,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaLMPassword -> lmPwdHash*/
 	{
 		.local_name = "dBCSPwd",
-		.type = MAP_CONVERT,
+		.type = LDB_MAP_CONVERT,
 		.u = {
 			.convert = {
 				.remote_name = "sambaLMPassword",
@@ -343,7 +343,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaGroupType -> groupType */
 	{
 		.local_name = "groupType",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaGroupType",
@@ -354,7 +354,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaNTPassword -> ntPwdHash*/
 	{
 		.local_name = "ntpwdhash",
-		.type = MAP_CONVERT,
+		.type = LDB_MAP_CONVERT,
 		.u = {
 			.convert = {
 				.remote_name = "sambaNTPassword",
@@ -367,7 +367,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaPrimaryGroupSID -> primaryGroupID */
 	{
 		.local_name = "primaryGroupID",
-		.type = MAP_GENERATE,
+		.type = LDB_MAP_GENERATE,
 		.u = {
 			.generate = {
 				.remote_names = { "sambaPrimaryGroupSID", NULL },
@@ -380,7 +380,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaBadPasswordCount -> badPwdCount */
 	{
 		.local_name = "badPwdCount",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaBadPasswordCount",
@@ -391,7 +391,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaLogonTime -> lastLogon*/
 	{
 		.local_name = "lastLogon",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaLogonTime",
@@ -402,7 +402,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaLogoffTime -> lastLogoff*/
 	{
 		.local_name = "lastLogoff",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaLogoffTime",
@@ -413,7 +413,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* uid -> unixName */
 	{
 		.local_name = "unixName",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "uid",
@@ -424,7 +424,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* displayName -> name */
 	{
 		.local_name = "name",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "displayName",
@@ -435,13 +435,13 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* cn */
 	{
 		.local_name = "cn",
-		.type = MAP_KEEP,
+		.type = LDB_MAP_KEEP,
 	},
 
 	/* sAMAccountName -> cn */
 	{
 		.local_name = "sAMAccountName",
-		.type = MAP_CONVERT,
+		.type = LDB_MAP_CONVERT,
 		.u = {
 			.convert = {
 				.remote_name = "uid",
@@ -453,117 +453,117 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* objectCategory */
 	{
 		.local_name = "objectCategory",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* objectGUID */
 	{
 		.local_name = "objectGUID",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* objectVersion */
 	{
 		.local_name = "objectVersion",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* codePage */
 	{
 		.local_name = "codePage",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* dNSHostName */
 	{
 		.local_name = "dNSHostName",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 
 	/* dnsDomain */
 	{
 		.local_name = "dnsDomain",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* dnsRoot */
 	{
 		.local_name = "dnsRoot",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* countryCode */
 	{
 		.local_name = "countryCode",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* nTMixedDomain */
 	{
 		.local_name = "nTMixedDomain",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* operatingSystem */
 	{
 		.local_name = "operatingSystem",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* operatingSystemVersion */
 	{
 		.local_name = "operatingSystemVersion",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 
 	/* servicePrincipalName */
 	{
 		.local_name = "servicePrincipalName",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* msDS-Behavior-Version */
 	{
 		.local_name = "msDS-Behavior-Version",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* msDS-KeyVersionNumber */
 	{
 		.local_name = "msDS-KeyVersionNumber",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* msDs-masteredBy */
 	{
 		.local_name = "msDs-masteredBy",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* ou */
 	{
 		.local_name = "ou",
-		.type = MAP_KEEP,
+		.type = LDB_MAP_KEEP,
 	},
 
 	/* dc */
 	{
 		.local_name = "dc",
-		.type = MAP_KEEP,
+		.type = LDB_MAP_KEEP,
 	},
 
 	/* description */
 	{
 		.local_name = "description",
-		.type = MAP_KEEP,
+		.type = LDB_MAP_KEEP,
 	},
 
 	/* sambaSID -> objectSid*/
 	{
 		.local_name = "objectSid",
-		.type = MAP_CONVERT,
+		.type = LDB_MAP_CONVERT,
 		.u = {
 			.convert = {
 				.remote_name = "sambaSID",
@@ -576,7 +576,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* sambaPwdLastSet -> pwdLastSet */
 	{
 		.local_name = "pwdLastSet",
-		.type = MAP_RENAME,
+		.type = LDB_MAP_RENAME,
 		.u = {
 			.rename = {
 				.remote_name = "sambaPwdLastSet",
@@ -587,295 +587,295 @@ const struct ldb_map_attribute samba3_attributes[] =
 	/* accountExpires */
 	{
 		.local_name = "accountExpires",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* adminCount */
 	{
 		.local_name = "adminCount",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* canonicalName */
 	{
 		.local_name = "canonicalName",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* createTimestamp */
 	{
 		.local_name = "createTimestamp",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* creationTime */
 	{
 		.local_name = "creationTime",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* dMDLocation */
 	{
 		.local_name = "dMDLocation",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* fSMORoleOwner */
 	{
 		.local_name = "fSMORoleOwner",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* forceLogoff */
 	{
 		.local_name = "forceLogoff",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* instanceType */
 	{
 		.local_name = "instanceType",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* invocationId */
 	{
 		.local_name = "invocationId",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* isCriticalSystemObject */
 	{
 		.local_name = "isCriticalSystemObject",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* localPolicyFlags */
 	{
 		.local_name = "localPolicyFlags",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* lockOutObservationWindow */
 	{
 		.local_name = "lockOutObservationWindow",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* lockoutDuration */
 	{
 		.local_name = "lockoutDuration",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* lockoutThreshold */
 	{
 		.local_name = "lockoutThreshold",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* logonCount */
 	{
 		.local_name = "logonCount",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* masteredBy */
 	{
 		.local_name = "masteredBy",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* maxPwdAge */
 	{
 		.local_name = "maxPwdAge",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* member */
 	{
 		.local_name = "member",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* memberOf */
 	{
 		.local_name = "memberOf",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* minPwdAge */
 	{
 		.local_name = "minPwdAge",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* minPwdLength */
 	{
 		.local_name = "minPwdLength",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* modifiedCount */
 	{
 		.local_name = "modifiedCount",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* modifiedCountAtLastProm */
 	{
 		.local_name = "modifiedCountAtLastProm",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* modifyTimestamp */
 	{
 		.local_name = "modifyTimestamp",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* nCName */
 	{
 		.local_name = "nCName",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* nETBIOSName */
 	{
 		.local_name = "nETBIOSName",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* oEMInformation */
 	{
 		.local_name = "oEMInformation",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* privilege */
 	{
 		.local_name = "privilege",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* pwdHistoryLength */
 	{
 		.local_name = "pwdHistoryLength",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* pwdProperties */
 	{
 		.local_name = "pwdProperties",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* rIDAvailablePool */
 	{
 		.local_name = "rIDAvailablePool",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* revision */
 	{
 		.local_name = "revision",
-		.type = MAP_IGNORE,
+		.type = LDB_MAP_IGNORE,
 	},
 
 	/* ridManagerReference */
 	{
 		.local_name = "ridManagerReference",


-- 
Samba Shared Repository


More information about the samba-cvs mailing list