X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ftest.c;h=793bed66c6d69a6df4d82e43049f22bf864c5d98;hb=bcf8f7eeb788faa25efe0ea78e66e83e9d9b4d73;hp=650ad2128d0b9cf6b341fbe3f0f12017874c9f11;hpb=894b74d730b26a6fdfc3a92f8c998dc9da059f16;p=openldap

diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c
index 650ad2128d..793bed66c6 100644
--- a/libraries/libldap/test.c
+++ b/libraries/libldap/test.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -234,7 +235,7 @@ bind_prompt( LDAP *ld, char **dnp, char **passwdp, int *authmethodp,
 	static char	dn[256], passwd[256];
 
 	if ( !freeit ) {
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 		getline( dn, sizeof(dn), stdin,
 		    "re-bind method (0->simple, 1->krbv41, 2->krbv42, 3->krbv41&2)? " );
 		if (( *authmethodp = atoi( dn )) == 3 ) {
@@ -242,9 +243,9 @@ bind_prompt( LDAP *ld, char **dnp, char **passwdp, int *authmethodp,
 		} else {
 			*authmethodp |= 0x80;
 		}
-#else /* HAVE_KERBEROS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 		*authmethodp = LDAP_AUTH_SIMPLE;
-#endif /* HAVE_KERBEROS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 
 		getline( dn, sizeof(dn), stdin, "re-bind dn? " );
 		strcat( dn, dnsuffix );
@@ -343,7 +344,7 @@ main( int argc, char **argv )
 
 	if ( errflg || optind < argc - 1 ) {
 		fprintf( stderr, usage, argv[ 0 ] );
-		exit( 1 );
+		exit( EXIT_FAILURE );
 	}
 	
 	printf( "%s( %s, %d )\n",
@@ -360,14 +361,14 @@ main( int argc, char **argv )
 
 	if ( ld == NULL ) {
 		perror( cldapflg ? "cldap_open" : "ldap_init" );
-		exit(1);
+		exit( EXIT_FAILURE );
 	}
 
 	if ( copyfname != NULL ) {
 		if ( (ld->ld_sb.sb_fd = open( copyfname, O_WRONLY | O_CREAT,
 		    0600 ))  == -1 ) {
 			perror( copyfname );
-			exit ( 1 );
+			exit ( EXIT_FAILURE );
 		}
 		ld->ld_sb.sb_options = copyoptions;
 	}
@@ -412,13 +413,13 @@ main( int argc, char **argv )
 			break;
 
 		case 'b':	/* asynch bind */
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 			getline( line, sizeof(line), stdin,
 			    "method (0->simple, 1->krbv41, 2->krbv42)? " );
 			method = atoi( line ) | 0x80;
-#else /* HAVE_KERBEROS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 			method = LDAP_AUTH_SIMPLE;
-#endif /* HAVE_KERBEROS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 			getline( dn, sizeof(dn), stdin, "dn? " );
 			strcat( dn, dnsuffix );
 
@@ -438,7 +439,7 @@ main( int argc, char **argv )
 			break;
 
 		case 'B':	/* synch bind */
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 			getline( line, sizeof(line), stdin,
 			    "method 0->simple 1->krbv41 2->krbv42 3->krb? " );
 			method = atoi( line );
@@ -446,9 +447,9 @@ main( int argc, char **argv )
 				method = LDAP_AUTH_KRBV4;
 			else
 				method = method | 0x80;
-#else /* HAVE_KERBEROS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 			method = LDAP_AUTH_SIMPLE;
-#endif /* HAVE_KERBEROS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 			getline( dn, sizeof(dn), stdin, "dn? " );
 			strcat( dn, dnsuffix );
 
@@ -549,7 +550,7 @@ main( int argc, char **argv )
 			if ( !cldapflg ) {
 				ldap_unbind( ld );
 			}
-			exit( 0 );
+			exit( EXIT_SUCCESS );
 			break;
 
 		case 'r':	/* result or remove */
@@ -889,7 +890,8 @@ handle_result( LDAP *ld, LDAPMessage *lm )
 		break;
 
 	default:
-		printf( "Unknown result type 0x%x\n", lm->lm_msgtype );
+		printf( "Unknown result type 0x%lx\n",
+		        (unsigned long) lm->lm_msgtype );
 		print_ldap_result( ld, lm, "unknown" );
 	}
 }
@@ -954,7 +956,7 @@ print_search_entry( LDAP *ld, LDAPMessage *res )
 					if ( nonascii ) {
 						printf( "\t\t\tlength (%ld) (not ascii)\n", vals[i]->bv_len );
 #ifdef BPRINT_NONASCII
-						lber_bprint( vals[i]->bv_val,
+						ber_bprint( vals[i]->bv_val,
 						    vals[i]->bv_len );
 #endif /* BPRINT_NONASCII */
 						continue;