fix typo

[openldap] / servers / slapd / syntax.c

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index a2c201a2e8f4c642592d0871e84ee812638ee33c..c7089acc4597d4919597c6fc80a59cd177d67367 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -164,9 +164,9 @@ syn_add(
        int             code = 0;
 
        ssyn = (Syntax *) SLAP_CALLOC( 1, sizeof(Syntax) );
-       if( ssyn == NULL ) {
+       if ( ssyn == NULL ) {
                Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
-               return LDAP_OTHER;
+               return SLAP_SCHERR_OUTOFMEM;
        }
 
        AC_MEMCPY( &ssyn->ssyn_syn, syn, sizeof(LDAPSyntax) );
@@ -183,11 +183,54 @@ syn_add(
        ssyn->ssyn_validate = def->sd_validate;
        ssyn->ssyn_pretty = def->sd_pretty;
 
+       ssyn->ssyn_sups = NULL;
+
 #ifdef SLAPD_BINARY_CONVERSION
        ssyn->ssyn_ber2str = def->sd_ber2str;
        ssyn->ssyn_str2ber = def->sd_str2ber;
 #endif
 
+       if ( def->sd_validate == NULL && def->sd_pretty == NULL && syn->syn_extensions != NULL ) {
+               LDAPSchemaExtensionItem **lsei;
+               Syntax *subst = NULL;
+
+               for ( lsei = syn->syn_extensions; *lsei != NULL; lsei++) {
+                       if ( strcmp( (*lsei)->lsei_name, "X-SUBST" ) != 0 ) {
+                               continue;
+                       }
+
+                       assert( (*lsei)->lsei_values != NULL );
+                       if ( (*lsei)->lsei_values[0] == '\0'
+                               || (*lsei)->lsei_values[1] != '\0' )
+                       {
+                               Debug( LDAP_DEBUG_ANY, "syn_add(%s): exactly one substitute syntax must be present\n",
+                                       ssyn->ssyn_syn.syn_oid, 0, 0 );
+                               return SLAP_SCHERR_SYN_SUBST_NOT_SPECIFIED;
+                       }
+
+                       subst = syn_find( (*lsei)->lsei_values[0] );
+                       if ( subst == NULL ) {
+                               Debug( LDAP_DEBUG_ANY, "syn_add(%s): substitute syntax %s not found\n",
+                                       ssyn->ssyn_syn.syn_oid, (*lsei)->lsei_values[0], 0 );
+                               return SLAP_SCHERR_SYN_SUBST_NOT_FOUND;
+                       }
+                       break;
+               }
+
+               if ( subst != NULL ) {
+                       ssyn->ssyn_flags = subst->ssyn_flags;
+                       ssyn->ssyn_validate = subst->ssyn_validate;
+                       ssyn->ssyn_pretty = subst->ssyn_pretty;
+
+                       ssyn->ssyn_sups = NULL;
+
+#ifdef SLAPD_BINARY_CONVERSION
+                       ssyn->ssyn_ber2str = subst->ssyn_ber2str;
+                       ssyn->ssyn_str2ber = subst->ssyn_str2ber;
+#endif
+               }
+       }
+
        if ( def->sd_sups != NULL ) {
                int     cnt;
 
@@ -195,19 +238,32 @@ syn_add(
                        ;
                
                ssyn->ssyn_sups = (Syntax **)SLAP_CALLOC( cnt + 1,
-                       sizeof(Syntax) );
-
-               for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) {
-                       ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] );
-                       if ( ssyn->ssyn_sups[cnt] == NULL ) {
-                               *err = def->sd_sups[cnt];
-                               code = SLAP_SCHERR_SYN_SUP_NOT_FOUND;
+                       sizeof( Syntax * ) );
+               if ( ssyn->ssyn_sups == NULL ) {
+                       Debug( LDAP_DEBUG_ANY, "SLAP_CALLOC Error\n", 0, 0, 0 );
+                       code = SLAP_SCHERR_OUTOFMEM;
+
+               } else {
+                       for ( cnt = 0; def->sd_sups[cnt] != NULL; cnt++ ) {
+                               ssyn->ssyn_sups[cnt] = syn_find( def->sd_sups[cnt] );
+                               if ( ssyn->ssyn_sups[cnt] == NULL ) {
+                                       *err = def->sd_sups[cnt];
+                                       code = SLAP_SCHERR_SYN_SUP_NOT_FOUND;
+                               }
                        }
                }
        }
 
        if ( code == 0 ) {
                code = syn_insert( ssyn, err );
+
+       }
+
+       if ( code != 0 && ssyn != NULL ) {
+               if ( ssyn->ssyn_sups != NULL ) {
+                       SLAP_FREE( ssyn->ssyn_sups );
+               }
+               SLAP_FREE( ssyn );
        }
 
        return code;