From 5fe7d38e1c3d6d477fd9b0565570a658bf20270d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 28 Nov 2002 02:44:38 +0000 Subject: [PATCH] Add whoami.c and passwd.c and other minor tweaks to control cleanups --- clients/tools/ldapsearch.c | 5 +++-- clients/tools/ldapwhoami.c | 2 +- libraries/libldap/Makefile.in | 4 ++-- libraries/libldap_r/Makefile.in | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 6d15747cf8..0c0c06b4eb 100644 --- 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 7cdbe998bd..666f2acc77 100644 --- 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 5ffd498120..a3233b110c 100644 --- 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 fdb8a8d309..4126c583b1 100644 --- 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 \ -- 2.39.5