<strong>Report forwarded</strong> to <code>debian-bugs-dist@lists.debian.org, Sami Haahtinen &lt;ressu@debian.org&gt;</code>:<br>
<code>Bug#102335</code>; Package <code>libpam-ldap</code>.


debian-bugs-dist@lists.debian.orgSami Haahtinen <ressu@debian.org>

Subject: Bug#102335: libpam-ldap: [PATCH] New option ext=
Reply-To: <herbert@gondor.apana.org.au>, 102335@bugs.debian.org
Resent-From: <herbert@gondor.apana.org.au>
Resent-To: debian-bugs-dist@lists.debian.org
Resent-CC: Sami Haahtinen <ressu@debian.org>
Resent-Date: Tue, 26 Jun 2001 10:33:01 GMT
Resent-Message-ID: <handler.102335.B.9935508478296@bugs.debian.org>
Resent-Sender: owner@bugs.debian.org
X-Debian-PR-Message: report 102335
X-Debian-PR-Package: libpam-ldap
X-Debian-PR-Keywords: 
X-Loop: owner@bugs.debian.org
Received: via spool by submit@bugs.debian.org id=B.9935508478296
          (code B ref -1); Tue, 26 Jun 2001 10:33:01 GMT
From:  <herbert@gondor.apana.org.au>
To: submit@bugs.debian.org
X-Mailer: bug 3.3.9
Message-Id: <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
Date: Tue, 26 Jun 2001 20:20:34 +1000
Delivered-To: submit@bugs.debian.org

Package: libpam-ldap
Version: N/A
Severity: wishlist

As it is you can't call pam_ldap twice in the same file with different
config files that refer to different LDAP servers.  This is because
pam_ldap shares session details between successive calls.  The following
patch adds an ext= option so that only calls to pam_ldap with the same
ext specification shares the seesion.  For example, you can have

auth	sufficient	pam_ldap.so
auth	sufficient	pam_ldap.so config=foo.conf ext=foo use_first_pass
auth	sufficient	pam_ldap.so config=bar.conf ext=bar use_first_pass

-- System Information
Debian Release: testing/unstable
Kernel Version: Linux gondolin 2.4.5-686-smp #9 SMP Tue Jun 5 19:14:11 EST 2001 i686 unknown

