Specify session context for OpenSSL clients

[ngircd-alex.git] / src / ngircd / pam.c

diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c
index e6d25bc5c1d438481cfd1c024691b69141e2f92d..d2a8a54e5d66eb15f5edfb573720c83f797d5dee 100644 (file)
--- a/src/ngircd/pam.c
+++ b/src/ngircd/pam.c
@@ -1,40 +1,38 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 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
 
-#include "imp.h"
-#include <assert.h>
-
-#include "defines.h"
-#include "log.h"
-#include "conn.h"
-#include "client.h"
+/**
+ * @file
+ * PAM User Authentication
+ */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-
 #ifdef HAVE_SECURITY_PAM_APPL_H
-#include <security/pam_appl.h>
+# include <security/pam_appl.h>
 #endif
-
 #ifdef HAVE_PAM_PAM_APPL_H
-#include <pam/pam_appl.h>
+# include <pam/pam_appl.h>
 #endif
 
-#include "exp.h"
+#include "defines.h"
+#include "log.h"
+#include "conn.h"
+#include "client.h"
+
 #include "pam.h"
 
 static char *password;
@@ -84,7 +82,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 +97,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 +109,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