diff options
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/entryUUID.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/kludge_acl.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/partition.c | 9 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb.c | 13 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_constructed.c | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/entryUUID.c b/source4/dsdb/samdb/ldb_modules/entryUUID.c index f5de138b52..1a16cb8321 100644 --- a/source4/dsdb/samdb/ldb_modules/entryUUID.c +++ b/source4/dsdb/samdb/ldb_modules/entryUUID.c @@ -693,7 +693,7 @@ static int nsuniqueid_init(struct ldb_module *module) static int get_seq(struct ldb_context *ldb, void *context, struct ldb_reply *ares) { - unsigned long long *max_seq = context; + unsigned long long *max_seq = (unsigned long long *)context; unsigned long long seq; if (ares->type == LDB_REPLY_ENTRY) { struct ldb_message_element *el = ldb_msg_find_element(ares->message, "contextCSN"); diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c index 2d6d8a2d80..27c13ddf60 100644 --- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c +++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c @@ -60,7 +60,7 @@ struct kludge_private_data { static enum user_is what_is_user(struct ldb_module *module) { struct auth_session_info *session_info - = ldb_get_opaque(module->ldb, "sessionInfo"); + = (struct auth_session_info *)ldb_get_opaque(module->ldb, "sessionInfo"); if (!session_info) { return ANONYMOUS; } @@ -87,7 +87,7 @@ static enum user_is what_is_user(struct ldb_module *module) static const char *user_name(TALLOC_CTX *mem_ctx, struct ldb_module *module) { struct auth_session_info *session_info - = ldb_get_opaque(module->ldb, "sessionInfo"); + = (struct auth_session_info *)ldb_get_opaque(module->ldb, "sessionInfo"); if (!session_info) { return "UNKNOWN (NULL)"; } diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c index 0675f38c56..76e8578573 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.c +++ b/source4/dsdb/samdb/ldb_modules/partition.c @@ -678,8 +678,10 @@ static int partition_extended(struct ldb_module *module, struct ldb_request *req static int sort_compare(void *void1, void *void2, void *opaque) { - struct dsdb_control_current_partition **pp1 = void1; - struct dsdb_control_current_partition **pp2 = void2; + struct dsdb_control_current_partition **pp1 = + (struct dsdb_control_current_partition **)void1; + struct dsdb_control_current_partition **pp2 = + (struct dsdb_control_current_partition **)void2; struct dsdb_control_current_partition *partition1 = talloc_get_type(*pp1, struct dsdb_control_current_partition); struct dsdb_control_current_partition *partition2 = talloc_get_type(*pp2, @@ -692,7 +694,8 @@ static const char *relative_path(struct ldb_module *module, TALLOC_CTX *mem_ctx, const char *name) { - const char *base_url = ldb_get_opaque(module->ldb, "ldb_url"); + const char *base_url = + (const char *)ldb_get_opaque(module->ldb, "ldb_url"); char *path, *p, *full_name; if (name == NULL) { return NULL; diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index fdc78e3cad..31182a44d6 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -1070,7 +1070,7 @@ const struct dom_sid *samdb_domain_sid(struct ldb_context *ldb) struct dom_sid *domain_sid; /* see if we have a cached copy */ - domain_sid = ldb_get_opaque(ldb, "cache.domain_sid"); + domain_sid = (struct dom_sid *)ldb_get_opaque(ldb, "cache.domain_sid"); if (domain_sid) { return domain_sid; } @@ -1137,7 +1137,7 @@ struct ldb_dn *samdb_ntds_settings_dn(struct ldb_context *ldb) struct ldb_dn *settings_dn; /* see if we have a cached copy */ - settings_dn = ldb_get_opaque(ldb, "cache.settings_dn"); + settings_dn = (struct ldb_dn *)ldb_get_opaque(ldb, "cache.settings_dn"); if (settings_dn) { return settings_dn; } @@ -1190,7 +1190,7 @@ const struct GUID *samdb_ntds_invocation_id(struct ldb_context *ldb) struct GUID *invocation_id; /* see if we have a cached copy */ - invocation_id = ldb_get_opaque(ldb, "cache.invocation_id"); + invocation_id = (struct GUID *)ldb_get_opaque(ldb, "cache.invocation_id"); if (invocation_id) { return invocation_id; } @@ -1240,7 +1240,8 @@ bool samdb_set_ntds_invocation_id(struct ldb_context *ldb, const struct GUID *in struct GUID *invocation_id_old; /* see if we have a cached copy */ - invocation_id_old = ldb_get_opaque(ldb, "cache.invocation_id"); + invocation_id_old = (struct GUID *)ldb_get_opaque(ldb, + "cache.invocation_id"); tmp_ctx = talloc_new(ldb); if (tmp_ctx == NULL) { @@ -1283,7 +1284,7 @@ const struct GUID *samdb_ntds_objectGUID(struct ldb_context *ldb) struct GUID *ntds_guid; /* see if we have a cached copy */ - ntds_guid = ldb_get_opaque(ldb, "cache.ntds_guid"); + ntds_guid = (struct GUID *)ldb_get_opaque(ldb, "cache.ntds_guid"); if (ntds_guid) { return ntds_guid; } @@ -1333,7 +1334,7 @@ bool samdb_set_ntds_objectGUID(struct ldb_context *ldb, const struct GUID *ntds_ struct GUID *ntds_guid_old; /* see if we have a cached copy */ - ntds_guid_old = ldb_get_opaque(ldb, "cache.ntds_guid"); + ntds_guid_old = (struct GUID *)ldb_get_opaque(ldb, "cache.ntds_guid"); tmp_ctx = talloc_new(ldb); if (tmp_ctx == NULL) { diff --git a/source4/dsdb/schema/schema_constructed.c b/source4/dsdb/schema/schema_constructed.c index 3ded84c184..51343817b0 100644 --- a/source4/dsdb/schema/schema_constructed.c +++ b/source4/dsdb/schema/schema_constructed.c @@ -38,10 +38,6 @@ static char *dsdb_subSchema_list_append(char *v, const char *list_name) NULL }; - if (!attrs) { - return v; - } - v = talloc_asprintf_append(v, "%s ( ", list_name); if (!v) return NULL; |