Added a "dnattr" case for ACIs (still need to check the ACI OID).

[openldap] / servers / slurpd / re.c

diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index fa171ca1593ac2fa325cf893cf13a8a2714f3883..df1780c49e060c902ff1d806ce7a1509af56f481 100644 (file)
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -192,9 +193,15 @@ Re_parse(
                Debug( LDAP_DEBUG_ANY,
                        "Error: Re_parse: bad type <%s>\n",
                        type, 0, 0 );
+               free( type );
+               if ( value != NULL )
+                       free( value );
                return -1;
            }
        }
+       free( type );
+       if ( value != NULL )
+               free( value );
     }
 
     if ( state != GOT_ALL ) {
@@ -205,12 +212,14 @@ Re_parse(
     }
 
     for (;;) {
+       char *const dash = "-";
+
        if (( buf = ldif_getline( &rp )) == NULL ) {
            break;
        }
        buflen = strlen( buf );
        if (( buflen == 1 ) && ( buf[ 0 ] == '-' )) {
-           type = "-";
+           type  = dash;
            value = NULL;
        } else {
            if ( ldif_parse_line( buf, &type, &value, &len ) < 0 ) {
@@ -235,6 +244,11 @@ Re_parse(
        re->re_mods[ nml + 1 ].mi_type = NULL;
        re->re_mods[ nml + 1 ].mi_val = NULL;
        nml++;
+
+       if ( type != dash )
+               free( type );
+       if ( value != NULL )
+               free( value );
     }
     return 0;
 }
@@ -256,7 +270,6 @@ get_repl_hosts(
     char       **r_rp
 )
 {
-    char               buf[ LDIF_LINE_WIDTH + 1 ];
     char               *type, *value, *line, *p;
     Rh                 *rh = NULL;
     int                        nreplicas;
@@ -314,8 +327,11 @@ get_repl_hosts(
                break;
            }
        }
+       free( type );
        if ( !repl_ok ) {
            warn_unknown_replica( value, port );
+           if ( value != NULL )
+               free( value );
            continue;
        }
 
@@ -328,6 +344,9 @@ get_repl_hosts(
        rh[ nreplicas ].rh_hostname = strdup( value );
        rh[ nreplicas ].rh_port = port;
        nreplicas++;
+
+       if ( value != NULL )
+               free( value );
     }
 
     if ( nreplicas == 0 ) {