r9789: Patch from Volker that fixes the build on AIX.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 30 Aug 2005 11:37:58 +0000 (11:37 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:35:01 +0000 (13:35 -0500)
source/lib/ldb/modules/ldb_map.c
source/lib/samba3/samba3.h

index 531d5ccd6774b2c3833f13877c3b6c40a1689285..c5ddcc7e131aaba691961619e7f2bc9b92182436 100644 (file)
        - rename locally and remotely
 */
 
        - 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;
 
 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); 
 }
 
        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,
-       }
-};
-
index a41109a145e150ed9d03242b259ec603d64555dd..b8a9c68617dccb6be48fd29cbb0ace4f503689dc 100644 (file)
@@ -160,7 +160,7 @@ struct samba3_secrets
                struct {
                        uint8_t hash[16];
                        time_t mod_time;
                struct {
                        uint8_t hash[16];
                        time_t mod_time;
-               } hash_pw;;
+               } hash_pw;
                int sec_channel_type;
        } *domains;
 
                int sec_channel_type;
        } *domains;