mirror of
https://github.com/samba-team/samba.git
synced 2025-11-23 20:23:50 +03:00
r7276: - moved static tdb function ltdb_dn_fold() into common/ so that it can be
called from multiple backends. (ldb_sqlite3 needs it too.) Added parameter for a callback function that determines whether an attribute needs case folding. - begin to prepare for sqlite3 in build process - work-in-progress updates, on ldb_sqlite3
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
0dda66f0e8
commit
a80bced0b9
@@ -88,3 +88,80 @@ int ldb_attr_cmp(const char *dn1, const char *dn2)
|
||||
{
|
||||
return ldb_caseless_cmp(dn1, dn2);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
casefold a dn. We need to uppercase the attribute names, and the
|
||||
attribute values of case insensitive attributes. We also need to remove
|
||||
extraneous spaces between elements
|
||||
*/
|
||||
char *ldb_dn_fold(struct ldb_module *module, const char *dn, int (*case_fold_attr_fn)(struct ldb_module * module, char * attr))
|
||||
{
|
||||
const char *dn_orig = dn;
|
||||
struct ldb_context *ldb = module->ldb;
|
||||
TALLOC_CTX *tmp_ctx = talloc_new(ldb);
|
||||
char *ret;
|
||||
size_t len;
|
||||
|
||||
ret = talloc_strdup(tmp_ctx, "");
|
||||
if (ret == NULL) goto failed;
|
||||
|
||||
while ((len = strcspn(dn, ",")) > 0) {
|
||||
char *p = strchr(dn, '=');
|
||||
char *attr, *value;
|
||||
int case_fold_required;
|
||||
|
||||
if (p == NULL || (p-dn) > len) goto failed;
|
||||
|
||||
attr = talloc_strndup(tmp_ctx, dn, p-dn);
|
||||
if (attr == NULL) goto failed;
|
||||
|
||||
/* trim spaces from the attribute name */
|
||||
while (' ' == *attr) attr++;
|
||||
while (' ' == attr[strlen(attr)-1]) {
|
||||
attr[strlen(attr)-1] = 0;
|
||||
}
|
||||
if (*attr == 0) goto failed;
|
||||
|
||||
value = talloc_strndup(tmp_ctx, p+1, len-(p+1-dn));
|
||||
if (value == NULL) goto failed;
|
||||
|
||||
/* trim spaces from the value */
|
||||
while (' ' == *value) value++;
|
||||
while (' ' == value[strlen(value)-1]) {
|
||||
value[strlen(value)-1] = 0;
|
||||
}
|
||||
if (*value == 0) goto failed;
|
||||
|
||||
case_fold_required = (* case_fold_attr_fn)(module, attr);
|
||||
|
||||
attr = ldb_casefold(ldb, attr);
|
||||
if (attr == NULL) goto failed;
|
||||
talloc_steal(tmp_ctx, attr);
|
||||
|
||||
if (case_fold_required) {
|
||||
value = ldb_casefold(ldb, value);
|
||||
if (value == NULL) goto failed;
|
||||
talloc_steal(tmp_ctx, value);
|
||||
}
|
||||
|
||||
if (dn[len] == ',') {
|
||||
ret = talloc_asprintf_append(ret, "%s=%s,", attr, value);
|
||||
} else {
|
||||
ret = talloc_asprintf_append(ret, "%s=%s", attr, value);
|
||||
}
|
||||
if (ret == NULL) goto failed;
|
||||
|
||||
dn += len;
|
||||
if (*dn == ',') dn++;
|
||||
}
|
||||
|
||||
talloc_steal(ldb, ret);
|
||||
talloc_free(tmp_ctx);
|
||||
return ret;
|
||||
|
||||
failed:
|
||||
talloc_free(tmp_ctx);
|
||||
return ldb_casefold(ldb, dn_orig);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user