make sure NULL pointers are not dereferenced

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index a703f1cb11ac22ae77993d413c8e62283e312882..881ca16251e8569b3733b3da87b5b9c5db0d473d 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -855,16 +855,9 @@ static struct slap_schema_ad_map {
        { "authzTo", "( 1.3.6.1.4.1.4203.666.1.8 "
                        "NAME ( 'authzTo' 'saslAuthzTo' ) "
                        "DESC 'proxy authorization targets' "
-#ifdef SLAP_AUTHZ_SYNTAX
                        "EQUALITY authzMatch "
                        "SYNTAX 1.3.6.1.4.1.4203.666.2.7 "
-#else /* ! SLAP_AUTHZ_SYNTAX */
-                       "EQUALITY caseExactMatch "
-                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 "
-#endif /* ! SLAP_AUTHZ_SYNTAX */
-#ifdef SLAP_ORDERED_PRETTYNORM
                        "X-ORDERED 'VALUES' "
-#endif /* SLAP_ORDERED_PRETTYNORM */
                        "USAGE distributedOperation )",
                NULL, SLAP_AT_HIDE,
                NULL, NULL,
@@ -873,16 +866,9 @@ static struct slap_schema_ad_map {
        { "authzFrom", "( 1.3.6.1.4.1.4203.666.1.9 "
                        "NAME ( 'authzFrom' 'saslAuthzFrom' ) "
                        "DESC 'proxy authorization sources' "
-#ifdef SLAP_AUTHZ_SYNTAX
                        "EQUALITY authzMatch "
                        "SYNTAX 1.3.6.1.4.1.4203.666.2.7 "
-#else /* ! SLAP_AUTHZ_SYNTAX */
-                       "EQUALITY caseExactMatch "
-                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 "
-#endif /* ! SLAP_AUTHZ_SYNTAX */
-#ifdef SLAP_ORDERED_PRETTYNORM
                        "X-ORDERED 'VALUES' "
-#endif /* SLAP_ORDERED_PRETTYNORM */
                        "USAGE distributedOperation )",
                NULL, SLAP_AT_HIDE,
                NULL, NULL,
@@ -894,7 +880,7 @@ static struct slap_schema_ad_map {
                        "DESC 'RFC2589: entry time-to-live' "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE "
                        "NO-USER-MODIFICATION USAGE dSAOperation )",
-               dynamicAttribute, 0,
+               dynamicAttribute, SLAP_AT_MANAGEABLE,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryTtl) },
@@ -1202,6 +1188,7 @@ slap_schema_load( void )
                                fprintf( stderr, "slap_schema_load: "
                                        "AttributeType \"%s\": no OID\n",
                                        ad_map[i].ssam_name );
+                               ldap_attributetype_free( at );
                                return LDAP_OTHER;
                        }
 
@@ -1317,18 +1304,20 @@ slap_schema_load( void )
                                fprintf( stderr, "slap_schema_load: ObjectClass "
                                        "\"%s\": no OID\n",
                                        oc_map[i].ssom_name );
+                               ldap_objectclass_free( oc );
                                return LDAP_OTHER;
                        }
 
                        code = oc_add(oc,0,NULL,&err);
                        if ( code ) {
+                               ldap_objectclass_free( oc );
                                fprintf( stderr, "slap_schema_load: ObjectClass "
                                        "\"%s\": %s: \"%s\"\n",
                                        oc_map[i].ssom_name, scherr2str(code), err);
                                return code;
                        }
-
                        ldap_memfree(oc);
+
                }
                {
                        ObjectClass ** ocp = (ObjectClass **)