svn commit: samba r9789 - in branches/SAMBA_4_0/source/lib:
ldb/modules samba3
jelmer at samba.org
jelmer at samba.org
Tue Aug 30 11:37:58 GMT 2005
Author: jelmer
Date: 2005-08-30 11:37:58 +0000 (Tue, 30 Aug 2005)
New Revision: 9789
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9789
Log:
Patch from Volker that fixes the build on AIX.
Modified:
branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c
branches/SAMBA_4_0/source/lib/samba3/samba3.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c 2005-08-30 11:33:12 UTC (rev 9788)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c 2005-08-30 11:37:58 UTC (rev 9789)
@@ -50,8 +50,39 @@
- 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;
const char *last_err_string;
@@ -1129,23 +1160,3 @@
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,
- }
-};
-
Modified: branches/SAMBA_4_0/source/lib/samba3/samba3.h
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/samba3.h 2005-08-30 11:33:12 UTC (rev 9788)
+++ branches/SAMBA_4_0/source/lib/samba3/samba3.h 2005-08-30 11:37:58 UTC (rev 9789)
@@ -160,7 +160,7 @@
struct {
uint8_t hash[16];
time_t mod_time;
- } hash_pw;;
+ } hash_pw;
int sec_channel_type;
} *domains;
More information about the samba-cvs
mailing list