pkgs/nss_ldap/patches/nss_ldap-265-padl-bug-418.patch

   1 diff -up nss_ldap-253/ldap-nss.c.padl418 nss_ldap-253/ldap-nss.c
   2 --- nss_ldap-253/ldap-nss.c.padl418     2010-11-17 14:08:24.000000000 +0000
   3 +++ nss_ldap-253/ldap-nss.c     2010-11-18 00:34:22.000000000 +0000
   4 @@ -1272,9 +1272,14 @@ do_init (void)
   5         }
   6      }
   7
   8 -  __session.ls_conn = NULL;
   9 +  /* looks like a problem. could be initialized, but not connected */
  10 +  if (__session.ls_state != LS_UNINITIALIZED)
  11 +    {
  12 +      debug ("<== do_init (already initialized)");
  13 +      goto initialized;
  14 +    }
  15 +
  16    __session.ls_timestamp = 0;
  17 -  __session.ls_state = LS_UNINITIALIZED;
  18
  19  #if defined(HAVE_PTHREAD_ONCE) && defined(HAVE_PTHREAD_ATFORK)
  20    if (pthread_once (&__once, do_atfork_setup) != 0)
  21 @@ -1394,6 +1399,7 @@ do_init (void)
  22
  23    debug ("<== do_init (initialized session)");
  24
  25 +initialized:
  26    return NSS_SUCCESS;
  27  }
  28
  29 @@ -1614,6 +1620,7 @@ do_open (void)
  30         }
  31        else
  32         {
  33 +         syslog(LOG_ERR, "nss-ldap: do_open: do_start_tls failed:stat=%d", stat);
  34           do_close ();
  35           debug ("<== do_open (TLS startup failed)");
  36           return stat;