From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 11:37:58 +0000 (+0000)
Subject: r9789: Patch from Volker that fixes the build on AIX.
X-Git-Tag: samba-misc-tags/initial-v4-0-unstable~7413
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=9a1a7fb60e6531ff74e6817313548f3cee37a990;hp=eb9d615bcd49328131613f64745760a90553b7f2

r9789: Patch from Volker that fixes the build on AIX.
---

diff --git a/source/lib/ldb/modules/ldb_map.c b/source/lib/ldb/modules/ldb_map.c
index 531d5ccd677..c5ddcc7e131 100644
--- a/source/lib/ldb/modules/ldb_map.c
+++ b/source/lib/ldb/modules/ldb_map.c
@@ -50,7 +50,38 @@
  	- rename locally and remotely
 */
 
-static const struct ldb_map_attribute builtin_attribute_maps[];
+static struct ldb_val map_convert_local_dn(struct ldb_map_context *map,
+					   TALLOC_CTX *ctx,
+					   const struct ldb_val *val);
+static struct ldb_val map_convert_remote_dn(struct ldb_map_context *map,
+					    TALLOC_CTX *ctx,
+					    const struct ldb_val *val);
+static struct ldb_val map_convert_local_objectclass(struct ldb_map_context *map,
+						    TALLOC_CTX *ctx,
+						    const struct ldb_val *val);
+static struct ldb_val map_convert_remote_objectclass(struct ldb_map_context *map,
+						     TALLOC_CTX *ctx,
+						     const struct ldb_val *val);
+
+static const struct ldb_map_attribute builtin_attribute_maps[] = {
+	{
+		.local_name = "dn",
+		.type = MAP_CONVERT,
+		.u.convert.remote_name = "dn",
+		.u.convert.convert_local = map_convert_local_dn,
+		.u.convert.convert_remote = map_convert_remote_dn,
+	},
+	{
+		.local_name = "objectclass",
+		.type = MAP_CONVERT,
+		.u.convert.remote_name = "objectclass",
+		.u.convert.convert_local = map_convert_local_objectclass,
+		.u.convert.convert_remote = map_convert_remote_objectclass,
+	},
+	{
+		.local_name = NULL,
+	}
+};
 
 struct map_private {
 	struct ldb_map_context context;
@@ -1129,23 +1160,3 @@ static struct ldb_val map_convert_remote_objectclass(struct ldb_map_context *map
 	return ldb_val_dup(ctx, val); 
 }
 
-static const struct ldb_map_attribute builtin_attribute_maps[] = {
-	{
-		.local_name = "dn",
-		.type = MAP_CONVERT,
-		.u.convert.remote_name = "dn",
-		.u.convert.convert_local = map_convert_local_dn,
-		.u.convert.convert_remote = map_convert_remote_dn,
-	},
-	{
-		.local_name = "objectclass",
-		.type = MAP_CONVERT,
-		.u.convert.remote_name = "objectclass",
-		.u.convert.convert_local = map_convert_local_objectclass,
-		.u.convert.convert_remote = map_convert_remote_objectclass,
-	},
-	{
-		.local_name = NULL,
-	}
-};
-
diff --git a/source/lib/samba3/samba3.h b/source/lib/samba3/samba3.h
index a41109a145e..b8a9c68617d 100644
--- a/source/lib/samba3/samba3.h
+++ b/source/lib/samba3/samba3.h
@@ -160,7 +160,7 @@ struct samba3_secrets
 		struct {
 			uint8_t hash[16];
 			time_t mod_time;
-		} hash_pw;;
+		} hash_pw;
 		int sec_channel_type;
 	} *domains;