[BACK]Return to ldap.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / sudo

Diff for /src/usr.bin/sudo/Attic/ldap.c between version 1.10 and 1.11

version 1.10, 2009/04/11 11:48:06 version 1.11, 2009/06/21 14:48:42
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 2003-2008 Todd C. Miller <Todd.Miller@courtesan.com>   * Copyright (c) 2003-2009 Todd C. Miller <Todd.Miller@courtesan.com>
  *   *
  * This code is derived from software contributed by Aaron Spangler.   * This code is derived from software contributed by Aaron Spangler.
  *   *
Line 82 
Line 82 
 #include "lbuf.h"  #include "lbuf.h"
   
 #ifndef lint  #ifndef lint
 __unused static const char rcsid[] = "$Sudo: ldap.c,v 1.106 2009/03/16 16:11:28 millert Exp $";  __unused static const char rcsid[] = "$Sudo: ldap.c,v 1.108 2009/05/29 13:43:12 millert Exp $";
 #endif /* lint */  #endif /* lint */
   
 #ifndef LDAP_OPT_SUCCESS  #ifndef LDAP_OPT_SUCCESS
Line 386 
Line 386 
             ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"), 2);              ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"), 2);
         rc = ldapssl_clientauth_init(ldap_conf.tls_certfile, NULL,          rc = ldapssl_clientauth_init(ldap_conf.tls_certfile, NULL,
             ldap_conf.tls_keyfile != NULL, ldap_conf.tls_keyfile, NULL);              ldap_conf.tls_keyfile != NULL, ldap_conf.tls_keyfile, NULL);
           /*
            * Mozilla-derived SDKs have a bug starting with version 5.0
            * where the path can no longer be a file name and must be a dir.
            */
         if (rc != LDAP_SUCCESS) {          if (rc != LDAP_SUCCESS) {
             warningx("unable to initialize SSL cert and key db: %s",              char *cp;
                 ldapssl_err2string(rc));              if (ldap_conf.tls_certfile) {
             goto done;                  cp = strrchr(ldap_conf.tls_certfile, '/');
                   if (cp != NULL && strncmp(cp + 1, "cert", 4) == 0)
                       *cp = '\0';
               }
               if (ldap_conf.tls_keyfile) {
                   cp = strrchr(ldap_conf.tls_keyfile, '/');
                   if (cp != NULL && strncmp(cp + 1, "key", 3) == 0)
                       *cp = '\0';
               }
               DPRINTF(("ldapssl_clientauth_init(%s, %s)",
                   ldap_conf.tls_certfile ? ldap_conf.tls_certfile : "NULL",
                   ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"), 2);
               rc = ldapssl_clientauth_init(ldap_conf.tls_certfile, NULL,
                   ldap_conf.tls_keyfile != NULL, ldap_conf.tls_keyfile, NULL);
               if (rc != LDAP_SUCCESS) {
                   warningx("unable to initialize SSL cert and key db: %s",
                       ldapssl_err2string(rc));
                   goto done;
               }
         }          }
   
         DPRINTF(("ldapssl_init(%s, %d, 1)", host, port), 2);          DPRINTF(("ldapssl_init(%s, %d, 1)", host, port), 2);
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11