sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00
Code

r20373: When adding a base to a "" DN, don't precede it with a comma (,)

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2006-12-28 03:31:18 +00:00 committed by Gerald (Jerry) Carter
parent 4bd8dbcf41
commit ef1ca30180
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/ldb/common/ldb_dn.c
View File

@ -988,7 +988,11 @@ bool ldb_dn_add_base(struct ldb_dn *dn, struct ldb_dn *base)
}
if (dn->casefold && s) {
t = talloc_asprintf(dn, "%s,%s", dn->casefold, s);
if (*dn->casefold) {
t = talloc_asprintf(dn, "%s,%s", dn->casefold, s);
} else {
t = talloc_strdup(dn, s);
}
LDB_FREE(dn->casefold);
dn->casefold = t;
}
@ -1001,7 +1005,11 @@ bool ldb_dn_add_base(struct ldb_dn *dn, struct ldb_dn *base)
return false;
}
t = talloc_asprintf(dn, "%s,%s", dn->linearized, s);
if (*dn->linearized) {
t = talloc_asprintf(dn, "%s,%s", dn->linearized, s);
} else {
t = talloc_strdup(dn, s);
}
if ( ! t) {
dn->invalid = true;
return false;