[Fedora-directory-commits] ldapserver/ldap/servers/slapd schema.c, 1.17, 1.18

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30611/ldap/servers/slapd

Modified Files:
	schema.c 
Log Message:
Resolves: 445775
Summary: Avoid replicating default schema when DESC element is an empty string.



Index: schema.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schema.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- schema.c	13 Nov 2008 23:08:18 -0000	1.17
+++ schema.c	4 Dec 2008 22:33:29 -0000	1.18
@@ -1497,9 +1497,13 @@
 			 (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;
 	}