X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fngircd%2Fpam.c;h=81d635c8685791186d7a58575335befe6c3aa113;hb=8ae2cdfce9f8ba75fe72d65603d4c05c87f6d9c2;hp=e6d25bc5c1d438481cfd1c024691b69141e2f92d;hpb=77870ddf2d87ddf222d87b58cb9afdf0609d49dd;p=ngircd-alex.git

diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c
index e6d25bc5..81d635c8 100644
--- a/src/ngircd/pam.c
+++ b/src/ngircd/pam.c
@@ -7,14 +7,17 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * PAM User Authentification
  */
 
 #include "portab.h"
 
 #ifdef PAM
 
+/**
+ * @file
+ * PAM User Authentication
+ */
+
 #include "imp.h"
 #include <assert.h>
 
@@ -84,7 +87,7 @@ static struct pam_conv conv = {
 };
 
 /**
- * Authenticate a connectiong client using PAM.
+ * Authenticate a connecting client using PAM.
  * @param Client The client to authenticate.
  * @return true when authentication succeeded, false otherwise.
  */
@@ -99,8 +102,8 @@ PAM_Authenticate(CLIENT *Client) {
 	/* Set supplied client password */
 	if (password)
 		free(password);
-	password = strdup(Client_Password(Client));
-	conv.appdata_ptr = password;
+	password = strdup(Conn_Password(Client_Conn(Client)));
+	conv.appdata_ptr = Conn_Password(Client_Conn(Client));
 
 	/* Initialize PAM */
 	retval = pam_start("ngircd", Client_OrigUser(Client), &conv, &pam);
@@ -111,7 +114,7 @@ PAM_Authenticate(CLIENT *Client) {
 
 	pam_set_item(pam, PAM_RUSER, Client_User(Client));
 	pam_set_item(pam, PAM_RHOST, Client_Hostname(Client));
-#ifdef HAVE_PAM_FAIL_DELAY
+#if defined(HAVE_PAM_FAIL_DELAY) && !defined(NO_PAM_FAIL_DELAY)
 	pam_fail_delay(pam, 0);
 #endif