wscript: Add check for --wrap linker flag
[vlendec/samba-autobuild/.git] / source3 / auth / pampass.c
index 018eae3a07e05e2a10c8a20c1c7d7625b75b4186..1a82fe7f20347732904526b7431ea15f814aaeef 100644 (file)
@@ -1,25 +1,23 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2.
+   Unix SMB/CIFS implementation.
    PAM Password checking
    Copyright (C) Andrew Tridgell 1992-2001
    Copyright (C) John H Terpsta 1999-2001
    Copyright (C) Andrew Bartlett 2001
    Copyright (C) Jeremy Allison 2001
-   
+
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
  */
 
 #include "includes.h"
+#include "auth.h"
+#include "../libcli/auth/pam_errors.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
 
 #ifdef WITH_PAM
 
  *   which determines what actions/limitations/allowances become affected.
  *********************************************************************/
 
+#if defined(HAVE_SECURITY_PAM_APPL_H)
 #include <security/pam_appl.h>
+#elif defined(HAVE_PAM_PAM_APPL_H)
+#include <pam/pam_appl.h>
+#endif
 
 /*
  * Structure used to communicate between the conversation function
@@ -54,22 +61,32 @@ struct smb_pam_userdata {
 
 typedef int (*smb_pam_conv_fn)(int, const struct pam_message **, struct pam_response **, void *appdata_ptr);
 
-/*
- *  Macros to help make life easy
- */
-#define COPY_STRING(s) (s) ? strdup(s) : NULL
+static char *smb_pam_copy_string(const char *s)
+{
+       if (s == NULL) {
+               return NULL;
+       }
+       return SMB_STRDUP(s);
+}
+
+static char *smb_pam_copy_fstring(const char *s)
+{
+       if (s[0] == '\0') {
+               return NULL;
+       }
+       return SMB_STRDUP(s);
+}
 
 /*******************************************************************
  PAM error handler.
  *********************************************************************/
 
