diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-20 00:02:15 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:52:06 +0100 |
| commit | 0500b87092540d300b4e021a0fb95ce16a44fbd2 (patch) | |
| tree | d8ff9774916e84dbc568f77edd4925b1f6b51735 /source4/lib/ldb | |
| parent | 3e75f222bcdf114238cc4f2bcc61332dc059135f (diff) | |
| download | samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.gz samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.tar.bz2 samba-0500b87092540d300b4e021a0fb95ce16a44fbd2.zip | |
r26540: Revert my previous commit after concerns raised by Andrew.
(This used to be commit 6ac86f8be7d9a8c5ab396a93e6d1e6819e11f173)
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/ldb_map.c | 6 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/paged_searches.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index ab4abe6701..87f791cb38 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -162,7 +162,7 @@ void ldb_set_default_dns(struct ldb_context *ldb) int ret; struct ldb_result *res; struct ldb_dn *tmp_dn=NULL; - const char *attrs[] = { + static const char *attrs[] = { "rootDomainNamingContext", "configurationNamingContext", "schemaNamingContext", diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c index 87f5f25392..39df427c2c 100644 --- a/source4/lib/ldb/ldb_map/ldb_map.c +++ b/source4/lib/ldb/ldb_map/ldb_map.c @@ -867,7 +867,7 @@ static int map_objectclass_convert_operator(struct ldb_module *module, void *mem struct ldb_parse_tree **new, const struct ldb_parse_tree *tree) { - const struct ldb_map_attribute objectclass_map = { + static const struct ldb_map_attribute objectclass_map = { .local_name = "objectClass", .type = MAP_CONVERT, .u = { @@ -956,7 +956,7 @@ struct ldb_request *map_search_self_req(struct map_context *ac, struct ldb_dn *d /* attrs[] is returned from this function in * ac->search_req->op.search.attrs, so it must be static, as * otherwise the compiler can put it on the stack */ - const char * const attrs[] = { IS_MAPPED, NULL }; + static const char * const attrs[] = { IS_MAPPED, NULL }; struct ldb_parse_tree *tree; /* Limit search to records with 'IS_MAPPED' present */ @@ -1242,7 +1242,7 @@ static const struct ldb_map_attribute builtin_attribute_maps[] = { * base DNs in private data. */ static int map_init_dns(struct ldb_module *module, struct ldb_map_context *data, const char *name) { - const char * const attrs[] = { MAP_DN_FROM, MAP_DN_TO, NULL }; + static const char * const attrs[] = { MAP_DN_FROM, MAP_DN_TO, NULL }; struct ldb_dn *dn; struct ldb_message *msg; struct ldb_result *res; diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c index 69ce219362..749858b49b 100644 --- a/source4/lib/ldb/modules/paged_searches.c +++ b/source4/lib/ldb/modules/paged_searches.c @@ -407,7 +407,7 @@ static int check_supported_paged(struct ldb_context *ldb, void *context, static int ps_init(struct ldb_module *module) { - const char *attrs[] = { "supportedControl", NULL }; + static const char *attrs[] = { "supportedControl", NULL }; struct private_data *data; int ret; struct ldb_request *req; |