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

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 6d15747cf844fb185fc8d62a93af0bdb74ff46dc..0c0c06b4eb951c083ba17115279738598410a9f9 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/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;

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 7cdbe998bd0451f67595c15996057edbb656408d..666f2acc774a38b7e9585da10687fba0fa039f74 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/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

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 5ffd498120e968fab8a00d57fb7f11318c394526..a3233b110c8c32bd0061592f3314705d006ba8a2 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/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 \

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
index fdb8a8d3092b9f00de869cc58526d8b49a7c8774..4126c583b1bb05cee41a727bd750a68c2b3a2694 100644 (file)
--- a/libraries/libldap_r/Makefile.in
+++ b/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 \