X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslurpd%2Fre.c;h=05fd60743c9479b217e8ae098ed159d6cc74b666;hb=d1288bf70efaa55f4be524d5c8e682378b6877bf;hp=f568f07df4b8d0cb26255bde40f87131df42998a;hpb=523fd2c891cfdbd318642b20a105adb4b2f9149c;p=openldap

diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index f568f07df4..05fd60743c 100644
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -9,6 +22,10 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 /* 
  * re.c - routines which deal with Re (Replication entry) structures.
@@ -22,18 +39,17 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
 
 #include "../slapd/slap.h"
+
 #include "slurp.h"
 #include "globals.h"
 
-/* externs */
-extern char *str_getline LDAP_P(( char **next ));
-
 /* Forward references */
 static Rh 	*get_repl_hosts LDAP_P(( char *, int *, char ** ));
 static int	gettype LDAP_P(( char * ));
@@ -63,6 +79,7 @@ Re_getnext(
 
 /*
  * Free an Re
+ * ??? Something should apparently return nonzero here, but I dont know what.
  */
 static int
 Re_free(
@@ -81,11 +98,9 @@ Re_free(
 		"Warning: freeing re (dn: %s) with nonzero refcnt\n",
 		re->re_dn, 0, 0 );
     }
-#if !defined( HAVE_LWP )
-    /* This seems to have problems under SunOS lwp */
-    pthread_mutex_destroy( &re->re_mutex );
-#endif /* HAVE_LWP */
-    ch_free( re->re_timestamp );
+
+    ldap_pvt_thread_mutex_destroy( &re->re_mutex );
+
     if (( rh = re->re_replicas ) != NULL ) {
 	for ( i = 0; rh[ i ].rh_hostname != NULL; i++ ) {
 	    free( rh[ i ].rh_hostname );
@@ -101,6 +116,7 @@ Re_free(
 	free( mi );
     }
     free( re );
+    return 0;
 }
 
 
@@ -126,9 +142,9 @@ Re_parse(
     int			state;
     int			nml;
     char		*buf, *rp, *p;
-    long		buflen;
+    size_t		buflen;
     char		*type, *value;
-    int			len;
+    ber_len_t	len;
     int			nreplicas;
 
     if ( re == NULL ) {
@@ -148,7 +164,7 @@ Re_parse(
     re->re_refcnt = sglob->num_replicas;
 
     for (;;) {
-	if (( state == GOT_ALL ) || ( buf = str_getline( &rp )) == NULL ) {
+	if (( state == GOT_ALL ) || ( buf = ldif_getline( &rp )) == NULL ) {
 	    break;
 	}
 	/*
@@ -159,8 +175,8 @@ Re_parse(
 	if ( strncmp( buf, ERROR_STR, strlen( ERROR_STR )) == 0 ) {
 	    continue;
 	}
-	buflen = ( long ) strlen( buf );
-	if ( str_parse_line( buf, &type, &value, &len ) < 0 ) {
+	buflen = strlen( buf );
+	if ( ldif_parse_line( buf, &type, &value, &len ) < 0 ) {
 	    Debug( LDAP_DEBUG_ANY,
 		    "Error: Re_parse: malformed replog file\n",
 		    0, 0, 0 );
@@ -176,7 +192,7 @@ Re_parse(
 		/* there was a sequence number */
 		*p++ = '\0';
 	    }
-	    re->re_timestamp = strdup( value );
+	    re->re_timestamp = atol( value );
 	    if ( p != NULL && isdigit( (unsigned char) *p )) {
 		re->re_seq = atoi( p );
 	    }
@@ -184,7 +200,7 @@ Re_parse(
 	    break;
 	case T_DN:
 	    re->re_dn = ch_malloc( len + 1 );
-		memcpy( re->re_dn, value, len );
+		AC_MEMCPY( re->re_dn, value, len );
 		re->re_dn[ len ]='\0';
 	    state |= GOT_DN;
 	    break;
@@ -193,9 +209,13 @@ Re_parse(
 		Debug( LDAP_DEBUG_ANY,
 			"Error: Re_parse: bad type <%s>\n",
 			type, 0, 0 );
+		free( type );
+		free( value );
 		return -1;
 	    }
 	}
+	free( type );
+	free( value );
     }
 
     if ( state != GOT_ALL ) {
@@ -206,15 +226,17 @@ Re_parse(
     }
 
     for (;;) {
-	if (( buf = str_getline( &rp )) == NULL ) {
+	char *const dash = "-";
+
+	if (( buf = ldif_getline( &rp )) == NULL ) {
 	    break;
 	}
-	buflen = ( long ) strlen( buf );
+	buflen = strlen( buf );
 	if (( buflen == 1 ) && ( buf[ 0 ] == '-' )) {
-	    type = "-";
+	    type  = dash;
 	    value = NULL;
 	} else {
-	    if ( str_parse_line( buf, &type, &value, &len ) < 0 ) {
+	    if ( ldif_parse_line( buf, &type, &value, &len ) < 0 ) {
 		Debug( LDAP_DEBUG_ANY,
 			"Error: malformed replog line \"%s\"\n",
 			buf, 0, 0 );
@@ -226,7 +248,7 @@ Re_parse(
 	re->re_mods[ nml ].mi_type = strdup( type );
 	if ( value != NULL ) {
 	    re->re_mods[ nml ].mi_val = ch_malloc( len + 1 );
-		memcpy( re->re_mods[ nml ].mi_val, value, len );
+		AC_MEMCPY( re->re_mods[ nml ].mi_val, value, len );
 		re->re_mods[ nml ].mi_val[ len ] = '\0';
 	    re->re_mods[ nml ].mi_len = len;
 	} else {
@@ -236,6 +258,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;
 }
@@ -257,10 +284,10 @@ get_repl_hosts(
     char	**r_rp
 )
 {
-    char		buf[ LINE_WIDTH + 1 ];
     char		*type, *value, *line, *p;
     Rh			*rh = NULL;
-    int			nreplicas, len;
+    int			nreplicas;
+	ber_len_t	len;
     int			port;
     int			repl_ok;
     int			i;
@@ -279,7 +306,7 @@ get_repl_hosts(
     for (;;) {
 	/* If this is a reject log, we need to skip over the ERROR: line */
 	if ( !strncmp( *r_rp, ERROR_STR, strlen( ERROR_STR ))) {
-	    line = str_getline( r_rp );
+	    line = ldif_getline( r_rp );
 	    if ( line == NULL ) {
 		break;
 	    }
@@ -287,14 +314,14 @@ get_repl_hosts(
 	if ( strncasecmp( *r_rp, "replica:", 7 )) {
 	    break;
 	}
-	line = str_getline( r_rp );
+	line = ldif_getline( r_rp );
 	if ( line == NULL ) {
 	    break;
 	}
-	if ( str_parse_line( line, &type, &value, &len ) < 0 ) {
+	if ( ldif_parse_line( line, &type, &value, &len ) < 0 ) {
 	    return( NULL );
 	}
-	port = LDAP_PORT;
+	port = 0;
 	if (( p = strchr( value, ':' )) != NULL ) {
 	    *p = '\0';
 	    p++;
@@ -314,8 +341,10 @@ get_repl_hosts(
 		break;
 	    }
 	}
+	free( type );
 	if ( !repl_ok ) {
 	    warn_unknown_replica( value, port );
+	    free( value );
 	    continue;
 	}
 
@@ -328,6 +357,8 @@ get_repl_hosts(
 	rh[ nreplicas ].rh_hostname = strdup( value );
 	rh[ nreplicas ].rh_port = port;
 	nreplicas++;
+
+	free( value );
     }
 
     if ( nreplicas == 0 ) {
@@ -440,7 +471,7 @@ Re_dump(
     }
     fprintf( fp, "Re_dump: ******\n" );
     fprintf( fp, "re_refcnt: %d\n", re->re_refcnt );
-    fprintf( fp, "re_timestamp: %s\n", re->re_timestamp );
+    fprintf( fp, "re_timestamp: %ld\n", (long) re->re_timestamp );
     fprintf( fp, "re_seq: %d\n", re->re_seq );
     for ( i = 0; re->re_replicas && re->re_replicas[ i ].rh_hostname != NULL;
 		i++ ) {
@@ -517,7 +548,7 @@ Re_write(
 	    goto bad;
 	}
     } else {			/* write multiple "replica:" lines */
-	for ( i = 0; re->re_replicas[ i ].rh_hostname != NULL; i++ ) {
+	for ( i = 0; re->re_replicas && re->re_replicas[ i ].rh_hostname != NULL; i++ ) {
 	    if ( fprintf( fp, "replica: %s:%d\n",
 		    re->re_replicas[ i ].rh_hostname,
 		    re->re_replicas[ i ].rh_port ) < 0 ) {
@@ -526,7 +557,7 @@ Re_write(
 	    }
 	}
     }
-    if ( fprintf( fp, "time: %s.%d\n", re->re_timestamp, re->re_seq ) < 0 ) {
+    if ( fprintf( fp, "time: %ld.%d\n", (long) re->re_timestamp, re->re_seq ) < 0 ) {
 	rc = -1;
 	goto bad;
     }
@@ -567,7 +598,8 @@ Re_write(
 	    }
 	} else {
 	    char *obuf;
-	    obuf = ldif_type_and_value( re->re_mods[ i ].mi_type,
+	    obuf = ldif_put( LDIF_PUT_VALUE,
+			re->re_mods[ i ].mi_type,
 		    re->re_mods[ i ].mi_val ? re->re_mods[ i ].mi_val : "",
 		    re->re_mods[ i ].mi_len );
 	    if ( fputs( obuf, fp ) < 0 ) {
@@ -575,7 +607,7 @@ Re_write(
 		free( obuf );
 		goto bad;
 	    } else {
-		free( obuf );
+		ber_memfree( obuf );
 	    }
 	}
     }
@@ -642,7 +674,7 @@ Re_lock(
     Re	*re
 )
 {
-    return( pthread_mutex_lock( &re->re_mutex ));
+    return( ldap_pvt_thread_mutex_lock( &re->re_mutex ));
 }
 
 
@@ -656,7 +688,7 @@ Re_unlock(
     Re	*re
 )
 {
-    return( pthread_mutex_unlock( &re->re_mutex ));
+    return( ldap_pvt_thread_mutex_unlock( &re->re_mutex ));
 }
 
 
@@ -689,7 +721,7 @@ Re_init(
 
     /* Initialize private data */
    (*re)->re_refcnt = sglob->num_replicas;
-   (*re)->re_timestamp = NULL;
+   (*re)->re_timestamp = (time_t) 0L;
    (*re)->re_replicas = NULL;
    (*re)->re_dn = NULL;
    (*re)->re_changetype = 0;
@@ -697,7 +729,7 @@ Re_init(
    (*re)->re_mods = NULL;
    (*re)->re_next = NULL;
 
-   pthread_mutex_init( &((*re)->re_mutex), pthread_mutexattr_default );
+   ldap_pvt_thread_mutex_init( &((*re)->re_mutex) );
    return 0;
 }