Use autoconf defines

diff --git a/clients/finger/main.c b/clients/finger/main.c
index d9ce474fdb41607b8590ce61fca3c2d9ef1da416..90d3f0c0edd25c336e9d04cff374ce351942d5a9 100644 (file)
--- a/clients/finger/main.c
+++ b/clients/finger/main.c
@@ -170,11 +170,13 @@ static do_query()
                exit( 1 );
        }
 
-#ifdef USE_SYSCONF
+#ifdef HAVE_SYSCONF
        tblsize = sysconf( _SC_OPEN_MAX );
-#else /* USE_SYSCONF */
+#elif HAVE_GETDTABLESIZE
        tblsize = getdtablesize();
-#endif /* USE_SYSCONF */
+#else
+       tblsize = FD_SETSIZE;
+#endif
 
 #ifdef FD_SETSIZE
        if (tblsize > FD_SETSIZE) {

diff --git a/clients/gopher/detach.c b/clients/gopher/detach.c
index ce327fef20ac144e661d9e7bf6a2beb063062721..8a8baa670c10517125f6d052a3fb0db9f7956b15 100644 (file)
--- a/clients/gopher/detach.c
+++ b/clients/gopher/detach.c
@@ -31,7 +31,7 @@ int   debug;
 #elif defined( HAVE_GETDTABLESIZE )
        nbits = getdtablesize();
 #else
-       nbits = 32;
+       nbits = FD_SETSIZE;
 #endif
 
 #ifdef FD_SETSIZE
@@ -73,14 +73,14 @@ int debug;
                        (void) dup2( sd, 2 );
                close( sd );
 
-#ifdef USE_SETSID
+#ifdef HAVE_SETSID
                (void) setsid();
-#else /* USE_SETSID */
+#else /* HAVE_SETSID */
                if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
                        (void) ioctl( sd, TIOCNOTTY, NULL );
                        (void) close( sd );
                }
-#endif /* USE_SETSID */
+#endif /* HAVE_SETSID */
        } 
 
        (void) signal( SIGPIPE, SIG_IGN );

diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index aef3ea376d052eead05a49b601a4bbc60d0afeb5..792b45a56ebe639807ad9cfb760d915f8d599710 100644 (file)
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -137,11 +137,13 @@ char      **argv;
        }
 #endif
 
-#ifdef USE_SYSCONF
+#ifdef HAVE_SYSCONF
        dtblsize = sysconf( _SC_OPEN_MAX );
-#else /* USE_SYSCONF */
+#elif HAVE_GETDTABLESIZE
        dtblsize = getdtablesize();
-#endif /* USE_SYSCONF */
+#else
+       dtblsize = FD_SETSIZE;
+#endif
 
 #ifdef FD_SETSIZE
        if (dtblsize > FD_SETSIZE) {

diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 725d2b1c538bef7b483e5c4d3bd106a31d56836c..2260d6061a7c15fad9f90ffcd80a9be99fcf2691 100644 (file)
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -153,7 +153,7 @@ char        **argv;
 #elif HAVE_GETDTABLESIZE
        dtblsize = getdtablesize();
 #else
-       dtblsize = 32;
+       dtblsize = FD_SETSIZE;
 #endif
 
 #ifdef FD_SETSIZE

diff --git a/clients/rcpt500/query.c b/clients/rcpt500/query.c
index 4ba778a1bdda9ec9e584cf1b7d604d69400b98c1..65c57df2d3884936ca0b5dbef937c13237b7b000 100644 (file)
--- a/clients/rcpt500/query.c
+++ b/clients/rcpt500/query.c
@@ -80,11 +80,11 @@ query_cmd( msgp, reply )
     /*
      * open connection to LDAP server and bind as dapuser
      */
-#ifdef CLDAP
+#ifdef LDAP_CONNECTIONLESS
     if ( do_cldap )
        ldp = cldap_open( ldaphost, ldapport );
     else
-#endif /* CLDAP */
+#endif /* LDAP_CONNECTIONLESS */
        ldp = ldap_open( ldaphost, ldapport );
 
     if ( ldp == NULL ) {
@@ -94,9 +94,9 @@ query_cmd( msgp, reply )
        return( 0 );
     }
 
-#ifdef CLDAP
+#ifdef LDAP_CONNECTIONLESS
     if ( !do_cldap )
-#endif /* CLDAP */
+#endif /* LDAP_CONNECTIONLESS */
        if ( ldap_simple_bind_s( ldp, dapuser, NULL ) != LDAP_SUCCESS ) {
            report_ldap_err( ldp, reply );
            close_ldap( ldp );
@@ -113,11 +113,11 @@ query_cmd( msgp, reply )
     matches = 0;
 
 #ifdef RCPT500_UFN
-#ifdef CLDAP
+#ifdef LDAP_CONNECTIONLESS
     if ( !do_cldap && strchr( msgp->msg_arg, ',' ) != NULL ) {
-#else /* CLDAP */
+#else /* LDAP_CONNECTIONLESS */
     if ( strchr( msgp->msg_arg, ',' ) != NULL ) {
-#endif /* CLDAP */
+#endif /* LDAP_CONNECTIONLESS */
        struct timeval  tv;
 
        ldap_ufn_setprefix( ldp, searchbase );
@@ -136,12 +136,12 @@ query_cmd( msgp, reply )
     
        for ( lfi = ldap_getfirstfilter( lfdp, "rcpt500", msgp->msg_arg );
                lfi != NULL; lfi = ldap_getnextfilter( lfdp )) {
-#ifdef CLDAP
+#ifdef LDAP_CONNECTIONLESS
            if ( do_cldap )
                rc = cldap_search_s( ldp, searchbase, LDAP_SCOPE_SUBTREE,
                        lfi->lfi_filter, attrs, 0, &ldmsgp, dapuser );
            else 
-#endif /* CLDAP */
+#endif /* LDAP_CONNECTIONLESS */
                rc = ldap_search_s( ldp, searchbase, LDAP_SCOPE_SUBTREE,
                        lfi->lfi_filter, attrs, 0, &ldmsgp );
 
@@ -223,11 +223,11 @@ query_cmd( msgp, reply )
 void
 close_ldap( LDAP *ld )
 {
-#ifdef CLDAP
+#ifdef LDAP_CONNECTIONLESS
     if ( do_cldap )
        cldap_close( ld );
     else
-#endif /* CLDAP */
+#endif /* LDAP_CONNECTIONLESS */
        ldap_unbind( ld );
 }
 

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index bd1b568cf9b894ac86affc58be91f9024e5da7b8..97ad7568b8ca243c5a2be174b5e8f41084f3263c 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -50,7 +50,7 @@ char  *s;
     fprintf( stderr, "    -z size lim\tsize limit (in entries) for search\n" );
     fprintf( stderr, "    -D binddn\tbind dn\n" );
     fprintf( stderr, "    -w passwd\tbind passwd (for simple authentication)\n" );
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
     fprintf( stderr, "    -k\t\tuse Kerberos instead of Simple Password authentication\n" );
 #endif
     fprintf( stderr, "    -h host\tldap server\n" );
@@ -111,7 +111,7 @@ char        **argv;
     scope = LDAP_SCOPE_SUBTREE;
 
     while (( i = getopt( argc, argv,
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
            "KknuvtRABLD:s:f:h:b:d:p:F:a:w:l:z:S:"
 #else
            "nuvtRABLD:s:f:h:b:d:p:F:a:w:l:z:S:"
@@ -131,7 +131,7 @@ char        **argv;
            fprintf( stderr, "compile with -DLDAP_DEBUG for debugging\n" );
 #endif /* LDAP_DEBUG */
            break;
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
        case 'k':       /* use kerberos bind */
            kerberos = 2;
            break;

diff --git a/clients/ud/auth.c b/clients/ud/auth.c
index a245a05f137476c20d79b010fb1af8be667517ee..0e48fa6b86031fcfcce6485ea408d8c7a0cb6126 100644 (file)
--- a/clients/ud/auth.c
+++ b/clients/ud/auth.c
@@ -34,7 +34,7 @@ extern char *mygetpass();     /* getpass() passwds are too short */
 extern int debug;              /* debug flag */
 #endif
 
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 static char tktpath[20];       /* ticket file path */
 static int kinit();
 static int valid_tgt();

diff --git a/clients/ud/globals.c b/clients/ud/globals.c
index cbde60765270db7f998e6876310f7f46ac45a336..6c6f74f9793eacbad911cbaab3a7c46ff38e89c1 100644 (file)
--- a/clients/ud/globals.c
+++ b/clients/ud/globals.c
@@ -44,7 +44,7 @@ struct attribute attrlist[] = {
 #ifdef UOFM
        { "multiLineDescription", "Description", change_field, ATTR_FLAG_PERSON | ATTR_FLAG_GROUP | ATTR_FLAG_READ  | ATTR_FLAG_PERSON_MOD | ATTR_FLAG_GROUP_MOD | ATTR_FLAG_IS_MULTILINE },
 #endif
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
        { "krbName", "Kerberos name", NULL, ATTR_FLAG_PERSON | ATTR_FLAG_READ },
 #endif
        { "description", "Brief description", NULL, ATTR_FLAG_PERSON | ATTR_FLAG_GROUP | ATTR_FLAG_READ },

diff --git a/clients/ud/main.c b/clients/ud/main.c
index 3bab4f83b935a4a71572c1cba91772411f6a55f1..a089742df2db7f12aec07415ba5778468a8f8972 100644 (file)
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -270,7 +270,7 @@ do_commands()
        printf(" Thank you!\n");
        
        ldap_unbind(ld);
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
        destroy_tickets();
 #endif
        exit(0);
@@ -693,9 +693,9 @@ RETSIGTYPE attn()
        fflush(stderr);
        fflush(stdout);
        printf("\n\n  INTERRUPTED!\n");
-#if defined(DOS) || defined(SYSV)
+
        (void) signal(SIGINT, attn);
-#endif
+
        longjmp(env, 1);
 }
 
@@ -711,6 +711,7 @@ RETSIGTYPE chwinsz()
                if (win.ws_col != 0)
                        col_size = win.ws_col;
        }
+
        (void) signal(SIGWINCH, chwinsz);
 }
 #endif

diff --git a/clients/ud/print.c b/clients/ud/print.c
index 7eafd315b515e02b24c7376c6beccced0a2e7335..d6eb2bdeffd3eba4b1809da86726d34bff64eab0 100644 (file)
--- a/clients/ud/print.c
+++ b/clients/ud/print.c
@@ -13,14 +13,14 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#ifndef __STDC__
-#include <memory.h>
-#endif
-#include <time.h>
+
+#include <ac/string.h>
+#include <ac/time.h>
+
 #include <lber.h>
 #include <ldap.h>
+
 #include "ud.h"
 
 #ifdef DEBUG
@@ -597,9 +597,7 @@ time2text( char *ldtimestr, int dateonly )
 
 /* gtime.c - inverse gmtime */
 
-#if !defined( MACOS ) && !defined( _WIN32 ) && !defined( DOS )
-#include <sys/time.h>
-#endif /* !MACOS */
+#include <ac/time.h>
 
 /* gtime(): the inverse of localtime().
        This routine was supplied by Mike Accetta at CMU many years ago.

diff --git a/clients/ud/ud.h b/clients/ud/ud.h
index 40b6ecff7a0e7e90b22c68ae46a4aec7a262fe40..9a54cafae3a57255f666be3b676e40288f75730c 100644 (file)
--- a/clients/ud/ud.h
+++ b/clients/ud/ud.h
@@ -10,14 +10,13 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
+#include "portable.h"
+
 #ifdef DOS
-#include "protoud.h"
-#define strncasecmp(a, b, n)   strnicmp(a, b, n)
-#define strcasecmp(a, b)       stricmp(a, b)
 #define MAX_VALUES     8
 #else
 #define MAX_VALUES     1000
-#endif /* end of DOS ifdef */
+#endif /* !DOS */
 
 /*****************************************************************************
  **
@@ -87,7 +86,7 @@
 /*
  *  Authentication method we will be using.
  */
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 #define UD_AUTH_METHOD         LDAP_AUTH_KRBV4
 #else
 #define UD_AUTH_METHOD         LDAP_AUTH_SIMPLE
@@ -136,6 +135,8 @@
 #define ATTR_FLAG_IS_A_BOOL    0x4000
 #define ATTR_FLAG_IS_MULTILINE 0x8000
 
+LDAP_BEGIN_DECL
+
 /*
  *  These are the structures we use when parsing an answer we get from the LDAP
  *  server.
@@ -156,3 +157,5 @@ struct entry {
        char *name;
        struct attribute attrs[MAX_ATTRS];
 };
+
+LDAP_END_DECL

diff --git a/clients/ud/util.c b/clients/ud/util.c
index c7fc697dbdcb935af1d0ab8b364e1d0d226c2b86..32e686e390ba459d083782e2924358614a083060 100644 (file)
--- a/clients/ud/util.c
+++ b/clients/ud/util.c
@@ -217,7 +217,7 @@ char *s;
 {
        if (errno != 0)
                perror(s);
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
        destroy_tickets();
 #endif
        exit(-1);