Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers.

[openldap] / clients / gopher / go500gw.c

diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 9381acda5bd208da291e2d12edad3956118304cd..c1c5ab4a9ef47c556e3823f66d3ce195aedeb13f 100644 (file)
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
@@ -36,17 +37,16 @@
 #endif
 
 
-#include "lber.h"
-#include "ldap.h"
+#include <ldap.h>
+#include <disptmpl.h>
 
 #define ldap_debug debug
 #include "ldap_log.h"
 
 #include "lutil.h"
 
-#include "disptmpl.h"
 
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 
 int    debug;
 int ldap_syslog;
@@ -64,10 +64,10 @@ char                *templatefile = TEMPLATEFILE;
 char           *friendlyfile = FRIENDLYFILE;
 int            rdncount = GO500GW_RDNCOUNT;
 
-static void usage      ( char *name );
+static void usage      ( char *name ) LDAP_GCCATTR((noreturn));
 static int  set_socket (int port);
 static RETSIGTYPE wait4child(int sig);
-static void do_queries (int s);
+static void do_queries (int s)    LDAP_GCCATTR((noreturn));
 static char *pick_oc   ( char **oclist );
 static int  isnonleaf  ( LDAP *ld, char **oclist, char *dn );
 static void do_menu    (LDAP *ld, FILE *fp, char *dn);
@@ -75,7 +75,7 @@ static void do_list   (LDAP *ld, FILE *fp, char *dn);
 static int  isoc       ( char **ocl, char *oc );
 static int  make_scope ( LDAP *ld, char *dn );
 static void do_search  (LDAP *ld, FILE *fp, char *query);
-static int  entry2textwrite( void *fp, char *buf, int len );
+static int  entry2textwrite( void *fp, char *buf, ber_len_t len );
 static void do_read    (LDAP *ld, FILE *fp, char *dn);
 static void do_help    (FILE *op);
 static void do_sizelimit(FILE *fp, char type);
@@ -88,7 +88,7 @@ static void
 usage( char *name )
 {
        fprintf( stderr, "usage: %s [-d debuglevel] [-I] [-p port] [-P ldapport] [-l]\r\n\t[-x ldaphost] [-a] [-h helpfile] [-f filterfile] [-t templatefile] [-c rdncount]\r\n", name );
-       exit( 1 );
+       exit( EXIT_FAILURE );
 }
 
 int
@@ -101,7 +101,7 @@ main (int  argc, char **argv )
        fd_set                  readfds;
        struct hostent          *hp;
        struct sockaddr_in      from;
-       int                     fromlen;
+       socklen_t               fromlen;
 
 #if defined( LDAP_PROCTITLE ) && !defined( HAVE_SETPROCTITLE )
        /* for setproctitle */
