]> git.sur5r.net Git - openldap/commitdiff
Cleanup NULL check
authorHoward Chu <hyc@openldap.org>
Fri, 31 Mar 2006 22:05:01 +0000 (22:05 +0000)
committerHoward Chu <hyc@openldap.org>
Fri, 31 Mar 2006 22:05:01 +0000 (22:05 +0000)
servers/slapd/at.c

index 2b7d1cd08ba875e5eb325a4be53d48e3f5144f4d..9453cabf02383cb3fb9acc1738a5ec89c69972b8 100644 (file)
@@ -457,6 +457,11 @@ at_add(
        char            *cname = NULL;
        char            *oidm = NULL;
 
+       if ( !at->at_oid ) {
+               *err = "";
+               return SLAP_SCHERR_ATTR_INCOMPLETE;
+       }
+
        if ( !OID_LEADCHAR( at->at_oid[0] )) {
                char    *oid;
 
@@ -501,13 +506,9 @@ at_add(
 
                cname = at->at_names[0];
 
-       } else if ( at->at_oid ) {
+       } else {
                cname = at->at_oid;
 
-       } else {
-               *err = "";
-               code = SLAP_SCHERR_ATTR_INCOMPLETE;
-               goto error_return;
        }
 
        *err = cname;