X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Fgopher%2Fgo500gw.c;h=9381acda5bd208da291e2d12edad3956118304cd;hb=21c70857f1029309d6bc5a5b6a93d7537494b742;hp=d2218f537b35a2d6b6d5d55c11cce9f296df7f60;hpb=52ca931b70abd5e290e0ed3146a6bdd012be4e59;p=openldap

diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index d2218f537b..9381acda5b 100644
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -13,7 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/signal.h>
@@ -48,6 +49,8 @@
 #include "ldapconfig.h"
 
 int	debug;
+int ldap_syslog;
+int ldap_syslog_level;
 int	dosyslog;
 int	inetd;
 int	dtblsize;
@@ -193,7 +196,7 @@ main (int  argc, char **argv )
 		myname = strdup( myname + 1 );
 
 	if ( debug ) {
-		lber_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug);
+		ber_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug);
 		ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug);
 	}
 	
@@ -243,7 +246,7 @@ main (int  argc, char **argv )
 
 		do_queries( 0 );
 
-		close( 0 );
+		tcp_close( 0 );
 
 		exit( 0 );
 	}
@@ -280,7 +283,7 @@ main (int  argc, char **argv )
 
 		switch( pid = fork() ) {
 		case 0:		/* child */
-			close( s );
+			tcp_close( s );
 			do_queries( ns );
 			break;
 
@@ -289,7 +292,7 @@ main (int  argc, char **argv )
 			break;
 
 		default:	/* parent */
-			close( ns );
+			tcp_close( ns );
 			if ( debug )
 				fprintf( stderr, "forked child %d\n", pid );
 			break;
@@ -352,10 +355,10 @@ wait4child( int sig )
 	if ( debug ) printf( "parent: catching child status\n" );
 
 #ifdef HAVE_WAITPID
-	while (waitpid ((pid_t) -1, NULL, WAIT_FLAGS) > 0)
+	while (waitpid ((pid_t) -1, (int *) NULL, WAIT_FLAGS) > 0)
 		;	/* NULL */
 #else 
-	while (wait3( &status, WAIT_FLAGS, 0 ) > 0 )
+	while (wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) > 0 )
 		;	/* NULL */
 #endif
 
@@ -394,7 +397,7 @@ do_queries( int s )
 	if ( debug ) {
 		fprintf( stderr, "got %d bytes\n", len );
 #ifdef LDAP_DEBUG
-		lber_bprint( buf, len );
+		ber_bprint( buf, len );
 #endif
 	}
 
@@ -409,7 +412,7 @@ do_queries( int s )
 	query = buf;
 
 	/* strip off leading white space */
-	while ( isspace( *query )) {
+	while ( isspace( (unsigned char) *query )) {
 		++query;
 		--len;
 	}
@@ -798,8 +801,7 @@ do_search( LDAP *ld, FILE *fp, char *query )
 	}
 
 	if ( count == 1 ) {
-		char	*dn, **s, **oc;
-		int	rc;
+		char	*dn, **oc;
 
 		e = ldap_first_entry( ld, res );
 		oc = ldap_get_values( ld, e, "objectClass" );