@@ -182,7 +182,7 @@ main (int  argc, char **argv )
        if ( myhost[0] == '\0' && gethostname( myhost, sizeof(myhost) )
            == -1 ) {
                perror( "gethostname" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 #endif
 
@@ -248,7 +248,7 @@ main (int  argc, char **argv )
 
                tcp_close( 0 );
 
-               exit( 0 );
+               exit( EXIT_SUCCESS );
        }
 
        for ( ;; ) {
@@ -269,7 +269,7 @@ main (int  argc, char **argv )
                if ( (ns = accept( s, (struct sockaddr *) &from, &fromlen ))
                    == -1 ) {
                        if ( debug ) perror( "accept" );
-                       exit( 1 );
+                       exit( EXIT_FAILURE );
                }
 
                hp = gethostbyaddr( (char *) &(from.sin_addr.s_addr),
@@ -313,30 +313,41 @@ set_socket( int port )
 
        if ( (s = socket( AF_INET, SOCK_STREAM, 0 )) == -1 ) {
                 perror( "socket" );
-                exit( 1 );
+                exit( EXIT_FAILURE );
         }
 
+#ifdef SO_REUSEADDR
         /* set option so clients can't keep us from coming back up */
-       one = 1;
+               one = 1;
         if ( setsockopt( s, SOL_SOCKET, SO_REUSEADDR, (char *) &one,
            sizeof(one) ) < 0 ) {
                 perror( "setsockopt" );
-                exit( 1 );
+                exit( EXIT_FAILURE );
         }
+#endif
+#ifdef SO_KEEPALIVE
+               /* enable keep alives */
+               one = 1;
+        if ( setsockopt( s, SOL_SOCKET, SO_KEEPALIVE, (char *) &one,
+           sizeof(one) ) < 0 ) {
+                perror( "setsockopt" );
+                exit( EXIT_FAILURE );
+        }
+#endif
 
         /* bind to a name */
         addr.sin_family = AF_INET;
-        addr.sin_addr.s_addr = INADDR_ANY;
+        addr.sin_addr.s_addr = htonl(INADDR_ANY);
         addr.sin_port = htons( port );
         if ( bind( s, (struct sockaddr *) &addr, sizeof(addr) ) ) {
                 perror( "bind" );
-                exit( 1 );
+                exit( EXIT_FAILURE );
         }
 
        /* listen for connections */
         if ( listen( s, 5 ) == -1 ) {
                 perror( "listen" );
-                exit( 1 );
+                exit( EXIT_FAILURE );
         }
 
         if ( debug )
@@ -379,7 +390,7 @@ do_queries( int s )
 
        if ( (fp = fdopen( s, "a+")) == NULL ) {
                perror( "fdopen" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        timeout.tv_sec = GO500GW_TIMEOUT;
@@ -388,10 +399,10 @@ do_queries( int s )
        FD_SET( fileno( fp ), &readfds );
 
        if ( (rc = select( dtblsize, &readfds, 0, 0, &timeout )) <= 0 )
-               exit( 1 );
+               exit( EXIT_FAILURE );
 
        if ( fgets( buf, sizeof(buf), fp ) == NULL )
-               exit( 1 );
+               exit( EXIT_FAILURE );
 
        len = strlen( buf );
        if ( debug ) {
@@ -437,17 +448,17 @@ do_queries( int s )
                fprintf( fp, ".\r\n" );
                rewind(fp);
 
-               exit( 0 );
+               exit( EXIT_SUCCESS );
                /* NOT REACHED */
        }
 
-       if ( (ld = ldap_open( ldaphost, ldapport )) == NULL ) {
-               if ( debug ) perror( "ldap_open" );
+       if ( (ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+               if ( debug ) perror( "ldap_init" );
                fprintf(fp, "0An error occurred (explanation)\tE%d\t%s\t%d\r\n",
                    LDAP_SERVER_DOWN, myhost, myport );
                fprintf( fp, ".\r\n" );
                rewind(fp);
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        deref = LDAP_DEREF_ALWAYS;
@@ -463,7 +474,7 @@ do_queries( int s )
                    rc, myhost, myport );
                fprintf( fp, ".\r\n" );
                rewind(fp);
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        switch ( *query++ ) {
@@ -487,7 +498,7 @@ do_queries( int s )
        fprintf( fp, ".\r\n" );
        rewind(fp);
 
-       exit( 0 );
+       exit( EXIT_SUCCESS );
        /* NOT REACHED */
 }
 
@@ -729,7 +740,7 @@ do_search( LDAP *ld, FILE *fp, char *query )
 
        if ( (filter = strchr( query, '\t' )) == NULL ) {
                fprintf( fp, "3Missing filter!\r\n" );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
        *filter++ = '\0';
        base = query;
@@ -757,7 +768,7 @@ do_search( LDAP *ld, FILE *fp, char *query )
 #endif
                if ( (scope = make_scope( ld, base )) == -1 ) {
                        fprintf( fp, "3Bad scope\r\n" );
-                       exit( 1 );
+                       exit( EXIT_FAILURE );
                }
 
                filtertype = (scope == LDAP_SCOPE_ONELEVEL ?
@@ -771,7 +782,7 @@ do_search( LDAP *ld, FILE *fp, char *query )
                if ( (filtd = ldap_init_getfilter( filterfile )) == NULL ) {
                        fprintf( stderr, "Cannot open filter file (%s)\n",
                            filterfile );
-                       exit( 1 );
+                       exit( EXIT_FAILURE );
                }
 
                count = 0;
@@ -851,7 +862,7 @@ do_search( LDAP *ld, FILE *fp, char *query )
 
 
 static int
-entry2textwrite( void *fp, char *buf, int len )
+entry2textwrite( void *fp, char *buf, ber_len_t len )
 {
         return( fwrite( buf, len, 1, (FILE *)fp ) == 0 ? -1 : len );
 }
@@ -870,8 +881,8 @@ do_read( LDAP *ld, FILE *fp, char *dn )
                ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
 
                fprintf(fp,
-                   "0An error occurred (explanation)\t@%d\t%s\t%d\r\n",
-                   ld_errno, myhost, myport );
+                   "0An error occurred (explanation)\t@%s\t%s\t%d\r\n",
+                   ldap_err2string( ld_errno ), myhost, myport );
        }
 
        if ( tmpllist != NULL ) {