X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=clients%2Ffax500%2Fmain.c;h=8362a7b520c26fdfbb9148178075ed4185d12c1e;hb=3ea33ebd12f9736bc3bc464845d4d8a6919bc216;hp=8d7b938e8fc9420e76a6fe162cd320a54add2b41;hpb=52ca931b70abd5e290e0ed3146a6bdd012be4e59;p=openldap

diff --git a/clients/fax500/main.c b/clients/fax500/main.c
index 8d7b938e8f..8362a7b520 100644
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
@@ -13,33 +14,29 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
+#include <ac/stdlib.h>
+
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/param.h>
 #include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
-#include <ac/ctype.h>
+#include <ac/sysexits.h>
 #include <ac/syslog.h>
 #include <ac/time.h>
-#include <ac/wait.h>
 #include <ac/unistd.h>
-#include <ac/errno.h>
+#include <ac/wait.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-#include <sysexits.h>
-
-#include "lber.h"
-#include "ldap.h"
+#include <ldap.h>
 
 #include "fax500.h"
-
-#include <ldapconfig.h>
+#include "ldap_defaults.h"
 
 #define USER		0
 #define GROUP_ERRORS	1
@@ -123,7 +120,7 @@ static void add_to(char ***list, int *nlist, char **new);
 static int  isgroup(LDAPMessage *e);
 static void add_error(Error **err, int *nerr, int code, char *addr, LDAPMessage *msg);
 static void add_group(char *dn, Group **list, int *nlist);
-static void unbind_and_exit(int rc);
+static void unbind_and_exit(int rc) LDAP_GCCATTR((noreturn));
 static int  group_loop(char *dn);
 static void send_group(Group *group, int ngroup);
 static int  has_attributes(LDAPMessage *e, char *attr1, char *attr2);
@@ -192,7 +189,7 @@ main ( int argc, char **argv )
 
 #ifdef LOG_MAIL
 	openlog( myname, OPENLOG_OPTIONS, LOG_MAIL );
-#else
+#elif LOG_DEBUG
 	openlog( myname, OPENLOG_OPTIONS );
 #endif
 
@@ -323,8 +320,8 @@ connect_to_x500( void )
 	int sizelimit = FAX_MAXAMBIGUOUS;
 	int deref = LDAP_DEREF_ALWAYS;
 
-	if ( (ld = ldap_open( NULL, 0 )) == NULL ) {
-		syslog( LOG_ALERT, "ldap_open failed" );
+	if ( (ld = ldap_init( NULL, 0 )) == NULL ) {
+		syslog( LOG_ALERT, "ldap_init failed" );
 		return( -1 );
 	}
 
@@ -440,7 +437,7 @@ do_address(
 
 	/* no matches - bounce with user unknown */
 	if ( match == 0 ) {
-		add_error( err, nerr, E_USERUNKNOWN, name, NULLMSG );
+		add_error( err, nerr, E_USERUNKNOWN, name, NULL );
 		return;
 	}
 
@@ -776,7 +773,7 @@ do_group_members(
 
 						add_error( err, nerr,
 						    E_JOINMEMBERNOFAXNUM, ndn, 
-						    NULLMSG );
+						    NULL );
 
 						free( ndn );
 					}
@@ -794,7 +791,7 @@ do_group_members(
 
 						add_error( err, nerr,
 						    E_JOINMEMBERNOEMAIL, ndn, 
-						    NULLMSG );
+						    NULL );
 
 						free( ndn );
 					}
@@ -833,10 +830,10 @@ add_member(
 
 	timeout.tv_sec = FAX_TIMEOUT;
 	timeout.tv_usec = 0;
-	if ( (rc = ldap_search_st( ld, dn, LDAP_SCOPE_BASE, "(objectclass=*)",
+	if ( (rc = ldap_search_st( ld, dn, LDAP_SCOPE_BASE, NULL,
 	    attrs, 0, &timeout, &res )) != LDAP_SUCCESS ) {
 		if ( rc == LDAP_NO_SUCH_OBJECT ) {
-			add_error( err, nerr, E_BADMEMBER, dn, NULLMSG );
+			add_error( err, nerr, E_BADMEMBER, dn, NULL );
 
 			return;
 		} else {
@@ -886,7 +883,7 @@ add_member(
 			ldap_value_free( mail );
 			ldap_msgfree( res );
 		} else {
-			add_error( err, nerr, E_MEMBERNOFAXNUM, ndn, NULLMSG );
+			add_error( err, nerr, E_MEMBERNOFAXNUM, ndn, NULL );
 		}
 		break;
 	case MAIL500 :
@@ -898,7 +895,7 @@ add_member(
 
 		/* else generate a bounce */
 		} else {
-			add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULLMSG );
+			add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULL );
 		}
 
 		free( ndn );
@@ -924,7 +921,7 @@ do_group_request(
 
 		ldap_value_free( requeststo );
 	} else {
-		add_error( err, nerr, E_NOREQUEST, dn, NULLMSG );
+		add_error( err, nerr, E_NOREQUEST, dn, NULL );
 	}
 }
 
@@ -946,7 +943,7 @@ do_group_errors(
 
 		ldap_value_free( errorsto );
 	} else {
-		add_error( err, nerr, E_NOERRORS, dn, NULLMSG );
+		add_error( err, nerr, E_NOERRORS, dn, NULL );
 	}
 }
 
@@ -1148,7 +1145,7 @@ do_noemailorfax( FILE *fp, Error *err, int namelen, int errtype )
 		    != NULL ) {
 			for ( i = 0; vals[i]; i++ ) {
 				last = strlen( vals[i] ) - 1;
-				if ( isdigit( vals[i][last] ) ) {
+				if ( isdigit((unsigned char) vals[i][last]) ) {
 					rdn = strdup( vals[i] );
 					break;
 				}
@@ -1186,7 +1183,7 @@ do_noemailorfax( FILE *fp, Error *err, int namelen, int errtype )
 		for ( i = 0; vals[0][i] != '\0'; i++ ) {
 			if ( vals[0][i] == '$' ) {
 				fprintf( fp, "\n%*s  ", namelen, " " );
-				while ( isspace( vals[0][i+1] ) )
+				while ( isspace((unsigned char) vals[0][i+1]) )
 					i++;
 			} else {
 				fprintf( fp, "%c", vals[0][i] );
@@ -1235,7 +1232,7 @@ do_ambiguous( FILE *fp, Error *err, int namelen )
 			if ( (vals = ldap_get_values( ld, e, "cn" )) != NULL ) {
 				for ( i = 0; vals[i]; i++ ) {
 					last = strlen( vals[i] ) - 1;
-					if ( isdigit( vals[i][last] ) ) {
+					if ( isdigit((unsigned char) vals[i][last]) ) {
 						rdn = strdup( vals[i] );
 						break;
 					}
@@ -1467,7 +1464,7 @@ get_attributes_mail_dn( LDAPMessage *e, char *attr1, char *attr2 )
 
 		for ( i = 0; dnlist[i] != NULL; i++ ) {
 			if ( (rc = ldap_search_st( ld, dnlist[i],
-			    LDAP_SCOPE_BASE, "(objectclass=*)", attrs, 0,
+			    LDAP_SCOPE_BASE, NULL, attrs, 0,
 			    &timeout, &res )) != LDAP_SUCCESS ) {
 				if ( rc != LDAP_NO_SUCH_OBJECT ) {
 					unbind_and_exit( EX_TEMPFAIL );