summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2008-12-04 22:33:29 +0000
committerNathan Kinder <nkinder@redhat.com>2008-12-04 22:33:29 +0000
commitceb0d93333f8ccf52fcc413c78789d17ff48be82 (patch)
treecaefd861b1bc1dc6beac60bf16fa127dbedf74db
parentc1ec224244043a67c23933f5ae0394616aa403b5 (diff)
Resolves: 445775
Summary: Avoid replicating default schema when DESC element is an empty string.
-rw-r--r--ldap/servers/slapd/schema.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 5613efb3..e63d9068 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -1497,9 +1497,13 @@ read_schema_dse(
(oc->oc_oid) ? oc->oc_oid : "",
oc->oc_name);
/* The DESC (description) is OPTIONAL */
- if (oc_description && *oc_description) {
+ if (oc_description) {
strcat(psbObjectClasses->buffer, " DESC '");
- strcat(psbObjectClasses->buffer, oc_description);
+ /* We want to list an empty description
+ * element if it was defined that way. */
+ if (*oc_description) {
+ strcat(psbObjectClasses->buffer, oc_description);
+ }
strcat(psbObjectClasses->buffer, "'");
need_extra_space = 1;
}