diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-06 11:06:27 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-06 11:28:58 +0100 |
| commit | 93d85ca5fd57d87e720ab627865f0e5af25e07b5 (patch) | |
| tree | d0591aad81be76086989cf26727aaf59bb2ebef5 /source4/lib/ldb | |
| parent | 5845cc94a99bcb2115c6edbd1711444e640c40d4 (diff) | |
| download | samba-93d85ca5fd57d87e720ab627865f0e5af25e07b5.tar.gz samba-93d85ca5fd57d87e720ab627865f0e5af25e07b5.tar.bz2 samba-93d85ca5fd57d87e720ab627865f0e5af25e07b5.zip | |
s4:fix some shadowed declaration warnings on Solaris by renaming the symbols
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/common/ldb_dn.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c index 9bf8658462..1b714c9427 100644 --- a/source4/lib/ldb/common/ldb_dn.c +++ b/source4/lib/ldb/common/ldb_dn.c @@ -887,11 +887,11 @@ char *ldb_dn_get_extended_linearized(TALLOC_CTX *mem_ctx, struct ldb_dn *dn, int /* filter out all but an acceptable list of extended DN components */ -void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept) +void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept_list) { unsigned int i; for (i=0; i<dn->ext_comp_num; i++) { - if (!ldb_attr_in_list(accept, dn->ext_components[i].name)) { + if (!ldb_attr_in_list(accept_list, dn->ext_components[i].name)) { memmove(&dn->ext_components[i], &dn->ext_components[i+1], (dn->ext_comp_num-(i+1))*sizeof(dn->ext_components[0])); diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 1deed84550..0c3196a286 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -1692,7 +1692,7 @@ char *ldb_dn_alloc_linearized(TALLOC_CTX *mem_ctx, struct ldb_dn *dn); char *ldb_dn_get_extended_linearized(TALLOC_CTX *mem_ctx, struct ldb_dn *dn, int mode); const struct ldb_val *ldb_dn_get_extended_component(struct ldb_dn *dn, const char *name); int ldb_dn_set_extended_component(struct ldb_dn *dn, const char *name, const struct ldb_val *val); -void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept); +void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept_list); void ldb_dn_remove_extended_components(struct ldb_dn *dn); bool ldb_dn_has_extended(struct ldb_dn *dn); |