Add PAMServiceName setting to specify the used PAM configuration

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

diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c
index b28e866f42324d4b497f998ad34a8021205233c3..4e47ddb16d8d8be0eaa3b0ccddb6e411e1837960 100644 (file)
--- a/src/ngircd/pam.c
+++ b/src/ngircd/pam.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -15,29 +15,25 @@
 
 /**
  * @file
- * PAM User Authentification
+ * PAM User Authentication
  */
 
-#include "imp.h"
 #include <assert.h>
-
-#include "defines.h"
-#include "log.h"
-#include "conn.h"
-#include "client.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 "conf.h"
+
 #include "pam.h"
 
 static char *password;
@@ -87,7 +83,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.
  */
@@ -102,11 +98,11 @@ 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);
+       retval = pam_start(Conf_PAMServiceName, Client_OrigUser(Client), &conv, &pam);
        if (retval != PAM_SUCCESS) {
                Log(LOG_ERR, "PAM: Failed to create authenticator! (%d)", retval);
                return false;