mirror of
https://github.com/samba-team/samba.git
synced 2025-01-27 14:04:05 +03:00
r9789: Patch from Volker that fixes the build on AIX.
(This used to be commit 9a1a7fb60e6531ff74e6817313548f3cee37a990)
This commit is contained in:
parent
f9447d2a17
commit
81e130b592
@ -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,
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user