-static BOOL smb_pam_error_handler(pam_handle_t *pamh, int pam_error, char *msg, int dbglvl)
+static bool smb_pam_error_handler(pam_handle_t *pamh, int pam_error, const char *msg, int dbglvl)
 {
 
        if( pam_error != PAM_SUCCESS) {
                DEBUG(dbglvl, ("smb_pam_error_handler: PAM: %s : %s\n",
                                msg, pam_strerror(pamh, pam_error)));
-               
                return False;
        }
        return True;
@@ -80,10 +97,12 @@ static BOOL smb_pam_error_handler(pam_handle_t *pamh, int pam_error, char *msg,
  failure as sucess.
 *********************************************************************/
 
-static BOOL smb_pam_nt_status_error_handler(pam_handle_t *pamh, int pam_error,
-                                                       char *msg, int dbglvl, 
+static bool smb_pam_nt_status_error_handler(pam_handle_t *pamh, int pam_error,
+                                           const char *msg, int dbglvl, 
                                            NTSTATUS *nt_status)
 {
+       *nt_status = pam_to_nt_status(pam_error);
+
        if (smb_pam_error_handler(pamh, pam_error, msg, dbglvl))
                return True;
 
@@ -126,7 +145,7 @@ static int smb_pam_conv(int num_msg,
                return PAM_CONV_ERR;
        }
 
-       reply = malloc(sizeof(struct pam_response) * num_msg);
+       reply = SMB_MALLOC_ARRAY(struct pam_response, num_msg);
        if (!reply)
                return PAM_CONV_ERR;
 
@@ -136,13 +155,15 @@ static int smb_pam_conv(int num_msg,
                switch (msg[replies]->msg_style) {
                        case PAM_PROMPT_ECHO_ON:
                                reply[replies].resp_retcode = PAM_SUCCESS;
-                               reply[replies].resp = COPY_STRING(udp->PAM_username);
+                               reply[replies].resp = smb_pam_copy_string(
+                                       udp->PAM_username);
                                /* PAM frees resp */
                                break;
 
                        case PAM_PROMPT_ECHO_OFF:
                                reply[replies].resp_retcode = PAM_SUCCESS;
-                               reply[replies].resp = COPY_STRING(udp->PAM_password);
+                               reply[replies].resp = smb_pam_copy_string(
+                                       udp->PAM_password);
                                /* PAM frees resp */
                                break;
 
@@ -182,7 +203,7 @@ static void special_char_sub(char *buf)
 
 static void pwd_sub(char *buf, const char *username, const char *oldpass, const char *newpass)
 {
-       pstring_sub(buf, "%u", username);
+       fstring_sub(buf, "%u", username);
        all_string_sub(buf, "%o", oldpass, sizeof(fstring));
        all_string_sub(buf, "%n", newpass, sizeof(fstring));
 }
@@ -198,48 +219,54 @@ struct chat_struct {
  Create a linked list containing chat data.
 ***************************************************************/
 
-static struct chat_struct *make_pw_chat(char *p) 
+static struct chat_struct *make_pw_chat(const char *p) 
 {
-       fstring prompt;
-       fstring reply;
+       char *prompt;
+       char *reply;
        struct chat_struct *list = NULL;
        struct chat_struct *t;
-       struct chat_struct *tmp;
+       TALLOC_CTX *frame = talloc_stackframe();
 
        while (1) {
-               t = (struct chat_struct *)malloc(sizeof(*t));
+               t = SMB_MALLOC_P(struct chat_struct);
                if (!t) {
                        DEBUG(0,("make_pw_chat: malloc failed!\n"));
+                       TALLOC_FREE(frame);
                        return NULL;
                }
 
                ZERO_STRUCTP(t);
 
-               DLIST_ADD_END(list, t, tmp);
+               DLIST_ADD_END(list, t);
 
-               if (!next_token(&p, prompt, NULL, sizeof(fstring)))
+               if (!next_token_talloc(frame, &p, &prompt, NULL)) {
                        break;
+               }
 
-               if (strequal(prompt,"."))
+               if (strequal(prompt,".")) {
                        fstrcpy(prompt,"*");
+               }
 
                special_char_sub(prompt);
                fstrcpy(t->prompt, prompt);
-               strlower(t->prompt);
-               trim_string(t->prompt, " ", " ");
+               (void)strlower_m(t->prompt);
+               trim_char(t->prompt, ' ', ' ');
 
-               if (!next_token(&p, reply, NULL, sizeof(fstring)))
+               if (!next_token_talloc(frame, &p, &reply, NULL)) {
                        break;
+               }
 
-               if (strequal(reply,"."))
-                               fstrcpy(reply,"");
+               if (strequal(reply,".")) {
+                       fstrcpy(reply,"");
+               }
 
                special_char_sub(reply);
                fstrcpy(t->reply, reply);
-               strlower(t->reply);
-               trim_string(t->reply, " ", " ");
+               (void)strlower_m(t->reply);
+               trim_char(t->reply, ' ', ' ');
 
        }
+       TALLOC_FREE(frame);
        return list;
 }
 
@@ -262,17 +289,17 @@ static int smb_pam_passchange_conv(int num_msg,
        fstring current_prompt;
        fstring current_reply;
        struct smb_pam_userdata *udp = (struct smb_pam_userdata *)appdata_ptr;
-       struct chat_struct *pw_chat= make_pw_chat(lp_passwd_chat());
+       struct chat_struct *pw_chat;
        struct chat_struct *t;
-       BOOL found; 
+       bool found; 
        *resp = NULL;
-       
+
        DEBUG(10,("smb_pam_passchange_conv: starting converstation for %d messages\n", num_msg));
 
        if (num_msg <= 0)
                return PAM_CONV_ERR;
 
-       if (pw_chat == NULL)
+       if ((pw_chat = make_pw_chat(lp_passwd_chat(talloc_tos()))) == NULL)
                return PAM_CONV_ERR;
 
        /*
@@ -286,7 +313,7 @@ static int smb_pam_passchange_conv(int num_msg,
                return PAM_CONV_ERR;
        }
 
-       reply = malloc(sizeof(struct pam_response) * num_msg);
+       reply = SMB_MALLOC_ARRAY(struct pam_response, num_msg);
        if (!reply) {
                DEBUG(0,("smb_pam_passchange_conv: malloc for reply failed!\n"));
                free_pw_chat(pw_chat);
@@ -300,21 +327,22 @@ static int smb_pam_passchange_conv(int num_msg,
                case PAM_PROMPT_ECHO_ON:
                        DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: PAM said: %s\n", msg[replies]->msg));
                        fstrcpy(current_prompt, msg[replies]->msg);
-                       trim_string(current_prompt, " ", " ");
+                       trim_char(current_prompt, ' ', ' ');
                        for (t=pw_chat; t; t=t->next) {
 
                                DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: trying to match |%s| to |%s|\n",
                                                t->prompt, current_prompt ));
 
-                               if (unix_wild_match(t->prompt, current_prompt) == 0) {
+                               if (unix_wild_match(t->prompt, current_prompt)) {
                                        fstrcpy(current_reply, t->reply);
                                        DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We sent: %s\n", current_reply));
                                        pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
 #ifdef DEBUG_PASSWORD
-                                       DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We actualy sent: %s\n", current_reply));
+                                       DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We actually sent: %s\n", current_reply));
 #endif
                                        reply[replies].resp_retcode = PAM_SUCCESS;
-                                       reply[replies].resp = COPY_STRING(current_reply);
+                                       reply[replies].resp = smb_pam_copy_fstring(
+                                               current_reply);
                                        found = True;
                                        break;
                                }
@@ -331,27 +359,28 @@ static int smb_pam_passchange_conv(int num_msg,
                case PAM_PROMPT_ECHO_OFF:
                        DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: PAM said: %s\n", msg[replies]->msg));
                        fstrcpy(current_prompt, msg[replies]->msg);
-                       trim_string(current_prompt, " ", " ");
+                       trim_char(current_prompt, ' ', ' ');
                        for (t=pw_chat; t; t=t->next) {
 
                                DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: trying to match |%s| to |%s|\n",
                                                t->prompt, current_prompt ));
 
-                               if (unix_wild_match(t->prompt, current_prompt) == 0) {
+                               if (unix_wild_match(t->prompt, current_prompt)) {
                                        fstrcpy(current_reply, t->reply);
                                        DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We sent: %s\n", current_reply));
                                        pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
                                        reply[replies].resp_retcode = PAM_SUCCESS;
-                                       reply[replies].resp = COPY_STRING(current_reply);
+                                       reply[replies].resp = smb_pam_copy_fstring(
+                                               current_reply);
 #ifdef DEBUG_PASSWORD
-                                       DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));
+                                       DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actually sent: %s\n", current_reply));
 #endif
                                        found = True;
                                        break;
                                }
                        }
                        /* PAM frees resp */
-                       
+
                        if (!found) {
                                DEBUG(3,("smb_pam_passchange_conv: Could not find reply for PAM prompt: %s\n",msg[replies]->msg));
                                free_pw_chat(pw_chat);
@@ -368,7 +397,7 @@ static int smb_pam_passchange_conv(int num_msg,
                        reply[replies].resp_retcode = PAM_SUCCESS;
                        reply[replies].resp = NULL;
                        break;
-                       
+
                default:
                        /* Must be an error of some sort... */
                        free_pw_chat(pw_chat);
@@ -376,7 +405,7 @@ static int smb_pam_passchange_conv(int num_msg,
                        return PAM_CONV_ERR;
                }
        }
-               
+
        free_pw_chat(pw_chat);
        if (reply)
                *resp = reply;
@@ -402,8 +431,8 @@ static void smb_free_pam_conv(struct pam_conv *pconv)
 static struct pam_conv *smb_setup_pam_conv(smb_pam_conv_fn smb_pam_conv_fnptr, const char *user,
                                        const char *passwd, const char *newpass)
 {
-       struct pam_conv *pconv = (struct pam_conv *)malloc(sizeof(struct pam_conv));
-       struct smb_pam_userdata *udp = (struct smb_pam_userdata *)malloc(sizeof(struct smb_pam_userdata));
+       struct pam_conv *pconv = SMB_MALLOC_P(struct pam_conv);
+       struct smb_pam_userdata *udp = SMB_MALLOC_P(struct smb_pam_userdata);
 
        if (pconv == NULL || udp == NULL) {
                SAFE_FREE(pconv);
@@ -424,12 +453,12 @@ static struct pam_conv *smb_setup_pam_conv(smb_pam_conv_fn smb_pam_conv_fnptr, c
  * PAM Closing out cleanup handler
  */
 
-static BOOL smb_pam_end(pam_handle_t *pamh, struct pam_conv *smb_pam_conv_ptr)
+static bool smb_pam_end(pam_handle_t *pamh, struct pam_conv *smb_pam_conv_ptr)
 {
        int pam_error;
 
        smb_free_pam_conv(smb_pam_conv_ptr);
-       
+
        if( pamh != NULL ) {
                pam_error = pam_end(pamh, 0);
                if(smb_pam_error_handler(pamh, pam_error, "End Cleanup Failed", 2) == True) {
@@ -445,10 +474,9 @@ static BOOL smb_pam_end(pam_handle_t *pamh, struct pam_conv *smb_pam_conv_ptr)
  * Start PAM authentication for specified account
  */
 
-static BOOL smb_pam_start(pam_handle_t **pamh, const char *user, const char *rhost, struct pam_conv *pconv)
+static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rhost, struct pam_conv *pconv)
 {
        int pam_error;
-       const char *our_rhost;
 
        *pamh = (pam_handle_t *)NULL;
 
@@ -460,24 +488,16 @@ static BOOL smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
                return False;
        }
 
-       if (rhost == NULL) {
-               our_rhost = client_name();
-               if (strequal(rhost,"UNKNOWN"))
-                       our_rhost = client_addr();
-       } else {
-               our_rhost = rhost;
-       }
-
-#ifdef PAM_RHOST
-       DEBUG(4,("smb_pam_start: PAM: setting rhost to: %s\n", our_rhost));
-       pam_error = pam_set_item(*pamh, PAM_RHOST, our_rhost);
+#if HAVE_PAM_RHOST
+       DEBUG(4,("smb_pam_start: PAM: setting rhost to: %s\n", rhost));
+       pam_error = pam_set_item(*pamh, PAM_RHOST, rhost);
        if(!smb_pam_error_handler(*pamh, pam_error, "set rhost failed", 0)) {
                smb_pam_end(*pamh, pconv);
                *pamh = (pam_handle_t *)NULL;
                return False;
        }
 #endif
-#ifdef PAM_TTY
+#if HAVE_PAM_TTY
        DEBUG(4,("smb_pam_start: PAM: setting tty\n"));
        pam_error = pam_set_item(*pamh, PAM_TTY, "samba");
        if (!smb_pam_error_handler(*pamh, pam_error, "set tty failed", 0)) {
@@ -493,7 +513,7 @@ static BOOL smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
 /*
  * PAM Authentication Handler
  */
-static NTSTATUS smb_pam_auth(pam_handle_t *pamh, char *user)
+static NTSTATUS smb_pam_auth(pam_handle_t *pamh, const char *user)
 {
        int pam_error;
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
@@ -502,41 +522,33 @@ static NTSTATUS smb_pam_auth(pam_handle_t *pamh, char *user)
         * To enable debugging set in /etc/pam.d/samba:
         *      auth required /lib/security/pam_pwdb.so nullok shadow audit
         */
-       
+
        DEBUG(4,("smb_pam_auth: PAM: Authenticate User: %s\n", user));
-       pam_error = pam_authenticate(pamh, PAM_SILENT | lp_null_passwords() ? 0 : PAM_DISALLOW_NULL_AUTHTOK);
+       pam_error = pam_authenticate(pamh, PAM_SILENT | (lp_null_passwords() ? 0 : PAM_DISALLOW_NULL_AUTHTOK));
        switch( pam_error ){
                case PAM_AUTH_ERR:
-                       DEBUG(2, ("smb_pam_auth: PAM: Athentication Error for user %s\n", user));
-                       nt_status = NT_STATUS_WRONG_PASSWORD;
+                       DEBUG(2, ("smb_pam_auth: PAM: Authentication Error for user %s\n", user));
                        break;
                case PAM_CRED_INSUFFICIENT:
                        DEBUG(2, ("smb_pam_auth: PAM: Insufficient Credentials for user %s\n", user));
-                       nt_status = NT_STATUS_INSUFFICIENT_LOGON_INFO;
                        break;
                case PAM_AUTHINFO_UNAVAIL:
                        DEBUG(2, ("smb_pam_auth: PAM: Authentication Information Unavailable for user %s\n", user));
-                       nt_status = NT_STATUS_LOGON_FAILURE;
                        break;
                case PAM_USER_UNKNOWN:
                        DEBUG(2, ("smb_pam_auth: PAM: Username %s NOT known to Authentication system\n", user));
-                       nt_status = NT_STATUS_NO_SUCH_USER;
                        break;
                case PAM_MAXTRIES:
                        DEBUG(2, ("smb_pam_auth: PAM: One or more authentication modules reports user limit for user %s exceeeded\n", user));
-                       nt_status = NT_STATUS_REMOTE_SESSION_LIMIT;
                        break;
                case PAM_ABORT:
                        DEBUG(0, ("smb_pam_auth: PAM: One or more PAM modules failed to load for user %s\n", user));
-                       nt_status = NT_STATUS_LOGON_FAILURE;
                        break;
                case PAM_SUCCESS:
                        DEBUG(4, ("smb_pam_auth: PAM: User %s Authenticated OK\n", user));
-                       nt_status = NT_STATUS_OK;
                        break;
                default:
                        DEBUG(0, ("smb_pam_auth: PAM: UNKNOWN ERROR while authenticating user %s\n", user));
-                       nt_status = NT_STATUS_LOGON_FAILURE;
                        break;
        }
 
@@ -557,30 +569,23 @@ static NTSTATUS smb_pam_account(pam_handle_t *pamh, const char * user)
        switch( pam_error ) {
                case PAM_AUTHTOK_EXPIRED:
                        DEBUG(2, ("smb_pam_account: PAM: User %s is valid but password is expired\n", user));
-                       nt_status = NT_STATUS_PASSWORD_EXPIRED;
                        break;
                case PAM_ACCT_EXPIRED:
                        DEBUG(2, ("smb_pam_account: PAM: User %s no longer permitted to access system\n", user));
-                       nt_status = NT_STATUS_ACCOUNT_EXPIRED;
                        break;
                case PAM_AUTH_ERR:
                        DEBUG(2, ("smb_pam_account: PAM: There was an authentication error for user %s\n", user));
-                       nt_status = NT_STATUS_LOGON_FAILURE;
                        break;
                case PAM_PERM_DENIED:
                        DEBUG(0, ("smb_pam_account: PAM: User %s is NOT permitted to access system at this time\n", user));
-                       nt_status = NT_STATUS_ACCOUNT_RESTRICTION;
                        break;
                case PAM_USER_UNKNOWN:
                        DEBUG(0, ("smb_pam_account: PAM: User \"%s\" is NOT known to account management\n", user));
-                       nt_status = NT_STATUS_NO_SUCH_USER;
                        break;
                case PAM_SUCCESS:
                        DEBUG(4, ("smb_pam_account: PAM: Account OK for User: %s\n", user));
-                       nt_status = NT_STATUS_OK;
                        break;
                default:
-                       nt_status = NT_STATUS_ACCOUNT_DISABLED;
                        DEBUG(0, ("smb_pam_account: PAM: UNKNOWN PAM ERROR (%d) during Account Management for User: %s\n", pam_error, user));
                        break;
        }
@@ -593,7 +598,7 @@ static NTSTATUS smb_pam_account(pam_handle_t *pamh, const char * user)
  * PAM Credential Setting
  */
 
-static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, char * user)
+static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, const char * user)
 {
        int pam_error;
        NTSTATUS nt_status = NT_STATUS_NO_TOKEN;
@@ -608,27 +613,21 @@ static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, char * user)
        switch( pam_error ) {
                case PAM_CRED_UNAVAIL:
                        DEBUG(0, ("smb_pam_setcred: PAM: Credentials not found for user:%s\n", user ));
-                        nt_status = NT_STATUS_NO_TOKEN;
                        break;
                case PAM_CRED_EXPIRED:
                        DEBUG(0, ("smb_pam_setcred: PAM: Credentials for user: \"%s\" EXPIRED!\n", user ));
-                       nt_status = NT_STATUS_PASSWORD_EXPIRED;
                        break;
                case PAM_USER_UNKNOWN:
                        DEBUG(0, ("smb_pam_setcred: PAM: User: \"%s\" is NOT known so can not set credentials!\n", user ));
-                       nt_status = NT_STATUS_NO_SUCH_USER;
                        break;
                case PAM_CRED_ERR:
                        DEBUG(0, ("smb_pam_setcred: PAM: Unknown setcredentials error - unable to set credentials for %s\n", user ));
-                       nt_status = NT_STATUS_LOGON_FAILURE;
                        break;
                case PAM_SUCCESS:
                        DEBUG(4, ("smb_pam_setcred: PAM: SetCredentials OK for User: %s\n", user));
-                       nt_status = NT_STATUS_OK;
                        break;
                default:
                        DEBUG(0, ("smb_pam_setcred: PAM: UNKNOWN PAM ERROR (%d) during SetCredentials for User: %s\n", pam_error, user));
-                       nt_status = NT_STATUS_NO_TOKEN;
                        break;
        }
 
@@ -639,11 +638,11 @@ static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, char * user)
 /*
  * PAM Internal Session Handler
  */
-static BOOL smb_internal_pam_session(pam_handle_t *pamh, char *user, char *tty, BOOL flag)
+static bool smb_internal_pam_session(pam_handle_t *pamh, const char *user, const char *tty, bool flag)
 {
        int pam_error;
 
-#ifdef PAM_TTY
+#if HAVE_PAM_TTY
        DEBUG(4,("smb_internal_pam_session: PAM: tty set to: %s\n", tty));
        pam_error = pam_set_item(pamh, PAM_TTY, tty);
        if (!smb_pam_error_handler(pamh, pam_error, "set tty failed", 0))
@@ -667,7 +666,7 @@ static BOOL smb_internal_pam_session(pam_handle_t *pamh, char *user, char *tty,
  * Internal PAM Password Changer.
  */
 
-static BOOL smb_pam_chauthtok(pam_handle_t *pamh, const char * user)
+static bool smb_pam_chauthtok(pam_handle_t *pamh, const char * user)
 {
        int pam_error;
 
@@ -721,7 +720,7 @@ static BOOL smb_pam_chauthtok(pam_handle_t *pamh, const char * user)
  * PAM Externally accessible Session handler
  */
 
-BOOL smb_pam_claim_session(char *user, char *tty, char *rhost)
+bool smb_pam_claim_session(const char *user, const char *tty, const char *rhost)
 {
        pam_handle_t *pamh = NULL;
        struct pam_conv *pconv = NULL;
@@ -749,7 +748,7 @@ BOOL smb_pam_claim_session(char *user, char *tty, char *rhost)
  * PAM Externally accessible Session handler
  */
 
-BOOL smb_pam_close_session(char *user, char *tty, char *rhost)
+bool smb_pam_close_session(const char *user, const char *tty, const char *rhost)
 {
        pam_handle_t *pamh = NULL;
        struct pam_conv *pconv = NULL;
@@ -777,7 +776,7 @@ BOOL smb_pam_close_session(char *user, char *tty, char *rhost)
  * PAM Externally accessible Account handler
  */
 
-NTSTATUS smb_pam_accountcheck(const char * user)
+NTSTATUS smb_pam_accountcheck(const char *user, const char *rhost)
 {
        NTSTATUS nt_status = NT_STATUS_ACCOUNT_DISABLED;
        pam_handle_t *pamh = NULL;
@@ -791,7 +790,7 @@ NTSTATUS smb_pam_accountcheck(const char * user)
        if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, NULL, NULL)) == NULL)
                return NT_STATUS_NO_MEMORY;
 
-       if (!smb_pam_start(&pamh, user, NULL, pconv))
+       if (!smb_pam_start(&pamh, user, rhost, pconv))
                return NT_STATUS_ACCOUNT_DISABLED;
 
        if (!NT_STATUS_IS_OK(nt_status = smb_pam_account(pamh, user)))
@@ -805,7 +804,8 @@ NTSTATUS smb_pam_accountcheck(const char * user)
  * PAM Password Validation Suite
  */
 
-NTSTATUS smb_pam_passcheck(char * user, char * password)
+NTSTATUS smb_pam_passcheck(const char * user, const char * rhost,
+                          const char * password)
 {
        pam_handle_t *pamh = NULL;
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
@@ -820,7 +820,7 @@ NTSTATUS smb_pam_passcheck(char * user, char * password)
        if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, password, NULL)) == NULL)
                return NT_STATUS_LOGON_FAILURE;
 
-       if (!smb_pam_start(&pamh, user, NULL, pconv))
+       if (!smb_pam_start(&pamh, user, rhost, pconv))
                return NT_STATUS_LOGON_FAILURE;
 
        if (!NT_STATUS_IS_OK(nt_status = smb_pam_auth(pamh, user))) {
@@ -849,7 +849,8 @@ NTSTATUS smb_pam_passcheck(char * user, char * password)
  * PAM Password Change Suite
  */
 
-BOOL smb_pam_passchange(const char * user, const char * oldpassword, const char * newpassword)
+bool smb_pam_passchange(const char *user, const char *rhost,
+                       const char *oldpassword, const char *newpassword)
 {
        /* Appropriate quantities of root should be obtained BEFORE calling this function */
        struct pam_conv *pconv = NULL;
@@ -858,7 +859,7 @@ BOOL smb_pam_passchange(const char * user, const char * oldpassword, const char
        if ((pconv = smb_setup_pam_conv(smb_pam_passchange_conv, user, oldpassword, newpassword)) == NULL)
                return False;
 
-       if(!smb_pam_start(&pamh, user, NULL, pconv))
+       if(!smb_pam_start(&pamh, user, rhost, pconv))
                return False;
 
        if (!smb_pam_chauthtok(pamh, user)) {
@@ -873,19 +874,19 @@ BOOL smb_pam_passchange(const char * user, const char * oldpassword, const char
 #else
 
 /* If PAM not used, no PAM restrictions on accounts. */
-NTSTATUS smb_pam_accountcheck(const char * user)
+NTSTATUS smb_pam_accountcheck(const char *user, const char *rhost)
 {
        return NT_STATUS_OK;
 }
 
 /* If PAM not used, also no PAM restrictions on sessions. */
-BOOL smb_pam_claim_session(char *user, char *tty, char *rhost)
+bool smb_pam_claim_session(const char *user, const char *tty, const char *rhost)
 {
        return True;
 }
 
 /* If PAM not used, also no PAM restrictions on sessions. */
-BOOL smb_pam_close_session(char *in_user, char *tty, char *rhost)
+bool smb_pam_close_session(const char *in_user, const char *tty, const char *rhost)
 {
        return True;
 }