Add whoami.c and passwd.c and other minor tweaks to control cleanups

clients/tools/ldapsearch.c

@@ -1448,7 +1448,7 @@ done:
 	return( rc );
 }
 
-#if 0
+#if 1
 /* This is the original version, the old way of doing things. */
 static void
 print_entry(
@@ -1607,7 +1607,8 @@ print_entry(
 
 	if ( attrsonly ) bvp = NULL;
 
-	for ( rc = ldap_get_attribute_ber( ld, entry, ber, &bv, bvp ); rc == LDAP_SUCCESS;
+	for ( rc = ldap_get_attribute_ber( ld, entry, ber, &bv, bvp );
+		rc == LDAP_SUCCESS;
 		rc = ldap_get_attribute_ber( ld, entry, ber, &bv, bvp ) )
 	{
 		if (bv.bv_val == NULL) break;

clients/tools/ldapwhoami.c

@@ -720,7 +720,7 @@ main( int argc, char *argv[] )
 		}
 	}
 
-#if 1
+#if 0
 	rc = ldap_whoami_s( ld, &retdata, NULL, NULL ); 
 
 #else

libraries/libldap/Makefile.in

@@ -12,7 +12,7 @@ SRCS	= bind.c open.c result.c error.c compare.c search.c \
 	controls.c messages.c references.c extended.c cyrus.c \
 	modify.c add.c modrdn.c delete.c abandon.c cache.c \
 	sasl.c sbind.c kbind.c unbind.c \
-	filter.c free.c sort.c \
+	filter.c free.c sort.c passwd.c whoami.c \
 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
 	init.c options.c print.c string.c util-int.c schema.c \
@@ -21,7 +21,7 @@ OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
 	modify.lo add.lo modrdn.lo delete.lo abandon.lo cache.lo \
 	sasl.lo sbind.lo kbind.lo unbind.lo \
-	filter.lo free.lo sort.lo \
+	filter.lo free.lo sort.lo passwd.lo whoami.lo \
 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \

libraries/libldap_r/Makefile.in

@@ -14,7 +14,7 @@ XXSRCS    = apitest.c test.c \
 	controls.c messages.c references.c extended.c cyrus.c \
 	modify.c add.c modrdn.c delete.c abandon.c cache.c \
 	sasl.c sbind.c kbind.c unbind.c \
-	filter.c free.c sort.c \
+	filter.c free.c sort.c passwd.c whoami.c \
 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
 	request.c os-ip.c url.c sortctrl.c vlvctrl.c \
 	init.c options.c print.c string.c util-int.c schema.c \
@@ -29,7 +29,7 @@ OBJS	= threads.lo rdwr.lo tpool.lo  \
 	controls.lo messages.lo references.lo extended.lo cyrus.lo \
 	modify.lo add.lo modrdn.lo delete.lo abandon.lo cache.lo \
 	sasl.lo sbind.lo kbind.lo unbind.lo \
-	filter.lo free.lo sort.lo \
+	filter.lo free.lo sort.lo passwd.lo whoami.lo \
 	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
 	request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \