[Fedora-directory-commits] ldapserver/ldap/servers/slapd proto-slap.h, 1.40, 1.41 slapi-plugin.h, 1.32, 1.33 slapi2nspr.c, 1.6, 1.7 ssl.c, 1.18, 1.19 util.c, 1.16, 1.17

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9401/ldapserver/ldap/servers/slapd

Modified Files:
	proto-slap.h slapi-plugin.h slapi2nspr.c ssl.c util.c 
Log Message:
Resolves: bug 469261
Bug Description: Support server-to-server SASL - part 1
Reviewed by: nkinder, nhosoi, ssorce (Thanks!)
Fix Description: I've created two new functions to handle the client side of LDAP in
the server - slapi_ldap_init_ext and slapi_ldap_bind.  These two functions are designed to
work with any connection type (ldap, ldaps, ldap+starttls, and eventually ldapi) and bind
type (plain, sasl, client cert).  The secure flag has been extended to use a value of 2 to
mean use startTLS.  One tricky part is that there is no place to store the startTLS flag
in init to pass to bind, so we store that in the clientcontrols field which is currently
unused.  We do that because the semantics of ldap_init are not to do any network traffic,
but defer that until the bind operation (or whatever the first actual operation is e.g.
start_tls).  I plan to replace all of the places in the code that do ldap init and bind
with these functions.
I started with replication.  I extended the transport to add tls for startTLS and the bind
method to add sasl/gssapi and sasl/digest-md5.  I removed a lot of code from
repl5_connection that is now done with just slapi_ldap_init_ext and slapi_ldap_bind.  One
tricky part of the replication code is that it polls the connection for write available,
using some ldap sdk internals.  I had to fix that code to work within the public ldap api
since nspr and sasl muck with the internals in different incompatible ways.
Finally, there is a lot of new kerberos code in the server.  The way the server does
sasl/gssapi auth with its keytab is similar to the way it does client cert auth with its
ssl server cert.  One big difference is that the server cannot pass the kerberos identity
and credentials through the ldap/sasl/gssapi layers directly.  Instead, we have to create
a memory credentials cache and set the environment variable to point to it.  This allows
the sasl/gssapi layer to grab the credentials for use with kerberos.  The way the code is
written, it should also allow "external" kerberos auth e.g. if someone really
wants to do some script which does a periodic kinit to refresh the file based cache, that
should also work.
I added some kerberos configure options.  configure tries to first use krb5-config to get
the compiler and linker information.  If that fails, it just looks for some standard
system libraries.  Note that Solaris does not allow direct use of the kerberos api until
Solaris 11, so most likely Solaris builds will have to use --without-kerberos
(--with-kerberos is on by default).
Fixed a bug in kerberos.m4 found by nkinder.
ssorce has pointed out a few problems with my kerberos usage that will be addressed in the
next patch.
Changed the log level in ldap_sasl_get_val - pointed out by nkinder
Platforms tested: Fedora 9, Fedora 8
Flag Day: yes
Doc impact: oh yes



Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- proto-slap.h	24 Oct 2008 22:36:58 -0000	1.40
+++ proto-slap.h	4 Nov 2008 18:23:08 -0000	1.41
@@ -904,6 +904,7 @@
 int slapd_security_library_is_initialized();
 int slapd_ssl_listener_is_initialized();
 int sasl_io_cleanup(Connection *c);
+int slapd_SSL_client_auth (LDAP* ld);
 
 /*
  * security_wrappers.c
@@ -1279,6 +1280,15 @@
 char **ids_sasl_listmech(Slapi_PBlock *pb);
 void ids_sasl_check_bind(Slapi_PBlock *pb);
 void ids_sasl_server_new(Connection *conn);
+int slapd_ldap_sasl_interactive_bind(
+    LDAP *ld, /* ldap connection */
+    const char *bindid, /* usually a bind DN for simple bind */
+    const char *creds, /* usually a password for simple bind */
+    const char *mech, /* name of mechanism */
+    LDAPControl **serverctrls, /* additional controls to send */
+    LDAPControl ***returnedctrls, /* returned controls */
+    int *msgidp /* pass in non-NULL for async handling */
+);
 
 /*
  * sasl_io.c


Index: slapi-plugin.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- slapi-plugin.h	17 Oct 2008 22:12:47 -0000	1.32
+++ slapi-plugin.h	4 Nov 2008 18:23:08 -0000	1.33
@@ -1084,6 +1084,27 @@
  */
 LDAP *slapi_ldap_init( char *ldaphost, int ldapport, int secure, int shared );
 void slapi_ldap_unbind( LDAP *ld );
+LDAP *
+slapi_ldap_init_ext(
+    const char *ldapurl, /* full ldap url */
+    const char *hostname, /* can also use this to override
+                             host in url */
+    int port, /* can also use this to override port in url */
+    int secure, /* 0 for ldap, 1 for ldaps, 2 for starttls -
+                   override proto in url */
+    int shared, /* if true, LDAP* will be shared among multiple threads */
+    const char *filename /* for ldapi */
+);
+int
+slapi_ldap_bind(
+    LDAP *ld, /* ldap connection */
+    const char *bindid, /* usually a bind DN for simple bind */
+    const char *creds, /* usually a password for simple bind */
+    const char *mech, /* name of mechanism */
+    LDAPControl **serverctrls, /* additional controls to send */
+    LDAPControl ***returnedctrls, /* returned controls */
+    int *msgidp /* pass in non-NULL for async handling */
+);
 
 
 /*


Index: slapi2nspr.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi2nspr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapi2nspr.c	15 Oct 2008 06:30:05 -0000	1.6
+++ slapi2nspr.c	4 Nov 2008 18:23:08 -0000	1.7
@@ -46,9 +46,6 @@
  */
 
 #include "slap.h"
-#include "snmp_collator.h"
-#include <ldap_ssl.h>
-#include <ldappr.h>
 #include <nspr.h>
 
 /*
@@ -213,127 +210,3 @@
 
     return( prrc == PR_SUCCESS ? 1 : 0 );
 }
-
-#ifdef MEMPOOL_EXPERIMENTAL
-void _free_wrapper(void *ptr)
-{
-    slapi_ch_free(&ptr);
-}
-#endif
-
-/*
- * Function: slapi_ldap_init()
- * Description: just like ldap_ssl_init() but also arranges for the LDAP
- *	session handle returned to be safely shareable by multiple threads
- *	if "shared" is non-zero.
- * Returns:
- *	an LDAP session handle (NULL if some local error occurs).
- */
-LDAP *
-slapi_ldap_init( char *ldaphost, int ldapport, int secure, int shared )
-{
-    LDAP			*ld;
-    int				io_timeout_ms;
-
-
-    if ( secure && slapd_SSL_client_init() != 0 ) {
-	return( NULL );
-    }
-
-    /*
-     * Leverage the libprldap layer to take care of all the NSPR integration.
-     * Note that ldapssl_init() uses libprldap implicitly.
-     */
-
-#ifdef MEMPOOL_EXPERIMENTAL
-    {
-    /* 
-     * slapi_ch_malloc functions need to be set to LDAP C SDK
-     */
-    struct ldap_memalloc_fns memalloc_fns;
-    memalloc_fns.ldapmem_malloc = (LDAP_MALLOC_CALLBACK *)slapi_ch_malloc;
-    memalloc_fns.ldapmem_calloc = (LDAP_CALLOC_CALLBACK *)slapi_ch_calloc;
-    memalloc_fns.ldapmem_realloc = (LDAP_REALLOC_CALLBACK *)slapi_ch_realloc;
-    memalloc_fns.ldapmem_free = (LDAP_FREE_CALLBACK *)_free_wrapper;
-    }
-    /* 
-     * MEMPOOL_EXPERIMENTAL: 
-     * These LDAP C SDK init function needs to be revisited.
-     * In ldap_init called via ldapssl_init and prldap_init initializes
-     * options and set default values including memalloc_fns, then it
-     * initializes as sasl client by calling sasl_client_init.  In
-     * sasl_client_init, it creates mechlist using the malloc function
-     * available at the moment which could mismatch the malloc/free functions
-     * set later.
-     */
-#endif
-    if ( secure ) {
-	ld = ldapssl_init( ldaphost, ldapport, secure );
-    } else {
-	ld = prldap_init( ldaphost, ldapport, shared );
-    }
-
-    /* Update snmp interaction table */
-    if ( ld == NULL) {
-	set_snmp_interaction_row( ldaphost, ldapport, -1);
-    } else {
-	set_snmp_interaction_row( ldaphost, ldapport, 0);
-    }
-
-    if ( ld != NULL ) {
-	/*
-	 * Set the outbound LDAP I/O timeout based on the server config.
-	 */
-	io_timeout_ms = config_get_outbound_ldap_io_timeout();
-	if ( io_timeout_ms > 0 ) {
-	    if ( prldap_set_session_option( ld, NULL, PRLDAP_OPT_IO_MAX_TIMEOUT,
-			io_timeout_ms ) != LDAP_SUCCESS ) {
-		slapi_log_error( SLAPI_LOG_FATAL, "slapi_ldap_init",
-			"failed: unable to set outbound I/O timeout to %dms\n",
-			io_timeout_ms );
-		slapi_ldap_unbind( ld );
-		return( NULL );
-	    }
-	}
-
-	/*
-	 * Set SSL strength (server certificate validity checking).
-	 */
-	if ( secure ) {
-	    int ssl_strength;
-
-	   if ( config_get_ssl_check_hostname()) {
-		/* check hostname against name in certificate */
-		ssl_strength = LDAPSSL_AUTH_CNCHECK;
-	    } else {
-		/* verify certificate only */
-		ssl_strength = LDAPSSL_AUTH_CERT;
-	    }
-
-	    if ( ldapssl_set_strength( ld, ssl_strength ) != 0 ) {
-		int	prerr = PR_GetError();
-
-		slapi_log_error( SLAPI_LOG_FATAL, "slapi_ldap_init",
-			"failed: unable to set SSL strength to %d ("
-			SLAPI_COMPONENT_NAME_NSPR " error %d - %s)",
-			ssl_strength, prerr, slapd_pr_strerror( prerr ));
-
-	    }
-	}
-    }
-
-    return( ld );
-}
-
-
-/*
- * Function: slapi_ldap_unbind()
- * Purpose: release an LDAP session obtained from a call to slapi_ldap_init().
- */
-void
-slapi_ldap_unbind( LDAP *ld )
-{
-    if ( ld != NULL ) {
-	ldap_unbind( ld );
-    }
-}


Index: ssl.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ssl.c	27 Aug 2008 21:56:07 -0000	1.18
+++ ssl.c	4 Nov 2008 18:23:08 -0000	1.19
@@ -1034,8 +1034,7 @@
 	}
     NSS_Init(certdbpath);
     SSL_OptionSetDefault(SSL_ENABLE_SSL2, PR_FALSE);
-	SSL_OptionSetDefault(SSL_ENABLE_SSLdirs
-3, PR_TRUE);
+	SSL_OptionSetDefault(SSL_ENABLE_SSL3, PR_TRUE);
 	s = NSS_SetDomesticPolicy(); 
 We already do pr_init, we don't need pr_setconcurrency, we already do nss_init and
the rest
 
@@ -1047,7 +1046,7 @@
     return 0;
 }
 
-static int
+int
 slapd_SSL_client_auth (LDAP* ld)
 {
     int rc = 0;


Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- util.c	30 Nov 2007 17:23:13 -0000	1.16
+++ util.c	4 Nov 2008 18:23:08 -0000	1.17
@@ -54,6 +54,9 @@
 #include "slap.h"
 #include "prtime.h"
 #include "prinrval.h"
+#include "snmp_collator.h"
+#include <ldap_ssl.h>
+#include <ldappr.h>
 
 #define UTIL_ESCAPE_NONE      0
 #define UTIL_ESCAPE_HEX       1
@@ -69,6 +72,11 @@
 #define _CSEP '/'
 #endif
 
+#ifdef HAVE_KRB5
+static void set_krb5_creds();
+#endif
+
+
 static int special_np(unsigned char c)
 {
 	if(c < 32 || c > 126) {
@@ -775,3 +783,1029 @@
 	slapi_ch_free_string(&norm_p1);
 	return rval;
 }
+
+#ifdef MEMPOOL_EXPERIMENTAL
+void _free_wrapper(void *ptr)
+{
+    slapi_ch_free(&ptr);
+}
+#endif
+
+/*
+ * Function: slapi_ldap_unbind()
+ * Purpose: release an LDAP session obtained from a call to slapi_ldap_init().
+ */
+void
+slapi_ldap_unbind( LDAP *ld )
+{
+    if ( ld != NULL ) {
+	ldap_unbind( ld );
+    }
+}
+
+const char *
+slapi_urlparse_err2string( int err )
+{
+    const char *s="internal error";
+
+    switch( err ) {
+    case 0:
+	s = "no error";
+	break;
+    case LDAP_URL_ERR_NOTLDAP:
+	s = "missing ldap:// or ldaps:// or ldapi://";
+	break;
+    case LDAP_URL_ERR_NODN:
+	s = "missing suffix";
+	break;
+    case LDAP_URL_ERR_BADSCOPE:
+	s = "invalid search scope";
+	break;
+    case LDAP_URL_ERR_MEM:
+	s = "unable to allocate memory";
+	break;
+    case LDAP_URL_ERR_PARAM:
+	s = "bad parameter to an LDAP URL function";
+	break;
+    }
+
+    return( s );
+}
+
+/*
+  Perform LDAP init and return an LDAP* handle.  If ldapurl is given,
+  that is used as the basis for the protocol, host, port, and whether
+  to use starttls (given on the end as ldap://..../?????starttlsOID
+  If hostname is given, LDAP or LDAPS is assumed, and this will override
+  the hostname from the ldapurl, if any.  If port is > 0, this is the
+  port number to use.  It will override the port in the ldapurl, if any.
+  If no port is given in port or ldapurl, the default will be used based
+  on the secure setting (389 for ldap, 636 for ldaps, 389 for starttls)
+  secure takes 1 of 3 values - 0 means regular ldap, 1 means ldaps, 2
+  means regular ldap with starttls.
+  filename is the ldapi file name - if this is given, and no other options
+  are given, ldapi is assumed.
+ */
+LDAP *
+slapi_ldap_init_ext(
+    const char *ldapurl, /* full ldap url */
+    const char *hostname, /* can also use this to override
+			     host in url */
+    int port, /* can also use this to override port in url */
+    int secure, /* 0 for ldap, 1 for ldaps, 2 for starttls -
+		   override proto in url */
+    int shared, /* if true, LDAP* will be shared among multiple threads */
+    const char *filename /* for ldapi */
+)
+{
+    LDAPURLDesc	*ludp = NULL;
+    LDAP *ld = NULL;
+    int rc = 0;
+
+    /* if ldapurl is given, parse it */
+    if (ldapurl && ((rc = ldap_url_parse_no_defaults(ldapurl, &ludp, 0)) ||
+		    !ludp)) {
+	slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+			"Could not parse given LDAP URL [%s] : error [%s]\n",
+			ldapurl ? ldapurl : "NULL",
+			slapi_urlparse_err2string(rc));
+	goto done;
+    }
+
+    /* use url host if no host given */
+    if (!hostname && ludp && ludp->lud_host) {
+	hostname = ludp->lud_host;
+    }
+
+    /* use url port if no port given */
+    if (!port && ludp && ludp->lud_port) {
+	port = ludp->lud_port;
+    }
+
+    /* use secure setting from url if none given */
+    if (!secure && ludp) {
+	if (ludp->lud_options & LDAP_URL_OPT_SECURE) {
+	    secure = 1;
+	} else if (0/* starttls option - not supported yet in LDAP URLs */) {
+	    secure = 2;
+	}
+    }
+
+    /* ldap_url_parse doesn't yet handle ldapi */
+    /*
+      if (!filename && ludp && ludp->lud_file) {
+      filename = ludp->lud_file;
+      }
+    */
+
+#ifdef MEMPOOL_EXPERIMENTAL
+    {
+    /* 
+     * slapi_ch_malloc functions need to be set to LDAP C SDK
+     */
+    struct ldap_memalloc_fns memalloc_fns;
+    memalloc_fns.ldapmem_malloc = (LDAP_MALLOC_CALLBACK *)slapi_ch_malloc;
+    memalloc_fns.ldapmem_calloc = (LDAP_CALLOC_CALLBACK *)slapi_ch_calloc;
+    memalloc_fns.ldapmem_realloc = (LDAP_REALLOC_CALLBACK *)slapi_ch_realloc;
+    memalloc_fns.ldapmem_free = (LDAP_FREE_CALLBACK *)_free_wrapper;
+    }
+    /* 
+     * MEMPOOL_EXPERIMENTAL: 
+     * These LDAP C SDK init function needs to be revisited.
+     * In ldap_init called via ldapssl_init and prldap_init initializes
+     * options and set default values including memalloc_fns, then it
+     * initializes as sasl client by calling sasl_client_init.  In
+     * sasl_client_init, it creates mechlist using the malloc function
+     * available at the moment which could mismatch the malloc/free functions
+     * set later.
+     */
+#endif
+    if (filename) {
+	/* ldapi in mozldap client is not yet supported */
+    } else if (secure == 1) {
+	ld = ldapssl_init(hostname, port, secure);
+    } else { /* regular ldap and/or starttls */
+	/*
+	 * Leverage the libprldap layer to take care of all the NSPR
+	 * integration.
+	 * Note that ldapssl_init() uses libprldap implicitly.
+	 */
+	ld = prldap_init(hostname, port, shared);
+    }
+
+    /* Update snmp interaction table */
+    if (hostname) {
+	if (ld == NULL) {
+	    set_snmp_interaction_row((char *)hostname, port, -1);
+	} else {
+	    set_snmp_interaction_row((char *)hostname, port, 0);
+	}
+    }
+
+    if ((ld != NULL) && !filename) {
+	/*
+	 * Set the outbound LDAP I/O timeout based on the server config.
+	 */
+	int io_timeout_ms = config_get_outbound_ldap_io_timeout();
+	if (io_timeout_ms > 0) {
+	    if (prldap_set_session_option(ld, NULL, PRLDAP_OPT_IO_MAX_TIMEOUT,
+					  io_timeout_ms) != LDAP_SUCCESS) {
+		slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+				"failed: unable to set outbound I/O "
+				"timeout to %dms\n",
+				io_timeout_ms);
+		slapi_ldap_unbind(ld);
+		ld = NULL;
+		goto done;
+	    }
+	}
+
+	/*
+	 * Set SSL strength (server certificate validity checking).
+	 */
+	if (secure > 0) {
+	    int ssl_strength = 0;
+
+	    if (config_get_ssl_check_hostname()) {
+		/* check hostname against name in certificate */
+		ssl_strength = LDAPSSL_AUTH_CNCHECK;
+	    } else {
+		/* verify certificate only */
+		ssl_strength = LDAPSSL_AUTH_CERT;
+	    }
+
+	    if (ldapssl_set_strength(ld, ssl_strength) != 0) {
+		int prerr = PR_GetError();
+
+		slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+				"failed: unable to set SSL strength to %d ("
+				SLAPI_COMPONENT_NAME_NSPR " error %d - %s)",
+				ssl_strength, prerr,
+				slapd_pr_strerror(prerr));
+
+	    }
+	    if (secure == 1) {
+		/* tell bind code we are using SSL */
+		ldap_set_option(ld, LDAP_OPT_SSL, LDAP_OPT_ON);
+	    }
+	}
+    }
+
+    if (ld && (secure == 2)) {
+	/* We don't have a way to stash context data with the LDAP*, so we
+	   stash the information in the client controls (currently unused).
+	   We don't want to open the connection in ldap_init, since that's
+	   not the semantic - the connection is not usually opened until
+	   the first operation is sent, which is usually the bind - or
+	   in this case, the start_tls - so we stash the start_tls so
+	   we can do it in slapi_ldap_bind - note that this will get
+	   cleaned up when the LDAP* is disposed of
+	*/
+	LDAPControl start_tls_dummy_ctrl;
+	LDAPControl **clientctrls = NULL;
+
+	/* returns copy of controls */
+	ldap_get_option(ld, LDAP_OPT_CLIENT_CONTROLS, &clientctrls);
+
+	start_tls_dummy_ctrl.ldctl_oid = slapi_ch_strdup(START_TLS_OID);
+	start_tls_dummy_ctrl.ldctl_value.bv_val = NULL;
+	start_tls_dummy_ctrl.ldctl_value.bv_len = 0;
+	start_tls_dummy_ctrl.ldctl_iscritical = 0;
+	slapi_add_control_ext(&clientctrls, &start_tls_dummy_ctrl, 1);
+	/* set option frees old list and copies the new list */
+	ldap_set_option(ld, LDAP_OPT_CLIENT_CONTROLS, clientctrls);
+	ldap_controls_free(clientctrls); /* free the copy */
+    }
+
+done:
+    ldap_free_urldesc(ludp);
+
+    return( ld );
+}
+
+/*
+ * Function: slapi_ldap_init()
+ * Description: just like ldap_ssl_init() but also arranges for the LDAP
+ *	session handle returned to be safely shareable by multiple threads
+ *	if "shared" is non-zero.
+ * Returns:
+ *	an LDAP session handle (NULL if some local error occurs).
+ */
+LDAP *
+slapi_ldap_init( char *ldaphost, int ldapport, int secure, int shared )
+{
+    return slapi_ldap_init_ext(NULL, ldaphost, ldapport, secure, shared, NULL);
+}
+
+/*
+ * Does the correct bind operation simple/sasl/cert depending
+ * on the arguments passed in.  If the user specified to use
+ * starttls in init, this will do the starttls first.  If using
+ * ssl or client cert auth, this will initialize the client side
+ * of that.
+ */
+int
+slapi_ldap_bind(
+    LDAP *ld, /* ldap connection */
+    const char *bindid, /* usually a bind DN for simple bind */
+    const char *creds, /* usually a password for simple bind */
+    const char *mech, /* name of mechanism */
+    LDAPControl **serverctrls, /* additional controls to send */
+    LDAPControl ***returnedctrls, /* returned controls */
+    int *msgidp /* pass in non-NULL for async handling */
+)
+{
+    int rc = LDAP_SUCCESS;
+    LDAPControl **clientctrls = NULL;
+    int secure = 0;
+    struct berval bvcreds = {0, NULL};
+    LDAPMessage *result = NULL;
+    struct berval *servercredp = NULL;
+
+    /* do starttls if requested
+       NOTE - starttls is an extop, not a control, but we don't have
+       a place we can stash this information in the LDAP*, other
+       than the currently unused clientctrls */
+    ldap_get_option(ld, LDAP_OPT_CLIENT_CONTROLS, &clientctrls);
+    if (clientctrls && clientctrls[0] &&
+	slapi_control_present(clientctrls, START_TLS_OID, NULL, NULL)) {
+	secure = 2;
+    } else {
+	ldap_get_option(ld, LDAP_OPT_SSL, &secure);
+    }
+
+    if ((secure > 0) && mech && !strcmp(mech, LDAP_SASL_EXTERNAL)) {
+	/* SSL connections will use the server's security context
+	   and cert for client auth */
+	rc = slapd_SSL_client_auth(ld);
+
+	if (rc != 0) {
+	    slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+			    "Error: could not configure the server for cert "
+			    "auth - error %d - make sure the server is "
+			    "correctly configured for SSL/TLS\n", rc);
+	    goto done;
+	}
+	bvcreds.bv_val = NULL; /* ignore username and passed in creds */
+	bvcreds.bv_len = 0; /* for external auth */
+	bindid = NULL;
+    } else { /* other type of auth */
+	bvcreds.bv_val = (char *)creds;
+	bvcreds.bv_len = creds ? strlen(creds) : 0;
+    }
+
+    if (secure == 2) { /* send start tls */
+	rc = ldap_start_tls_s(ld, NULL /* serverctrls?? */, NULL);
+	if (LDAP_SUCCESS != rc) {
+	    slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+			    "Error: could not send startTLS request: "
+			    "error %d (%s)\n",
+			    rc, ldap_err2string(rc));
+	    goto done;
+	}
+    }
+
+    /* The connection has been set up - now do the actual bind, depending on
+       the mechanism and arguments */
+    if (!mech || (mech == LDAP_SASL_SIMPLE) ||
+	!strcmp(mech, LDAP_SASL_EXTERNAL)) {
+	int mymsgid = 0;
+
+	if ((rc = ldap_sasl_bind(ld, bindid, mech, &bvcreds, serverctrls,
+				 NULL /* clientctrls */, &mymsgid))) {
+	    slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+			    "Error: could not send bind request for id "
+			    "[%s] mech [%s]: error %d (%s)\n",
+			    bindid ? bindid : "(anon)",
+			    mech ? mech : "SIMPLE",
+			    rc, ldap_err2string(rc));
+	    goto done;
+	}
+
+	if (msgidp) { /* let caller process result */
+	    *msgidp = mymsgid;
+	} else { /* process results */
+	    if (ldap_result(ld, mymsgid, LDAP_MSG_ALL,
+			    (struct timeval *)0, &result) == -1) {
+		rc = ldap_get_lderrno(ld, NULL, NULL);
+		slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+				"Error reading bind response for id "
+				"[%s] mech [%s]: error %d (%s)\n",
+				bindid ? bindid : "(anon)",
+				mech ? mech : "SIMPLE",
+				rc, ldap_err2string(rc));
+		goto done;
+	    }                
+	    
+	    /* Get the controls sent by the server if requested */
+	    if (returnedctrls) {
+                if ((rc = ldap_parse_result(ld, result, &rc, NULL, NULL,
+					    NULL, returnedctrls,
+					    0)) != LDAP_SUCCESS) {
+		    slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+				    "Error: could not bind id "
+				    "[%s] mech [%s]: error %d (%s)\n",
+				    bindid ? bindid : "(anon)",
+				    mech ? mech : "SIMPLE",
+				    rc, ldap_err2string(rc));
+		    goto done;
+		}
+	    }
+
+	    /* parse the bind result and get the ldap error code */
+	    if ((rc = ldap_parse_sasl_bind_result(ld, result, &servercredp,
+						  0)) ||
+		(rc = ldap_result2error(ld, result, 0))) {
+		slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+				"Error: could not read bind results for id "
+				"[%s] mech [%s]: error %d (%s)\n",
+				bindid ? bindid : "(anon)",
+				mech ? mech : "SIMPLE",
+				rc, ldap_err2string(rc));
+		goto done;
+	    }
+	}
+    } else {
+	rc = slapd_ldap_sasl_interactive_bind(ld, bindid, creds, mech,
+					      serverctrls, returnedctrls,
+					      msgidp);
+	if (LDAP_SUCCESS != rc) {
+	    slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
+			    "Error: could not perform interactive bind for id "
+			    "[%s] mech [%s]: error %d (%s)\n",
+			    bindid ? bindid : "(anon)",
+			    mech ? mech : "SIMPLE",
+			    rc, ldap_err2string(rc));
+	}
+    }
+
+done:
+    slapi_ch_bvfree(&servercredp);
+    ldap_msgfree(result);
+
+    return rc;
+}
+
+/* the following implements the client side of sasl bind, for LDAP server
+   -> LDAP server SASL */
+#include <sasl.h>
+
+typedef struct {
+    char *mech;
+    char *authid;
+    char *username;
+    char *passwd;
+    char *realm;
+} ldapSaslInteractVals;
+
+static void *
+ldap_sasl_set_interact_vals(LDAP *ld, const char *mech, const char *authid,
+			    const char *username, const char *passwd,
+			    const char *realm)
+{
+    ldapSaslInteractVals *vals = NULL;
+
+    vals = (ldapSaslInteractVals *)
+        slapi_ch_calloc(1, sizeof(ldapSaslInteractVals));
+
+    if (!vals) {
+        return NULL;
+    }
+
+    if (mech) {
+        vals->mech = slapi_ch_strdup(mech);
+    } else {
+        ldap_get_option(ld, LDAP_OPT_X_SASL_MECH, &vals->mech);
+    }
+
+    if (authid) { /* use explicit passed in value */
+        vals->authid = slapi_ch_strdup(authid);
+    } else { /* use option value if any */
+        ldap_get_option(ld, LDAP_OPT_X_SASL_AUTHCID, &vals->authid);
+        if (!vals->authid) {
+/* get server user id? */
+            vals->authid = slapi_ch_strdup("");
+        }
+    }
+
+#ifdef HAVE_KRB5
+    if (mech && !strcmp(mech, "GSSAPI")) {
+        username = NULL; /* get from krb creds */
+    }
+#endif
+
+    if (username) { /* use explicit passed in value */
+        vals->username = slapi_ch_strdup(username);
+    } else { /* use option value if any */
+        ldap_get_option(ld, LDAP_OPT_X_SASL_AUTHZID, &vals->username);
+        if (!vals->username) { /* use default sasl value */
+            vals->username = slapi_ch_strdup("");
+        }
+    }
+
+    if (passwd) {
+        vals->passwd = slapi_ch_strdup(passwd);
+    } else {
+        vals->passwd = slapi_ch_strdup("");
+    }
+
+    if (realm) {
+        vals->realm = slapi_ch_strdup(realm);
+    } else {
+        ldap_get_option(ld, LDAP_OPT_X_SASL_REALM, &vals->realm);
+        if (!vals->realm) { /* use default sasl value */
+            vals->realm = slapi_ch_strdup("");
+        }
+    }
+
+#ifdef HAVE_KRB5
+    if (mech && !strcmp(mech, "GSSAPI")) {
+        set_krb5_creds();
+    }
+#endif /* HAVE_KRB5 */
+
+    return vals;
+}
+
+static void
+ldap_sasl_free_interact_vals(void *defaults)
+{
+    ldapSaslInteractVals *vals = defaults;
+
+    if (vals) {
+        slapi_ch_free_string(&vals->mech);
+        slapi_ch_free_string(&vals->authid);
+        slapi_ch_free_string(&vals->username);
+        slapi_ch_free_string(&vals->passwd);
+        slapi_ch_free_string(&vals->realm);
+        slapi_ch_free(&defaults);
+    }
+}
+
+static int 
+ldap_sasl_get_val(ldapSaslInteractVals *vals, sasl_interact_t *interact, unsigned flags)
+{
+    const char	*defvalue = interact->defresult;
+    int authtracelevel = SLAPI_LOG_SHELL; /* special auth tracing */
+
+    if (vals != NULL) {
+        switch(interact->id) {
+        case SASL_CB_AUTHNAME:
+            defvalue = vals->authid;
+            slapi_log_error(authtracelevel, "ldap_sasl_get_val",
+                            "Using value [%s] for SASL_CB_AUTHNAME\n",
+                            defvalue ? defvalue : "(null)");
+            break;
+        case SASL_CB_USER:
+            defvalue = vals->username;
+            slapi_log_error(authtracelevel, "ldap_sasl_get_val",
+                            "Using value [%s] for SASL_CB_USER\n",
+                            defvalue ? defvalue : "(null)");
+            break;
+        case SASL_CB_PASS:
+            defvalue = vals->passwd;
+            slapi_log_error(authtracelevel, "ldap_sasl_get_val",
+                            "Using value [%s] for SASL_CB_PASS\n",
+                            defvalue ? defvalue : "(null)");
+            break;
+        case SASL_CB_GETREALM:
+            defvalue = vals->realm;
+            slapi_log_error(authtracelevel, "ldap_sasl_get_val",
+                            "Using value [%s] for SASL_CB_GETREALM\n",
+                            defvalue ? defvalue : "(null)");
+            break;
+        }
+    }
+
+    if (defvalue != NULL) {
+        interact->result = defvalue;
+        if ((char *)interact->result == NULL)
+            return (LDAP_NO_MEMORY);
+        interact->len = strlen((char *)(interact->result));
+    }
+    return (LDAP_SUCCESS);
+}
+
+static int
+ldap_sasl_interact_cb(LDAP *ld, unsigned flags, void *defaults, void *prompts)
+{
+    sasl_interact_t *interact = NULL;
+    ldapSaslInteractVals *sasldefaults = defaults;
+    int rc;
+
+    if (prompts == NULL) {
+        return (LDAP_PARAM_ERROR);
+    }
+
+    for (interact = prompts; interact->id != SASL_CB_LIST_END; interact++) {
+        /* Obtain the default value */
+        if ((rc = ldap_sasl_get_val(sasldefaults, interact, flags)) != LDAP_SUCCESS) {
+            return (rc);
+        }
+    }
+
+    return (LDAP_SUCCESS);
+}
+
+int
+slapd_ldap_sasl_interactive_bind(
+    LDAP *ld, /* ldap connection */
+    const char *bindid, /* usually a bind DN for simple bind */
+    const char *creds, /* usually a password for simple bind */
+    const char *mech, /* name of mechanism */
+    LDAPControl **serverctrls, /* additional controls to send */
+    LDAPControl ***returnedctrls, /* returned controls */
+    int *msgidp /* pass in non-NULL for async handling */
+)
+{
+    int rc = LDAP_SUCCESS;
+    void *defaults = ldap_sasl_set_interact_vals(ld, mech, NULL, bindid,
+                                                 creds, NULL);
+    /* have to first set the defaults used by the callback function */
+    /* call the bind function */
+    rc = ldap_sasl_interactive_bind_ext_s(ld, bindid, mech, serverctrls,
+                                          NULL, LDAP_SASL_QUIET,
+                                          ldap_sasl_interact_cb, defaults,
+                                          returnedctrls);
+    ldap_sasl_free_interact_vals(defaults);
+    if (LDAP_SUCCESS != rc) {
+        slapi_log_error(SLAPI_LOG_FATAL, "slapd_ldap_sasl_interactive_bind",
+                        "Error: could not perform interactive bind for id "
+                        "[%s] mech [%s]: error %d (%s)\n",
+                        bindid ? bindid : "(anon)",
+                        mech ? mech : "SIMPLE",
+                        rc, ldap_err2string(rc));
+    }
+
+    return rc;
+}
+
+#ifdef HAVE_KRB5
+#include <krb5.h>
+
+/* for some reason this is not in the public API?
+   but it is documented e.g. man kinit */
+#ifndef KRB5_ENV_CCNAME
+#define KRB5_ENV_CCNAME "KRB5CCNAME"
+#endif
+
+static void
+show_one_credential(int authtracelevel,
+                    krb5_context ctx, krb5_creds *cred)
+{
+    char *logname = "show_one_credential";
+    krb5_error_code rc;
+    char *name = NULL, *sname = NULL;
+    char startts[BUFSIZ], endts[BUFSIZ], renewts[BUFSIZ];
+
+    if ((rc = krb5_unparse_name(ctx, cred->client, &name))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not get client name from credential: %d
(%s)\n",
+                        rc, error_message(rc));
+        goto cleanup;
+    }
+    if ((rc = krb5_unparse_name(ctx, cred->server, &sname))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not get server name from credential: %d
(%s)\n",
+                        rc, error_message(rc));
+        goto cleanup;
+    }
+    if (!cred->times.starttime) {
+        cred->times.starttime = cred->times.authtime;
+    }
+    krb5_timestamp_to_sfstring((krb5_timestamp)cred->times.starttime,
+                               startts, sizeof(startts), NULL);
+    krb5_timestamp_to_sfstring((krb5_timestamp)cred->times.endtime,
+                               endts, sizeof(endts), NULL);
+    krb5_timestamp_to_sfstring((krb5_timestamp)cred->times.renew_till,
+                               renewts, sizeof(renewts), NULL);
+
+    slapi_log_error(authtracelevel, logname,
+                    "\tKerberos credential: client [%s] server [%s] "
+                    "start time [%s] end time [%s] renew time [%s] "
+                    "flags [0x%x]\n", name, sname, startts, endts,
+                    renewts, (uint32_t)cred->ticket_flags);
+
+cleanup:
+    krb5_free_unparsed_name(ctx, name);
+    krb5_free_unparsed_name(ctx, sname);
+
+    return;
+}
+
+/*
+ * Call this after storing the credentials in the cache
+ */
+static void
+show_cached_credentials(int authtracelevel,
+                        krb5_context ctx, krb5_ccache cc,
+                        krb5_principal princ)
+{
+    char *logname = "show_cached_credentials";
+    krb5_error_code rc = 0;
+    krb5_creds creds;
+    krb5_cc_cursor cur;
+    char *princ_name = NULL;
+
+    if ((rc = krb5_unparse_name(ctx, princ, &princ_name))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not get principal name from principal: %d
(%s)\n",
+                        rc, error_message(rc));
+	    goto cleanup;
+    }
+
+	slapi_log_error(authtracelevel, logname,
+                    "Ticket cache: %s:%s\nDefault principal: %s\n\n",
+                    krb5_cc_get_type(ctx, cc),
+                    krb5_cc_get_name(ctx, cc), princ_name);
+
+    if ((rc = krb5_cc_start_seq_get(ctx, cc, &cur))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not get cursor to iterate cached credentials: "
+                        "%d (%s)\n", rc, error_message(rc));
+        goto cleanup;
+    }
+
+    while (!(rc = krb5_cc_next_cred(ctx, cc, &cur, &creds))) {
+        show_one_credential(authtracelevel, ctx, &creds);
+        krb5_free_cred_contents(ctx, &creds);
+    }
+    if (rc == KRB5_CC_END) {
+        if ((rc = krb5_cc_end_seq_get(ctx, cc, &cur))) {
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Could not close cached credentials cursor: "
+                            "%d (%s)\n", rc, error_message(rc));
+            goto cleanup;
+        }
+	}
+
+cleanup:
+	krb5_free_unparsed_name(ctx, princ_name);
+
+    return;
+}
+
+/*
+ * This implementation assumes that we want to use the 
+ * keytab from the default keytab env. var KRB5_KTNAME
+ * as.  This code is very similar to kinit -k -t.  We
+ * get a krb context, get the default keytab, get
+ * the credentials from the keytab, authenticate with
+ * those credentials, create a ccache, store the
+ * credentials in the ccache, and set the ccache
+ * env var to point to those credentials.
+ */
+static void
+set_krb5_creds()
+{
+    char *logname = "set_krb5_creds";
+    const char *cc_type = "MEMORY"; /* keep cred cache in memory */
+    krb5_context ctx = NULL;
+    krb5_ccache cc = NULL;
+    krb5_principal princ = NULL;
+    char *princ_name = NULL;
+    krb5_error_code rc = 0;
+    krb5_error_code looprc = 0;
+    krb5_creds creds;
+    krb5_keytab kt = NULL;
+    krb5_keytab_entry ktent;
+    krb5_kt_cursor ktcur = NULL;
+    char *cc_name = NULL;
+    char ktname[MAX_KEYTAB_NAME_LEN];
+    static char cc_env_name[1024+32]; /* size from ccdefname.c */
+    int new_ccache = 0;
+    int authtracelevel = SLAPI_LOG_SHELL; /* special auth tracing 
+                                             not sure what shell was
+                                             used for, does not
+                                             appear to be used 
+                                             currently */
+
+    /* probably have to put a mutex around this whole thing, to avoid
+       problems with reentrancy, since we are setting a "global"
+       variable via an environment variable */
+
+    /* wipe this out so we can safely free it later if we
+       short circuit */
+    memset(&creds, 0, sizeof(creds));
+
+    /* initialize the kerberos context */
+    if ((rc = krb5_init_context(&ctx))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not init Kerberos context: %d (%s)\n",
+                        rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* see if there is already a ccache, and see if there are
+       creds in the ccache */
+    /* grab the default ccache - note: this does not open the cache */
+    if ((rc = krb5_cc_default(ctx, &cc))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not get default Kerberos ccache: %d (%s)\n",
+                        rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* use this cache - construct the full cache name */
+    cc_name = slapi_ch_smprintf("%s:%s", krb5_cc_get_type(ctx, cc),
+                                krb5_cc_get_name(ctx, cc));
+
+    /* grab the principal from the ccache - will fail if there
+       is no ccache */
+    if ((rc = krb5_cc_get_principal(ctx, cc, &princ))) {
+        if (KRB5_FCC_NOFILE == rc) { /* no cache - ok */
+            slapi_log_error(authtracelevel, logname,
+                            "The default credentials cache [%s] not found: "
+                            "will create a new one.\n", cc_name);
+            /* close the cache - we will create a new one below */
+            krb5_cc_close(ctx, cc);
+            cc = NULL;
+            slapi_ch_free_string(&cc_name);
+            /* fall through to the keytab auth code below */
+        } else { /* fatal */
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Could not open default Kerberos ccache [%s]: "
+                            "%d (%s)\n", cc_name, rc, error_message(rc));
+            goto cleanup;
+        }
+    } else { /* have a valid ccache && found principal */
+        if ((rc = krb5_unparse_name(ctx, princ, &princ_name))) {
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Unable to get name of principal from ccache [%s]:
"
+                            "%d (%s)\n", cc_name, rc, error_message(rc));
+            goto cleanup;
+        }
+        slapi_log_error(authtracelevel, logname,
+                        "Using principal [%s] from ccache [%s]\n",
+                        princ_name, cc_name);
+    }
+
+    /* if this is not our type of ccache, there is nothing more we can
+       do - just punt and let sasl/gssapi take it's course - this
+       usually means there has been an external kinit e.g. in the
+       start up script, and it is the responsibility of the script to
+       renew those credentials or face lots of sasl/gssapi failures
+       This means, however, that the caller MUST MAKE SURE THERE IS NO
+       DEFAULT CCACHE FILE or the server will attempt to use it (and
+       likely fail) - THERE MUST BE NO DEFAULT CCACHE FILE IF YOU WANT
+       THE SERVER TO AUTHENTICATE WITH THE KEYTAB
+       NOTE: cc types are case sensitive and always upper case */
+    if (cc && strcmp(cc_type, krb5_cc_get_type(ctx, cc))) {
+        static int errmsgcounter = 0;
+        int loglevel = SLAPI_LOG_FATAL;
+        if (errmsgcounter) {
+            loglevel = authtracelevel;
+        }
+        /* make sure we log this message once, in case the user has
+           done something unintended, we want to make sure they know
+           about it.  However, if the user knows what he/she is doing,
+           by using an external ccache file, they probably don't want
+           to be notified with an error every time. */
+        slapi_log_error(loglevel, logname,
+                        "The server will use the external SASL/GSSAPI "
+                        "credentials cache [%s:%s].  If you want the "
+                        "server to automatically authenticate with its "
+                        "keytab, you must remove this cache.  If you "
+                        "did not intend to use this cache, you will likely "
+                        "see many SASL/GSSAPI authentication failures.\n",
+                        krb5_cc_get_type(ctx, cc), krb5_cc_get_name(ctx, cc));
+        errmsgcounter++;
+        goto cleanup;
+    }
+
+    /* find our default keytab */
+    if ((rc = krb5_kt_default(ctx, &kt))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Unable to get default keytab: %d (%s)\n",
+                        rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* get name of keytab for debugging purposes */
+    if ((rc = krb5_kt_get_name(ctx, kt, ktname, sizeof(ktname)))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Unable to get name of default keytab: %d (%s)\n",
+                        rc, error_message(rc));
+        goto cleanup;
+    }
+
+    slapi_log_error(authtracelevel, logname,
+                    "Using keytab named [%s]\n", ktname);
+
+    /* if there was no cache, or no principal in the cache, we look
+       in the keytab */
+    if (!princ) {
+        /* just use the first principal in the keytab
+           "first principals, clarice"
+        */
+        if ((rc = krb5_kt_start_seq_get(ctx, kt, &ktcur))) {
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Unable to open keytab [%s] cursor: %d (%s)\n",
+                            ktname, rc, error_message(rc));
+            goto cleanup;
+        }
+
+        memset(&ktent, 0, sizeof(ktent));
+        while ((looprc = krb5_kt_next_entry(ctx, kt, &ktent, &ktcur)) == 0) {
+            if ((looprc = krb5_unparse_name(ctx, ktent.principal,
+                                            &princ_name))) {
+                slapi_log_error(SLAPI_LOG_FATAL, logname,
+                                "Unable to get name from keytab [%s] "
+                                "principal: %d (%s)\n", ktname, looprc,
+                                error_message(looprc));
+                break;
+            }
+            /* found one - make a copy to free later */
+            if ((looprc = krb5_copy_principal(ctx, ktent.principal,
+                                              &princ))) {
+                slapi_log_error(SLAPI_LOG_FATAL, logname,
+                                "Unable to copy keytab [%s] principal [%s]: "
+                                "%d (%s)\n", ktname, princ_name, looprc,
+                                error_message(looprc));
+                break;
+            }
+            slapi_log_error(authtracelevel, logname,
+                            "Using keytab principal [%s]\n", princ_name);
+            break;
+        }
+
+        krb5_free_keytab_entry_contents(ctx, &ktent);
+        memset(&ktent, 0, sizeof(ktent));
+        if ((rc = krb5_kt_end_seq_get(ctx, kt, &ktcur))) {
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Unable to close keytab [%s] cursor: %d (%s)\n",
+                            ktname, rc, error_message(rc));
+            goto cleanup;
+        }
+
+        /* if we had an error in the loop above, just bail out
+           after closing the keytab cursor and keytab */
+        if (looprc) {
+            rc = looprc;
+            goto cleanup;
+        }
+    }
+
+    /* now do the actual kerberos authentication using
+       the keytab, and get the creds */
+    rc = krb5_get_init_creds_keytab(ctx, &creds, princ, kt,
+                                    0, NULL, NULL);
+    if (rc) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not get initial credentials for principal [%s]
"
+                        "in keytab [%s]: %d (%s)\n",
+                        princ_name, ktname, rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* completely done with the keytab now, close it */
+    krb5_kt_close(ctx, kt);
+    kt = NULL; /* no double free */
+
+    /* we now have the creds and the principal to which the
+       creds belong - use or allocate a new memory based
+       cache to hold the creds */
+    if (!cc_name) {
+#if HAVE_KRB5_CC_NEW_UNIQUE
+        /* krb5_cc_new_unique is a new convenience function which
+           generates a new unique name and returns a memory
+           cache with that name */
+        if ((rc = krb5_cc_new_unique(ctx, cc_type, NULL, &cc))) {
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Could not create new unique memory ccache: "
+                            "%d (%s)\n",
+                            rc, error_message(rc));
+            goto cleanup;
+        }
+        cc_name = slapi_ch_smprintf("%s:%s", cc_type,
+                                    krb5_cc_get_name(ctx, cc));
+#else
+        /* store the cache in memory - krb5_init_context uses malloc
+           to create the ctx, so the address should be unique enough
+           for our purposes */
+        if (!(cc_name = slapi_ch_smprintf("%s:%p", cc_type, ctx))) {
+            slapi_log_error(SLAPI_LOG_FATAL, logname,
+                            "Could create Kerberos memory ccache: "
+                            "out of memory\n");
+            rc = 1;
+            goto cleanup;
+        }
+#endif
+        slapi_log_error(authtracelevel, logname,
+                        "Generated new memory ccache [%s]\n", cc_name);
+        new_ccache = 1; /* need to set this in env. */
+    } else {
+        slapi_log_error(authtracelevel, logname,
+                        "Using existing ccache [%s]\n", cc_name);
+    }
+
+    /* krb5_cc_resolve is basically like an init -
+       this creates the cache structure, and creates a slot
+       for the cache in the static linked list in memory, if
+       there is not already a slot -
+       see cc_memory.c for details 
+       cc could already have been created by new_unique above
+    */
+    if (!cc && (rc = krb5_cc_resolve(ctx, cc_name, &cc))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not create ccache [%s]: %d (%s)\n",
+                        cc_name, rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* wipe out previous contents of cache for this principal, if any */
+    if ((rc = krb5_cc_initialize(ctx, cc, princ))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not initialize ccache [%s] for the new "
+                        "credentials for principal [%s]: %d (%s)\n",
+                        cc_name, princ_name, rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* store the credentials in the cache */
+    if ((rc = krb5_cc_store_cred(ctx, cc, &creds))) {
+        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                        "Could not store the credentials in the "
+                        "ccache [%s] for principal [%s]: %d (%s)\n",
+                        cc_name, princ_name, rc, error_message(rc));
+        goto cleanup;
+    }
+
+    /* now, do a "klist" to show the credential information, and log it */
+    show_cached_credentials(authtracelevel, ctx, cc, princ);
+
+    /* set the CC env var to the value of the cc cache name */
+    /* since we can't pass krb5 context up and out of here
+       and down through the ldap sasl layer, we set this
+       env var so that calls to krb5_cc_default_name will
+       use this */
+    if (new_ccache) {
+        PR_snprintf(cc_env_name, sizeof(cc_env_name),
+                    "%s=%s", KRB5_ENV_CCNAME, cc_name);
+        PR_SetEnv(cc_env_name);
+        slapi_log_error(authtracelevel, logname,
+                        "Set new env for ccache: [%s]\n",
+                        cc_env_name);
+    }
+
+cleanup:
+    krb5_free_unparsed_name(ctx, princ_name);
+    if (kt) { /* NULL not allowed */
+        krb5_kt_close(ctx, kt);
+    }
+    if (creds.client == princ) {
+        creds.client = NULL;
+    }
+    krb5_free_cred_contents(ctx, &creds);
+    slapi_ch_free_string(&cc_name);
+    krb5_free_principal(ctx, princ);
+    if (cc) {
+        krb5_cc_close(ctx, cc);
+    }
+    if (ctx) { /* cannot pass NULL to free context */
+        krb5_free_context(ctx);
+    }
+    return;
+}
+
+#endif /* HAVE_KRB5 */