X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fapitest.c;h=b14f563d4bfdf62671a2efa8d811193ba9a19f60;hb=53da7b6cda5429cdd7996f6407e2eb883d142f6c;hp=f83710d74e9537ff900d862f5ea2fdbf9e1e4319;hpb=b06e8682a9c6aaf1e98235534583b4a8fab31e57;p=openldap

diff --git a/libraries/libldap/apitest.c b/libraries/libldap/apitest.c
index f83710d74e..b14f563d4b 100644
--- a/libraries/libldap/apitest.c
+++ b/libraries/libldap/apitest.c
@@ -1,46 +1,66 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * OpenLDAP API Test
  *	Written by: Kurt Zeilenga
  *
- * This program is designed to test libldap API for conformance
- * to draft-api-ldapext-ldap-c-api-01.txt.
+ * This program is designed to test API features of implementations
+ * of the IETF draft specifications.
+ *
  */
 #include "portable.h"
 
+#include <ac/stdlib.h>
+
 #include <stdio.h>
-#include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
+#include <ldap.h>
 
-void
+int
 main(int argc, char **argv)
 {
 	LDAPAPIInfo api;
 	int ival;
-	int sval;
+	char *sval;
+
+	printf("Compile time API Information\n");
 
 #ifdef LDAP_API_INFO_VERSION
 	api.ldapai_info_version = LDAP_API_INFO_VERSION;
+	printf("  API Info version:  %d\n", (int) api.ldapai_info_version);
 #else
 	api.ldapai_info_version = 1;
+	printf("  API Info version:  unknown\n");
+#endif
+
+#ifdef LDAP_FEATURE_INFO_VERSION
+	printf("  Feature Info version:  %d\n", (int) LDAP_FEATURE_INFO_VERSION);
+#else
+	printf("  Feature Info version:  unknown\n");
+	api.ldapai_info_version = 1;
+#endif
+
+#ifdef LDAP_API_VERSION
+	printf("  API version:       %d\n", (int) LDAP_API_VERSION);
+#else
+	printf("  API version:       unknown\n");
 #endif
 
-	printf("Compile time API Information\n");
-	printf("  API Info version:  %d\n", api.ldapai_info_version);
-	printf("  API version:       %d\n", LDAP_API_VERSION);
 #ifdef LDAP_VERSION
-	printf("  Protocol Version:  %d\n", LDAP_VERSION);
+	printf("  Protocol Version:  %d\n", (int) LDAP_VERSION);
 #else
 	printf("  Protocol Version:  unknown\n");
 #endif
 #ifdef LDAP_VERSION_MIN
-	printf("  Protocol Min:      %d\n", LDAP_VERSION_MIN);
+	printf("  Protocol Min:      %d\n", (int) LDAP_VERSION_MIN);
 #else
 	printf("  Protocol Min:      unknown\n");
 #endif
 #ifdef LDAP_VERSION_MAX
-	printf("  Protocol Max:      %d\n", LDAP_VERSION_MAX);
+	printf("  Protocol Max:      %d\n", (int) LDAP_VERSION_MAX);
 #else
 	printf("  Protocol Max:      unknown\n");
 #endif
@@ -50,22 +70,23 @@ main(int argc, char **argv)
 	printf("  Vendor Name:       unknown\n");
 #endif
 #ifdef LDAP_VENDOR_VERSION
-	printf("  Vendor Version:    %d\n", LDAP_VENDOR_VERSION);
+	printf("  Vendor Version:    %d\n", (int) LDAP_VENDOR_VERSION);
 #else
 	printf("  Vendor Version:    unknown\n");
 #endif
 
 	if(ldap_get_option(NULL, LDAP_OPT_API_INFO, &api) != LDAP_SUCCESS) {
-		fprintf(stderr, "%s: ldap_get_option(api) failed", argv[0]);
-		exit(-1);
+		fprintf(stderr, "%s: ldap_get_option(API_INFO) failed\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 
 	printf("\nExecution time API Information\n");
 	printf("  API Info version:  %d\n", api.ldapai_info_version);
 
 	if (api.ldapai_info_version != LDAP_API_INFO_VERSION) {
-		printf(" API INFO version mismatch!");
-		exit(-1);
+		printf(" API INFO version mismatch: got %d, expected %d\n",
+			api.ldapai_info_version, LDAP_API_INFO_VERSION);
+		return EXIT_FAILURE;
 	}
 
 	printf("  API Version:       %d\n", api.ldapai_api_version);
@@ -76,35 +97,96 @@ main(int argc, char **argv)
 
 	} else {
 		int i;
+		for(i=0; api.ldapai_extensions[i] != NULL; i++) /* empty */;
+		printf("  Extensions:        %d\n", i);
 		for(i=0; api.ldapai_extensions[i] != NULL; i++) {
+#ifdef LDAP_OPT_API_FEATURE_INFO
+			LDAPAPIFeatureInfo fi;
+			fi.ldapaif_info_version = LDAP_FEATURE_INFO_VERSION;
+			fi.ldapaif_name = api.ldapai_extensions[i];
+			fi.ldapaif_version = 0;
+
+			if( ldap_get_option(NULL, LDAP_OPT_API_FEATURE_INFO, &fi) == LDAP_SUCCESS ) {
+				if(fi.ldapaif_info_version != LDAP_FEATURE_INFO_VERSION) {
+					printf("                     %s feature info mismatch: got %d, expected %d\n",
+						api.ldapai_extensions[i],
+						LDAP_FEATURE_INFO_VERSION,
+						fi.ldapaif_info_version);
+
+				} else {
+					printf("                     %s: version %d\n",
+						fi.ldapaif_name,
+						fi.ldapaif_version);
+				}
+
+			} else {
+				printf("                     %s (NO FEATURE INFO)\n",
+					api.ldapai_extensions[i]);
+			}
+
+#else
 			printf("                     %s\n",
 				api.ldapai_extensions[i]);
+#endif
+
+			ldap_memfree(api.ldapai_extensions[i]);
 		}
-		printf("  #Extensions:       %d\n", i);
+		ldap_memfree(api.ldapai_extensions);
 	}
 
 	printf("  Vendor Name:       %s\n", api.ldapai_vendor_name);
+	ldap_memfree(api.ldapai_vendor_name);
+
 	printf("  Vendor Version:    %d\n", api.ldapai_vendor_version);
 
 	printf("\nExecution time Default Options\n");
 
 	if(ldap_get_option(NULL, LDAP_OPT_DEREF, &ival) != LDAP_SUCCESS) {
-		fprintf(stderr, "%s: ldap_get_option(api) failed", argv[0]);
-		exit(-1);
+		fprintf(stderr, "%s: ldap_get_option(api) failed\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 	printf("  DEREF:             %d\n", ival);
 
 	if(ldap_get_option(NULL, LDAP_OPT_SIZELIMIT, &ival) != LDAP_SUCCESS) {
-		fprintf(stderr, "%s: ldap_get_option(sizelimit) failed", argv[0]);
-		exit(-1);
+		fprintf(stderr, "%s: ldap_get_option(sizelimit) failed\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 	printf("  SIZELIMIT:         %d\n", ival);
 
 	if(ldap_get_option(NULL, LDAP_OPT_TIMELIMIT, &ival) != LDAP_SUCCESS) {
-		fprintf(stderr, "%s: ldap_get_option(timelimit) failed", argv[0]);
-		exit(-1);
+		fprintf(stderr, "%s: ldap_get_option(timelimit) failed\n", argv[0]);
+		return EXIT_FAILURE;
 	}
 	printf("  TIMELIMIT:         %d\n", ival);
 
-	exit(0);
+	if(ldap_get_option(NULL, LDAP_OPT_REFERRALS, &ival) != LDAP_SUCCESS) {
+		fprintf(stderr, "%s: ldap_get_option(referrals) failed\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+	printf("  REFERRALS:         %s\n", ival ? "on" : "off");
+
+	if(ldap_get_option(NULL, LDAP_OPT_RESTART, &ival) != LDAP_SUCCESS) {
+		fprintf(stderr, "%s: ldap_get_option(restart) failed\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+	printf("  RESTART:           %s\n", ival ? "on" : "off");
+
+	if(ldap_get_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &ival) != LDAP_SUCCESS) {
+		fprintf(stderr, "%s: ldap_get_option(protocol version) failed\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+	printf("  PROTOCOL VERSION:  %d\n", ival);
+
+	if(ldap_get_option(NULL, LDAP_OPT_HOST_NAME, &sval) != LDAP_SUCCESS) {
+		fprintf(stderr, "%s: ldap_get_option(host name) failed\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+	if( sval != NULL ) {
+		printf("  HOST NAME:         %s\n", sval);
+		ldap_memfree(sval);
+	} else {
+		puts("  HOST NAME:         <not set>");
+	}
+
+	return EXIT_SUCCESS;
 }