clients/tools/ldapwhoami.c

@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -62,7 +62,7 @@ usage( void )
 
 
 const char options[] = ""
-	"d:D:e:h:H:InO:o:p:QR:U:vVw:WxX:y:Y:Z";
+	"d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )
@@ -111,10 +111,9 @@ main( int argc, char *argv[] )
 	int		rc;
 	LDAP		*ld = NULL;
 	char		*matcheddn = NULL, *text = NULL, **refs = NULL;
-	char		*retoid = NULL;
-	struct berval	*retdata = NULL;
+	struct berval	*authzid = NULL;
 	int		id, code = 0;
-	LDAPMessage	*res;
+	LDAPMessage	*res = NULL;
 	LDAPControl	**ctrls = NULL;
 
 	tool_init( TOOL_WHOAMI );
@@ -129,16 +128,6 @@ main( int argc, char *argv[] )
 		usage();
 	}
 
-	if ( pw_file || want_bindpw ) {
-		if ( pw_file ) {
-			rc = lutil_get_filed_password( pw_file, &passwd );
-			if( rc ) return EXIT_FAILURE;
-		} else {
-			passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
-			passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
-		}
-	}
-
 	ld = tool_conn_setup( 0, 0 );
 
 	tool_bind( ld );
@@ -192,23 +181,24 @@ main( int argc, char *argv[] )
 		goto skip;
 	}
 
-	rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+	rc = ldap_parse_whoami( ld, res, &authzid );
 
 	if( rc != LDAP_SUCCESS ) {
-		tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+		tool_perror( "ldap_parse_whoami", rc, NULL, NULL, NULL, NULL );
 		rc = EXIT_FAILURE;
 		goto skip;
 	}
 
-	if( retdata != NULL ) {
-		if( retdata->bv_len == 0 ) {
+	if( authzid != NULL ) {
+		if( authzid->bv_len == 0 ) {
 			printf(_("anonymous\n") );
 		} else {
-			printf("%s\n", retdata->bv_val );
+			printf("%s\n", authzid->bv_val );
 		}
 	}
 
 skip:
+	ldap_msgfree(res);
 	if ( verbose || ( code != LDAP_SUCCESS ) ||
 		matcheddn || text || refs || ctrls )
 	{
@@ -238,8 +228,7 @@ skip:
 	ber_memfree( text );
 	ber_memfree( matcheddn );
 	ber_memvfree( (void **) refs );
-	ber_memfree( retoid );
-	ber_bvfree( retdata );
+	ber_bvfree( authzid );
 
 	/* disconnect from server */
 	tool_unbind( ld );

contrib/ConfigOIDs

@@ -2,3 +2,6 @@ List of OpenLDAP Configuration OIDs allocated to contrib modules
 
 OLcfgCt{Oc|At}:1	smbk5pwd
 OLcfgCt{Oc|At}:2	autogroup
+OLcfgCt{Oc|At}:3	nssov
+OLcfgCt{Oc|At}:4	cloak
+OLcfgCt{Oc|At}:5	lastbind

contrib/README

 OpenLDAP Contributed Software README
 
 OpenLDAP Project provides a number of freely-distributable LDAP
-software packages.  Though distributed with OpenLDAP Software, they
-are not part of OpenLDAP Software.  Some packages may be out of
-date.  Each package in this directory has it's own use and
-redistribution restrictions as documented within the package.
+software packages.  While distributed as part of OpenLDAP Software,
+they are not necessarily supported by the OpenLDAP Project.  Some
+packages may be out of date.  Each package in this directory has its
+own use and may have different redistribution restrictions than typical
+for OpenLDAP Software.
 
 Current contributions:
 	ldapc++

contrib/ldapc++/COPYRIGHT

-Copyright 1998-2008 The OpenLDAP Foundation
+Copyright 1998-2011 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

contrib/ldapc++/Makefile.am

 # $OpenLDAP$
 
 ##
-# Copyright 2000-2003, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 
-EXTRA_DIST = BUGS
+EXTRA_DIST=COPYRIGHT doxygen.rc LICENSE version.var version.sh
 SUBDIRS = src examples
 

contrib/ldapc++/doxygen.rc

@@ -262,7 +262,7 @@ EXTRACT_ALL            = YES
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation.
 
-EXTRACT_PRIVATE        = YES
+EXTRACT_PRIVATE        = NO
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
@@ -273,7 +273,7 @@ EXTRACT_STATIC         = NO
 # defined locally in source files will be included in the documentation. 
 # If set to NO only classes defined in header files are included.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. When set to YES local 
 # methods, which are defined in the implementation section but not in 

contrib/ldapc++/examples/Makefile.am

@@ -5,7 +5,7 @@
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 AM_CPPFLAGS = -I$(top_srcdir)/src
-noinst_PROGRAMS = main readSchema urlTest
+noinst_PROGRAMS = main readSchema startTls urlTest
 
 main_SOURCES = main.cpp
 main_LDADD = ../src/libldapcpp.la
@@ -13,5 +13,8 @@ main_LDADD = ../src/libldapcpp.la
 readSchema_SOURCES = readSchema.cpp
 readSchema_LDADD = ../src/libldapcpp.la
 
+startTls_SOURCES = startTls.cpp
+startTls_LDADD = ../src/libldapcpp.la
+
 urlTest_SOURCES = urlTest.cpp
 urlTest_LDADD = ../src/libldapcpp.la