--
--- pam_ldap.c.orig	Tue Jun 26 15:34:11 2001
+++ pam_ldap.c	Tue Jun 26 17:06:09 2001
@@ -1861,13 +1861,25 @@
 static int
 _pam_ldap_get_session (pam_handle_t * pamh, const char *username,
 		     const char *configFile, const char *extraFilter, 
-		     pam_ldap_session_t ** psession)
+		     const char *ext, pam_ldap_session_t ** psession)
 {
   pam_ldap_session_t *session;
-  int rc;
+  int rc = PAM_SUCCESS;
+  char *session_name;
+  const char *padl_ldap_session_data = PADL_LDAP_SESSION_DATA;
+
+  if (ext)
+    {
+      session_name = malloc(strlen(PADL_LDAP_SESSION_DATA) + strlen(ext) + 1);
+      if (!session_name) {
+	return PAM_BUF_ERR;
+      }
+      sprintf(session_name, "%s%s", PADL_LDAP_SESSION_DATA, ext);
+      padl_ldap_session_data = session_name;
+    }
 
   if (pam_get_data
-      (pamh, PADL_LDAP_SESSION_DATA, (const void **) &session) == PAM_SUCCESS)
+      (pamh, padl_ldap_session_data, (const void **) &session) == PAM_SUCCESS)
     {
       /*
        * we cache the information retrieved from the LDAP server, however
@@ -1884,7 +1896,7 @@
 #if LDAP_SET_REBIND_PROC_ARGS < 3
       global_session = *psession;
 #endif
-      return PAM_SUCCESS;
+      goto out;
     }
 
   *psession = NULL;
@@ -1895,7 +1907,8 @@
 #endif
   if (session == NULL)
     {
-      return PAM_BUF_ERR;
+      rc = PAM_BUF_ERR;
+      goto out;
     }
 
   session->ld = NULL;
@@ -1913,25 +1926,30 @@
 	{
 	  _release_config (&session->conf);
 	  free (session);
-	  return rc;
+	  goto out;
 	}
 #ifdef YPLDAPD
     }
 #endif /* YPLDAPD */
 
   rc =
-    pam_set_data (pamh, PADL_LDAP_SESSION_DATA, (void *) session,
+    pam_set_data (pamh, padl_ldap_session_data, (void *) session,
 		  _pam_ldap_cleanup_session);
   if (rc != PAM_SUCCESS)
     {
       _release_config (&session->conf);
       free (session);
-      return rc;
+      goto out;
     }
 
   *psession = session;
 
-  return PAM_SUCCESS;
+out:
+  if (ext)
+    {
+      free(session_name);
+    }
+  return rc;
 }
 
 static int
@@ -2363,6 +2381,7 @@
   pam_ldap_session_t *session = NULL;
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2374,6 +2393,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	;
       else if (!strcmp (argv[i], "debug"))
@@ -2386,7 +2407,7 @@
   if (rc != PAM_SUCCESS)
     return rc;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     return rc;
 
@@ -2466,6 +2487,7 @@
   LDAPMod *mods[2], mod;
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2477,6 +2499,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	no_warn = 1;
       else if (!strcmp (argv[i], "debug"))
@@ -2514,7 +2538,7 @@
   if (rc == PAM_SUCCESS && expuser != NULL)
     canabort = (strcmp (username, expuser) == 0) ? 0 : 1;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     return rc;
 
@@ -2839,6 +2863,7 @@
   long int expirein = 0;	/* seconds until password expires */
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2850,6 +2875,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	no_warn = 1;
       else if (!strcmp (argv[i], "debug"))
@@ -2882,7 +2909,7 @@
   if (username == NULL)
     return PAM_USER_UNKNOWN;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     {
       return rc;





<strong>Acknowledgement sent</strong> to <code>&lt;herbert@gondor.apana.org.au&gt;</code>:<br>
New Bug report received and forwarded.  Copy sent to <code>Sami Haahtinen &lt;ressu@debian.org&gt;</code>.


-t

From: owner@bugs.debian.org (Debian Bug Tracking System)
To: <herbert@gondor.apana.org.au>
Subject: Bug#102335: Acknowledgement (libpam-ldap: [PATCH] New option ext=)
Message-ID: <handler.102335.B.9935508478296.ack@bugs.debian.org>
In-Reply-To: <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
References: <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
X-Debian-PR-Message: ack 102335

Thank you for the problem report you have sent regarding Debian.
This is an automatically generated reply, to let you know your message has
been received.  It is being forwarded to the developers mailing list for
their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 Sami Haahtinen <ressu@debian.org>

If you wish to submit further information on your problem, please send
it to 102335@bugs.debian.org (and *not* to
submit@bugs.debian.org).

Please do not reply to the address at the top of this message,
unless you wish to report a problem with the Bug-tracking system.

Darren Benham
(administrator, Debian Bugs database)



Received: (at submit) by bugs.debian.org; 26 Jun 2001 10:20:47 +0000
From herbert@gondor.apana.org.au Tue Jun 26 05:20:47 2001
Return-path: <herbert@gondor.apana.org.au>
Received: from eriador.apana.org.au [::ffff:203.14.152.116] 
	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
	id 15EpxZ-00029e-00; Tue, 26 Jun 2001 05:20:42 -0500
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by eriador.apana.org.au with esmtp (Exim 3.12 #1 (Debian))
	id 15EpxT-0006AP-00
	for <submit@bugs.debian.org>; Tue, 26 Jun 2001 20:20:35 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.22 #1 (Debian))
	id 15EpxS-0000iP-00
	for <submit@bugs.debian.org>; Tue, 26 Jun 2001 20:20:34 +1000
From:  <herbert@gondor.apana.org.au>
Subject: libpam-ldap: [PATCH] New option ext=
To: submit@bugs.debian.org
X-Mailer: bug 3.3.9
Message-Id: <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
Date: Tue, 26 Jun 2001 20:20:34 +1000
Delivered-To: submit@bugs.debian.org

Package: libpam-ldap
Version: N/A
Severity: wishlist

As it is you can't call pam_ldap twice in the same file with different
config files that refer to different LDAP servers.  This is because
pam_ldap shares session details between successive calls.  The following
patch adds an ext= option so that only calls to pam_ldap with the same
ext specification shares the seesion.  For example, you can have

auth	sufficient	pam_ldap.so
auth	sufficient	pam_ldap.so config=foo.conf ext=foo use_first_pass
auth	sufficient	pam_ldap.so config=bar.conf ext=bar use_first_pass

-- System Information
Debian Release: testing/unstable
Kernel Version: Linux gondolin 2.4.5-686-smp #9 SMP Tue Jun 5 19:14:11 EST 2001 i686 unknown

--
--- pam_ldap.c.orig	Tue Jun 26 15:34:11 2001
+++ pam_ldap.c	Tue Jun 26 17:06:09 2001
@@ -1861,13 +1861,25 @@
 static int
 _pam_ldap_get_session (pam_handle_t * pamh, const char *username,
 		     const char *configFile, const char *extraFilter, 
-		     pam_ldap_session_t ** psession)
+		     const char *ext, pam_ldap_session_t ** psession)
 {
   pam_ldap_session_t *session;
-  int rc;
+  int rc = PAM_SUCCESS;
+  char *session_name;
+  const char *padl_ldap_session_data = PADL_LDAP_SESSION_DATA;
+
+  if (ext)
+    {
+      session_name = malloc(strlen(PADL_LDAP_SESSION_DATA) + strlen(ext) + 1);
+      if (!session_name) {
+	return PAM_BUF_ERR;
+      }
+      sprintf(session_name, "%s%s", PADL_LDAP_SESSION_DATA, ext);
+      padl_ldap_session_data = session_name;
+    }
 
   if (pam_get_data
-      (pamh, PADL_LDAP_SESSION_DATA, (const void **) &session) == PAM_SUCCESS)
+      (pamh, padl_ldap_session_data, (const void **) &session) == PAM_SUCCESS)
     {
       /*
        * we cache the information retrieved from the LDAP server, however
@@ -1884,7 +1896,7 @@
 #if LDAP_SET_REBIND_PROC_ARGS < 3
       global_session = *psession;
 #endif
-      return PAM_SUCCESS;
+      goto out;
     }
 
   *psession = NULL;
@@ -1895,7 +1907,8 @@
 #endif
   if (session == NULL)
     {
-      return PAM_BUF_ERR;
+      rc = PAM_BUF_ERR;
+      goto out;
     }
 
   session->ld = NULL;
@@ -1913,25 +1926,30 @@
 	{
 	  _release_config (&session->conf);
 	  free (session);
-	  return rc;
+	  goto out;
 	}
 #ifdef YPLDAPD
     }
 #endif /* YPLDAPD */
 
   rc =
-    pam_set_data (pamh, PADL_LDAP_SESSION_DATA, (void *) session,
+    pam_set_data (pamh, padl_ldap_session_data, (void *) session,
 		  _pam_ldap_cleanup_session);
   if (rc != PAM_SUCCESS)
     {
       _release_config (&session->conf);
       free (session);
-      return rc;
+      goto out;
     }
 
   *psession = session;
 
-  return PAM_SUCCESS;
+out:
+  if (ext)
+    {
+      free(session_name);
+    }
+  return rc;
 }
 
 static int
@@ -2363,6 +2381,7 @@
   pam_ldap_session_t *session = NULL;
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2374,6 +2393,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	;
       else if (!strcmp (argv[i], "debug"))
@@ -2386,7 +2407,7 @@
   if (rc != PAM_SUCCESS)
     return rc;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     return rc;
 
@@ -2466,6 +2487,7 @@
   LDAPMod *mods[2], mod;
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2477,6 +2499,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	no_warn = 1;
       else if (!strcmp (argv[i], "debug"))
@@ -2514,7 +2538,7 @@
   if (rc == PAM_SUCCESS && expuser != NULL)
     canabort = (strcmp (username, expuser) == 0) ? 0 : 1;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     return rc;
 
@@ -2839,6 +2863,7 @@
   long int expirein = 0;	/* seconds until password expires */
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2850,6 +2875,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	no_warn = 1;
       else if (!strcmp (argv[i], "debug"))
@@ -2882,7 +2909,7 @@
   if (username == NULL)
     return PAM_USER_UNKNOWN;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     {
       return rc;





<strong>Tags added: patch, wontfix</strong>
Request was from <code>ressu@ressukka.net (Sami Haahtinen)</code>
to <code>control@bugs.debian.org</code>. 


Received: (at control) by bugs.debian.org; 23 Apr 2002 21:34:44 +0000
From ressu@ressukka.net Tue Apr 23 16:34:44 2002
Return-path: <ressu@ressukka.net>
Received: from stradivarius.ressukka.net [212.182.193.154] (postfix)
	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
	id 1707vw-0001d8-00; Tue, 23 Apr 2002 16:34:44 -0500
Received: by stradivarius.ressukka.net (Postfix, from userid 1000)
	id 5A95166E6; Wed, 24 Apr 2002 00:34:37 +0300 (EEST)
Date: Wed, 24 Apr 2002 00:34:36 +0300
To: control@bugs.debian.org
Subject: Fixing bug states
Message-ID: <20020423213436.GA26858@stradivarius.ressukka.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
X-Zig1: All your base are belong to us!
X-Zig2: You have no chance to survive make your time.
From: ressu@ressukka.net (Sami Haahtinen)
Delivered-To: control@bugs.debian.org

tags 102335 + patch wontfix
close 121570
thanks

-- 
			  -< Sami Haahtinen >-
      -[ Is it still a bug, if we have learned to live with it? ]-
	-< 2209 3C53 D0FB 041C F7B1  F908 A9B6 F730 B83D 761C >-




<strong>Reply sent</strong> to <code>Stephen Frost &lt;sfrost@snowman.net&gt;</code>:<br>
You have taken responsibility.


-t

X-Loop: owner@bugs.debian.org
From: owner@bugs.debian.org (Debian Bug Tracking System)
To: Stephen Frost <sfrost@snowman.net>
Cc: Stephen Frost <sfrost@debian.org>
Subject: Bug#102335: marked as done (libpam-ldap: [PATCH] New option ext=)
Message-ID: <handler.102335.D102335.10919384621512.ackdone@bugs.debian.org>
In-Reply-To: <20040808041406.GF21419@ns.snowman.net>
References: <20040808041406.GF21419@ns.snowman.net> <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
Precedence: bulk
X-Debian-PR-Message: closed 102335
X-Debian-PR-Package: libpam-ldap
X-Debian-PR-Keywords: wontfix patch

Your message dated Sun, 8 Aug 2004 00:14:06 -0400
with message-id <20040808041406.GF21419@ns.snowman.net>
and subject line Not gonig to be included...
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 26 Jun 2001 10:20:47 +0000
From herbert@gondor.apana.org.au Tue Jun 26 05:20:47 2001
Return-path: <herbert@gondor.apana.org.au>
Received: from eriador.apana.org.au [::ffff:203.14.152.116] 
	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
	id 15EpxZ-00029e-00; Tue, 26 Jun 2001 05:20:42 -0500
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by eriador.apana.org.au with esmtp (Exim 3.12 #1 (Debian))
	id 15EpxT-0006AP-00
	for <submit@bugs.debian.org>; Tue, 26 Jun 2001 20:20:35 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.22 #1 (Debian))
	id 15EpxS-0000iP-00
	for <submit@bugs.debian.org>; Tue, 26 Jun 2001 20:20:34 +1000
From:  <herbert@gondor.apana.org.au>
Subject: libpam-ldap: [PATCH] New option ext=
To: submit@bugs.debian.org
X-Mailer: bug 3.3.9
Message-Id: <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
Date: Tue, 26 Jun 2001 20:20:34 +1000
Delivered-To: submit@bugs.debian.org

Package: libpam-ldap
Version: N/A
Severity: wishlist

As it is you can't call pam_ldap twice in the same file with different
config files that refer to different LDAP servers.  This is because
pam_ldap shares session details between successive calls.  The following
patch adds an ext= option so that only calls to pam_ldap with the same
ext specification shares the seesion.  For example, you can have

auth	sufficient	pam_ldap.so
auth	sufficient	pam_ldap.so config=foo.conf ext=foo use_first_pass
auth	sufficient	pam_ldap.so config=bar.conf ext=bar use_first_pass

-- System Information
Debian Release: testing/unstable
Kernel Version: Linux gondolin 2.4.5-686-smp #9 SMP Tue Jun 5 19:14:11 EST 2001 i686 unknown

--
--- pam_ldap.c.orig	Tue Jun 26 15:34:11 2001
+++ pam_ldap.c	Tue Jun 26 17:06:09 2001
@@ -1861,13 +1861,25 @@
 static int
 _pam_ldap_get_session (pam_handle_t * pamh, const char *username,
 		     const char *configFile, const char *extraFilter, 
-		     pam_ldap_session_t ** psession)
+		     const char *ext, pam_ldap_session_t ** psession)
 {
   pam_ldap_session_t *session;
-  int rc;
+  int rc = PAM_SUCCESS;
+  char *session_name;
+  const char *padl_ldap_session_data = PADL_LDAP_SESSION_DATA;
+
+  if (ext)
+    {
+      session_name = malloc(strlen(PADL_LDAP_SESSION_DATA) + strlen(ext) + 1);
+      if (!session_name) {
+	return PAM_BUF_ERR;
+      }
+      sprintf(session_name, "%s%s", PADL_LDAP_SESSION_DATA, ext);
+      padl_ldap_session_data = session_name;
+    }
 
   if (pam_get_data
-      (pamh, PADL_LDAP_SESSION_DATA, (const void **) &session) == PAM_SUCCESS)
+      (pamh, padl_ldap_session_data, (const void **) &session) == PAM_SUCCESS)
     {
       /*
        * we cache the information retrieved from the LDAP server, however
@@ -1884,7 +1896,7 @@
 #if LDAP_SET_REBIND_PROC_ARGS < 3
       global_session = *psession;
 #endif
-      return PAM_SUCCESS;
+      goto out;
     }
 
   *psession = NULL;
@@ -1895,7 +1907,8 @@
 #endif
   if (session == NULL)
     {
-      return PAM_BUF_ERR;
+      rc = PAM_BUF_ERR;
+      goto out;
     }
 
   session->ld = NULL;
@@ -1913,25 +1926,30 @@
 	{
 	  _release_config (&session->conf);
 	  free (session);
-	  return rc;
+	  goto out;
 	}
 #ifdef YPLDAPD
     }
 #endif /* YPLDAPD */
 
   rc =
-    pam_set_data (pamh, PADL_LDAP_SESSION_DATA, (void *) session,
+    pam_set_data (pamh, padl_ldap_session_data, (void *) session,
 		  _pam_ldap_cleanup_session);
   if (rc != PAM_SUCCESS)
     {
       _release_config (&session->conf);
       free (session);
-      return rc;
+      goto out;
     }
 
   *psession = session;
 
-  return PAM_SUCCESS;
+out:
+  if (ext)
+    {
+      free(session_name);
+    }
+  return rc;
 }
 
 static int
@@ -2363,6 +2381,7 @@
   pam_ldap_session_t *session = NULL;
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2374,6 +2393,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	;
       else if (!strcmp (argv[i], "debug"))
@@ -2386,7 +2407,7 @@
   if (rc != PAM_SUCCESS)
     return rc;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     return rc;
 
@@ -2466,6 +2487,7 @@
   LDAPMod *mods[2], mod;
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2477,6 +2499,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	no_warn = 1;
       else if (!strcmp (argv[i], "debug"))
@@ -2514,7 +2538,7 @@
   if (rc == PAM_SUCCESS && expuser != NULL)
     canabort = (strcmp (username, expuser) == 0) ? 0 : 1;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     return rc;
 
@@ -2839,6 +2863,7 @@
   long int expirein = 0;	/* seconds until password expires */
   const char *configFile = NULL;
   const char *extraFilter = NULL;
+  const char *ext = NULL;
 
   for (i = 0; i < argc; i++)
     {
@@ -2850,6 +2875,8 @@
 	configFile = argv[i] + 7;
       else if (!strncmp (argv[i], "filter=", 7))
 	extraFilter = argv[i] + 7;
+      else if (!strncmp (argv[i], "ext=", 4))
+	ext = argv[i] + 4;
       else if (!strcmp (argv[i], "no_warn"))
 	no_warn = 1;
       else if (!strcmp (argv[i], "debug"))
@@ -2882,7 +2909,7 @@
   if (username == NULL)
     return PAM_USER_UNKNOWN;
 
-  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, &session);
+  rc = _pam_ldap_get_session (pamh, username, configFile, extraFilter, ext, &session);
   if (rc != PAM_SUCCESS)
     {
       return rc;


---------------------------------------
Received: (at 102335-done) by bugs.debian.org; 8 Aug 2004 04:14:22 +0000
From sfrost@ns.snowman.net Sat Aug 07 21:14:22 2004
Return-path: <sfrost@ns.snowman.net>
Received: from snowman.net (relay.snowman.net) [66.93.83.236] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Btf4g-0000Nc-00; Sat, 07 Aug 2004 21:14:22 -0700
Received: from ns.snowman.net (ns.snowman.net [10.10.0.2])
	by relay.snowman.net (8.12.11/8.12.11/Debian-5) with ESMTP id i784DjmP015981
	for <102335-done@bugs.debian.org>; Sun, 8 Aug 2004 00:13:45 -0400
Received: from ns.snowman.net (localhost [127.0.0.1])
	by ns.snowman.net (8.12.11/8.12.11/Debian-5) with ESMTP id i784E62W019548
	for <102335-done@bugs.debian.org>; Sun, 8 Aug 2004 00:14:06 -0400
Received: (from sfrost@localhost)
	by ns.snowman.net (8.12.11/8.12.11/Debian-5) id i784E6rN019546
	for 102335-done@bugs.debian.org; Sun, 8 Aug 2004 00:14:06 -0400
Date: Sun, 8 Aug 2004 00:14:06 -0400
From: Stephen Frost <sfrost@snowman.net>
To: 102335-done@bugs.debian.org
Subject: Not gonig to be included...
Message-ID: <20040808041406.GF21419@ns.snowman.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Editor: Vim http://www.vim.org/
X-Info: http://www.snowman.net
X-Operating-System: Linux/2.4.24ns.3.0 (i686)
X-Uptime: 00:13:07 up 189 days, 23:16, 11 users,  load average: 0.16, 0.21, 0.15
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: 102335-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Greetings,

  This is a rather old bug, tagged wontfix, and wishlist, w/ no activity
  on it in, like, 3 years.  I think it's safe to close it at this point.
  I seriously doubt the patch has any prayer of working w/ the current
  version anyway...

  	Stephen



<strong>Notification sent</strong> to <code>&lt;herbert@gondor.apana.org.au&gt;</code>:<br>
Bug acknowledged by developer.


-t

X-Loop: owner@bugs.debian.org
From: owner@bugs.debian.org (Debian Bug Tracking System)
To: <herbert@gondor.apana.org.au>
Subject: Bug#102335 acknowledged by developer
         (Not gonig to be included...)
Message-ID: <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
In-Reply-To: <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
References: <20040808041406.GF21419@ns.snowman.net> <E15EpxS-0000iP-00@gondolin.me.apana.org.au>
X-Debian-PR-Message: they-closed 102335
X-Debian-PR-Package: libpam-ldap
X-Debian-PR-Keywords: wontfix patch
Reply-To: 102335@bugs.debian.org

This is an automatic notification regarding your Bug report
#102335: libpam-ldap: [PATCH] New option ext=,
which was filed against the libpam-ldap package.

It has been closed by one of the developers, namely
Stephen Frost <sfrost@snowman.net>.

Their explanation is attached below.  If this explanation is
unsatisfactory and you have not received a better one in a separate
message then please contact the developer, by replying to this email.

Debian bug tracking system administrator
(administrator, Debian Bugs database)

Received: (at 102335-done) by bugs.debian.org; 8 Aug 2004 04:14:22 +0000
From sfrost@ns.snowman.net Sat Aug 07 21:14:22 2004
Return-path: <sfrost@ns.snowman.net>
Received: from snowman.net (relay.snowman.net) [66.93.83.236] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Btf4g-0000Nc-00; Sat, 07 Aug 2004 21:14:22 -0700
Received: from ns.snowman.net (ns.snowman.net [10.10.0.2])
	by relay.snowman.net (8.12.11/8.12.11/Debian-5) with ESMTP id i784DjmP015981
	for <102335-done@bugs.debian.org>; Sun, 8 Aug 2004 00:13:45 -0400
Received: from ns.snowman.net (localhost [127.0.0.1])
	by ns.snowman.net (8.12.11/8.12.11/Debian-5) with ESMTP id i784E62W019548
	for <102335-done@bugs.debian.org>; Sun, 8 Aug 2004 00:14:06 -0400
Received: (from sfrost@localhost)
	by ns.snowman.net (8.12.11/8.12.11/Debian-5) id i784E6rN019546
	for 102335-done@bugs.debian.org; Sun, 8 Aug 2004 00:14:06 -0400
Date: Sun, 8 Aug 2004 00:14:06 -0400
From: Stephen Frost <sfrost@snowman.net>
To: 102335-done@bugs.debian.org
Subject: Not gonig to be included...
Message-ID: <20040808041406.GF21419@ns.snowman.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Editor: Vim http://www.vim.org/
X-Info: http://www.snowman.net
X-Operating-System: Linux/2.4.24ns.3.0 (i686)
X-Uptime: 00:13:07 up 189 days, 23:16, 11 users,  load average: 0.16, 0.21, 0.15
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: 102335-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Greetings,

  This is a rather old bug, tagged wontfix, and wishlist, w/ no activity
  on it in, like, 3 years.  I think it's safe to close it at this point.
  I seriously doubt the patch has any prayer of working w/ the current
  version anyway...

  	Stephen



Received: (at 102335-done) by bugs.debian.org; 8 Aug 2004 04:14:22 +0000
From sfrost@ns.snowman.net Sat Aug 07 21:14:22 2004
Return-path: <sfrost@ns.snowman.net>
Received: from snowman.net (relay.snowman.net) [66.93.83.236] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Btf4g-0000Nc-00; Sat, 07 Aug 2004 21:14:22 -0700
Received: from ns.snowman.net (ns.snowman.net [10.10.0.2])
	by relay.snowman.net (8.12.11/8.12.11/Debian-5) with ESMTP id i784DjmP015981
	for <102335-done@bugs.debian.org>; Sun, 8 Aug 2004 00:13:45 -0400
Received: from ns.snowman.net (localhost [127.0.0.1])
	by ns.snowman.net (8.12.11/8.12.11/Debian-5) with ESMTP id i784E62W019548
	for <102335-done@bugs.debian.org>; Sun, 8 Aug 2004 00:14:06 -0400
Received: (from sfrost@localhost)
	by ns.snowman.net (8.12.11/8.12.11/Debian-5) id i784E6rN019546
	for 102335-done@bugs.debian.org; Sun, 8 Aug 2004 00:14:06 -0400
Date: Sun, 8 Aug 2004 00:14:06 -0400
From: Stephen Frost <sfrost@snowman.net>
To: 102335-done@bugs.debian.org
Subject: Not gonig to be included...
Message-ID: <20040808041406.GF21419@ns.snowman.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Editor: Vim http://www.vim.org/
X-Info: http://www.snowman.net
X-Operating-System: Linux/2.4.24ns.3.0 (i686)
X-Uptime: 00:13:07 up 189 days, 23:16, 11 users,  load average: 0.16, 0.21, 0.15
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: 102335-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Greetings,

  This is a rather old bug, tagged wontfix, and wishlist, w/ no activity
  on it in, like, 3 years.  I think it's safe to close it at this point.
  I seriously doubt the patch has any prayer of working w/ the current
  version anyway...

  	Stephen




<strong>Information forwarded</strong> to <code>debian-bugs-dist@lists.debian.org, Stephen Frost &lt;sfrost@debian.org&gt;</code>:<br>
<code>Bug#102335</code>; Package <code>libpam-ldap</code>.


debian-bugs-dist@lists.debian.orgStephen Frost <sfrost@debian.org>

X-Loop: owner@bugs.debian.org
Subject: Bug#102335: acknowledged by developer (Not gonig to be included...)
Reply-To: Herbert Xu <herbert@gondor.apana.org.au>, 102335@bugs.debian.org
Resent-From: Herbert Xu <herbert@gondor.apana.org.au>
Resent-To: debian-bugs-dist@lists.debian.org
Resent-CC: Stephen Frost <sfrost@debian.org>
Resent-Date: Sun, 08 Aug 2004 08:33:02 UTC
Resent-Message-ID: <handler.102335.B102335.10919530497097@bugs.debian.org>
Resent-Sender: owner@bugs.debian.org
X-Debian-PR-Message: report 102335
X-Debian-PR-Package: libpam-ldap
X-Debian-PR-Keywords: wontfix patch
Received: via spool by 102335-submit@bugs.debian.org id=B102335.10919530497097
          (code B ref 102335); Sun, 08 Aug 2004 08:33:02 UTC
Received: (at 102335) by bugs.debian.org; 8 Aug 2004 08:17:29 +0000
Received: from arnor.apana.org.au [203.14.152.115] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Btirw-0001q7-00; Sun, 08 Aug 2004 01:17:29 -0700
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by arnor.apana.org.au with esmtp (Exim 3.35 #1 (Debian))
	id 1Btirt-0004Eh-00; Sun, 08 Aug 2004 18:17:25 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
	id 1Btirp-0006Lr-00; Sun, 08 Aug 2004 18:17:21 +1000
Date: Sun, 8 Aug 2004 18:17:21 +1000
To: 102335@bugs.debian.org
Message-ID: <20040808081721.GA24387@gondor.apana.org.au>
References: <20040808041406.GF21419@ns.snowman.net> <E15EpxS-0000iP-00@gondolin.me.apana.org.au> <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
User-Agent: Mutt/1.5.6+20040523i
From: Herbert Xu <herbert@gondor.apana.org.au>
Delivered-To: 102335@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,VALID_BTS_CONTROL 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

reopen 102335
quit

On Sat, Aug 07, 2004 at 09:18:05PM -0700, Debian Bug Tracking System wrote:
> 
>   This is a rather old bug, tagged wontfix, and wishlist, w/ no activity
>   on it in, like, 3 years.  I think it's safe to close it at this point.
>   I seriously doubt the patch has any prayer of working w/ the current
>   version anyway...

The patch is only a hint of how the bug should be addressed.  The bug
should only be closed if you can include two pam_ldap lines in the
same PAM file with two configuration files referring to two separate
servers.

Last time I checked this still isn't the case.

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt




<strong>Acknowledgement sent</strong> to <code>Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</code>:<br>
Extra info received and forwarded to list.  Copy sent to <code>Stephen Frost &lt;sfrost@debian.org&gt;</code>.


-t

X-Loop: owner@bugs.debian.org
From: owner@bugs.debian.org (Debian Bug Tracking System)
To: Herbert Xu <herbert@gondor.apana.org.au>
Subject: Bug#102335: Info received (was Bug#102335 acknowledged by developer (Not gonig to be included...))
Message-ID: <handler.102335.B102335.10919530497097.ackinfo@bugs.debian.org>
In-Reply-To: <20040808081721.GA24387@gondor.apana.org.au>
References: <20040808081721.GA24387@gondor.apana.org.au>
Precedence: bulk
X-Debian-PR-Message: ack-info 102335
X-Debian-PR-Package: libpam-ldap
X-Debian-PR-Keywords: wontfix patch

Thank you for the additional information you have supplied regarding
this problem report.  It has been forwarded to the package maintainer(s)
and to other interested parties to accompany the original report.

Your message has been sent to the package maintainer(s):
 Stephen Frost <sfrost@debian.org>

If you wish to continue to submit further information on your problem,
please send it to 102335@bugs.debian.org, as before.

Please do not reply to the address at the top of this message,
unless you wish to report a problem with the Bug-tracking system.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



Received: (at 102335) by bugs.debian.org; 8 Aug 2004 08:17:29 +0000
From herbert@gondor.apana.org.au Sun Aug 08 01:17:29 2004
Return-path: <herbert@gondor.apana.org.au>
Received: from arnor.apana.org.au [203.14.152.115] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Btirw-0001q7-00; Sun, 08 Aug 2004 01:17:29 -0700
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by arnor.apana.org.au with esmtp (Exim 3.35 #1 (Debian))
	id 1Btirt-0004Eh-00; Sun, 08 Aug 2004 18:17:25 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
	id 1Btirp-0006Lr-00; Sun, 08 Aug 2004 18:17:21 +1000
Date: Sun, 8 Aug 2004 18:17:21 +1000
To: 102335@bugs.debian.org
Subject: Re: Bug#102335 acknowledged by developer (Not gonig to be included...)
Message-ID: <20040808081721.GA24387@gondor.apana.org.au>
References: <20040808041406.GF21419@ns.snowman.net> <E15EpxS-0000iP-00@gondolin.me.apana.org.au> <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
User-Agent: Mutt/1.5.6+20040523i
From: Herbert Xu <herbert@gondor.apana.org.au>
Delivered-To: 102335@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,VALID_BTS_CONTROL 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

reopen 102335
quit

On Sat, Aug 07, 2004 at 09:18:05PM -0700, Debian Bug Tracking System wrote:
> 
>   This is a rather old bug, tagged wontfix, and wishlist, w/ no activity
>   on it in, like, 3 years.  I think it's safe to close it at this point.
>   I seriously doubt the patch has any prayer of working w/ the current
>   version anyway...

The patch is only a hint of how the bug should be addressed.  The bug
should only be closed if you can include two pam_ldap lines in the
same PAM file with two configuration files referring to two separate
servers.

Last time I checked this still isn't the case.

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt




<strong>Bug reopened, originator not changed.</strong>
Request was from <code>Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</code>
to <code>control@bugs.debian.org</code>. 


Received: (at control) by bugs.debian.org; 8 Aug 2004 08:17:29 +0000
From herbert@gondor.apana.org.au Sun Aug 08 01:17:29 2004
Return-path: <herbert@gondor.apana.org.au>
Received: from arnor.apana.org.au [203.14.152.115] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Btirw-0001q7-00; Sun, 08 Aug 2004 01:17:29 -0700
Received: from gondolin.me.apana.org.au ([192.168.0.6] ident=mail)
	by arnor.apana.org.au with esmtp (Exim 3.35 #1 (Debian))
	id 1Btirt-0004Eh-00; Sun, 08 Aug 2004 18:17:25 +1000
Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
	id 1Btirp-0006Lr-00; Sun, 08 Aug 2004 18:17:21 +1000
Date: Sun, 8 Aug 2004 18:17:21 +1000
To: 102335@bugs.debian.org
Subject: Re: Bug#102335 acknowledged by developer (Not gonig to be included...)
Message-ID: <20040808081721.GA24387@gondor.apana.org.au>
References: <20040808041406.GF21419@ns.snowman.net> <E15EpxS-0000iP-00@gondolin.me.apana.org.au> <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <handler.102335.D102335.10919384621512.notifdone@bugs.debian.org>
User-Agent: Mutt/1.5.6+20040523i
From: Herbert Xu <herbert@gondor.apana.org.au>
Delivered-To: control@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,VALID_BTS_CONTROL 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 2

reopen 102335
quit

On Sat, Aug 07, 2004 at 09:18:05PM -0700, Debian Bug Tracking System wrote:
> 
>   This is a rather old bug, tagged wontfix, and wishlist, w/ no activity
>   on it in, like, 3 years.  I think it's safe to close it at this point.
>   I seriously doubt the patch has any prayer of working w/ the current
>   version anyway...

The patch is only a hint of how the bug should be addressed.  The bug
should only be closed if you can include two pam_ldap lines in the
same PAM file with two configuration files referring to two separate
servers.

Last time I checked this still isn't the case.

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt