summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-30 11:37:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:35:01 -0500
commit81e130b592d128a1dc1e9f2abf91b1e376512b88 (patch)
treec67c9ef95b82ec05c29200ff74a64b70260b9e39
parentf9447d2a17089178d311e03e398c25c749450f6d (diff)
downloadsamba-81e130b592d128a1dc1e9f2abf91b1e376512b88.tar.gz
samba-81e130b592d128a1dc1e9f2abf91b1e376512b88.tar.bz2
samba-81e130b592d128a1dc1e9f2abf91b1e376512b88.zip
r9789: Patch from Volker that fixes the build on AIX.
(This used to be commit 9a1a7fb60e6531ff74e6817313548f3cee37a990)
-rw-r--r--source4/lib/ldb/modules/ldb_map.c53
-rw-r--r--source4/lib/samba3/samba3.h2
2 files changed, 33 insertions, 22 deletions
diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index 531d5ccd67..c5ddcc7e13 100644
--- a/source4/lib/ldb/modules/ldb_map.c
+++ b/source4/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/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h
index a41109a145..b8a9c68617 100644
--- a/source4/lib/samba3/samba3.h
+++ b/source4/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;