Cleanups!
[kai/samba.git] / source3 / auth / pampass.c
index e27e15f24f4f73f9e333842cfc904426014c1280..211e8bce1570f6d9b7324eaede8098fdcff64c7a 100644 (file)
@@ -1,6 +1,5 @@
 /* 
-   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
@@ -30,7 +29,8 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
 
 #ifdef WITH_PAM
 
@@ -49,9 +49,9 @@ extern int DEBUGLEVEL;
  */
 
 struct smb_pam_userdata {
-       char *PAM_username;
-       char *PAM_password;
-       char *PAM_newpassword;
+       const char *PAM_username;
+       const char *PAM_password;
+       const char *PAM_newpassword;
 };
 
 typedef int (*smb_pam_conv_fn)(int, const struct pam_message **, struct pam_response **, void *appdata_ptr);
@@ -71,6 +71,7 @@ static BOOL smb_pam_error_handler(pam_handle_t *pamh, int pam_error, char *msg,
        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;
@@ -82,12 +83,15 @@ static BOOL smb_pam_error_handler(pam_handle_t *pamh, int pam_error, char *msg,
 *********************************************************************/
 
 static BOOL smb_pam_nt_status_error_handler(pam_handle_t *pamh, int pam_error,
-                                                       char *msg, int dbglvl, uint32 *nt_status)
+                                                       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;
 
-       if (*nt_status == NT_STATUS_NOPROBLEMO) {
+       if (NT_STATUS_IS_OK(*nt_status)) {
                /* Complain LOUDLY */
                DEBUG(0, ("smb_pam_nt_status_error_handler: PAM: BUG: PAM and NT_STATUS \
 error MISMATCH, forcing to NT_STATUS_LOGON_FAILURE"));
@@ -130,6 +134,8 @@ static int smb_pam_conv(int num_msg,
        if (!reply)
                return PAM_CONV_ERR;
 
+       memset(reply, '\0', sizeof(struct pam_response) * num_msg);
+
        for (replies = 0; replies < num_msg; replies++) {
                switch (msg[replies]->msg_style) {
                        case PAM_PROMPT_ECHO_ON:
@@ -155,7 +161,7 @@ static int smb_pam_conv(int num_msg,
 
                        default:
                                /* Must be an error of some sort... */
-                               free(reply);
+                               SAFE_FREE(reply);
                                return PAM_CONV_ERR;
                }
        }
@@ -170,6 +176,86 @@ static int smb_pam_conv(int num_msg,
  * echo off means password.
  */
 
+static void special_char_sub(char *buf)
+{
+       all_string_sub(buf, "\\n", "", 0);
+       all_string_sub(buf, "\\r", "", 0);
+       all_string_sub(buf, "\\s", " ", 0);
+       all_string_sub(buf, "\\t", "\t", 0);
+}
+
+static void pwd_sub(char *buf, const char *username, const char *oldpass, const char *newpass)
+{
+       pstring_sub(buf, "%u", username);
+       all_string_sub(buf, "%o", oldpass, sizeof(fstring));
+       all_string_sub(buf, "%n", newpass, sizeof(fstring));
+}
+
+
+struct chat_struct {
+       struct chat_struct *next, *prev;
+       fstring prompt;
+       fstring reply;
+};
+
+/**************************************************************
+ Create a linked list containing chat data.
+***************************************************************/
+
+static struct chat_struct *make_pw_chat(char *p) 
+{
+       fstring prompt;
+       fstring reply;
+       struct chat_struct *list = NULL;
+       struct chat_struct *t;
+       struct chat_struct *tmp;
+
+       while (1) {
+               t = (struct chat_struct *)malloc(sizeof(*t));
+               if (!t) {
+                       DEBUG(0,("make_pw_chat: malloc failed!\n"));
+                       return NULL;
+               }
+
+               ZERO_STRUCTP(t);
+
+               DLIST_ADD_END(list, t, tmp);
+
+               if (!next_token(&p, prompt, NULL, sizeof(fstring)))
+                       break;
+
+               if (strequal(prompt,"."))
+                       fstrcpy(prompt,"*");
+
+               special_char_sub(prompt);
+               fstrcpy(t->prompt, prompt);
+               strlower(t->prompt);
+               trim_string(t->prompt, " ", " ");
+
+               if (!next_token(&p, reply, NULL, sizeof(fstring)))
+                       break;
+
+               if (strequal(reply,"."))
+                               fstrcpy(reply,"");
+
+               special_char_sub(reply);
+               fstrcpy(t->reply, reply);
+               strlower(t->reply);
+               trim_string(t->reply, " ", " ");
+
+       }
+       return list;
+}
+
+static void free_pw_chat(struct chat_struct *list)
+{
+    while (list) {
+        struct chat_struct *old_head = list;
+        DLIST_REMOVE(list, list);
+        SAFE_FREE(old_head);
+    }
+}
+
 static int smb_pam_passchange_conv(int num_msg,
                                const struct pam_message **msg,
                                struct pam_response **resp,
@@ -177,18 +263,22 @@ static int smb_pam_passchange_conv(int num_msg,
 {
        int replies = 0;
        struct pam_response *reply = NULL;
-       fstring oldpw_prompt;
-       fstring newpw_prompt;
-       fstring repeatpw_prompt;
-       fstring prompt_ret;
-       char *p = lp_passwd_chat();
+       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 *t;
+       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)
+               return PAM_CONV_ERR;
+
        /*
         * Apparantly HPUX has a buggy PAM that doesn't support the
         * appdata_ptr. Fail if this is the case. JRA.
@@ -196,62 +286,82 @@ static int smb_pam_passchange_conv(int num_msg,
 
        if (udp == NULL) {
                DEBUG(0,("smb_pam_passchange_conv: PAM on this system is broken - appdata_ptr == NULL !\n"));
+               free_pw_chat(pw_chat);
                return PAM_CONV_ERR;
        }
 
-       /* Get the prompts. */
-
-       if (!next_token(&p, oldpw_prompt, NULL, sizeof(fstring)))
-               return PAM_CONV_ERR;
-       strlower(oldpw_prompt);
-       if (!next_token(&p, newpw_prompt, NULL, sizeof(fstring)))
-               return PAM_CONV_ERR;
-       strlower(newpw_prompt);
-       if (!next_token(&p, repeatpw_prompt, NULL, sizeof(fstring)))
-               return PAM_CONV_ERR;
-       strlower(repeatpw_prompt);
-
        reply = malloc(sizeof(struct pam_response) * num_msg);
-       if (!reply)
+       if (!reply) {
+               DEBUG(0,("smb_pam_passchange_conv: malloc for reply failed!\n"));
+               free_pw_chat(pw_chat);
                return PAM_CONV_ERR;
+       }
 
        for (replies = 0; replies < num_msg; replies++) {
+               found = False;
+               DEBUG(10,("smb_pam_passchange_conv: Processing message %d\n", replies));
                switch (msg[replies]->msg_style) {
                case PAM_PROMPT_ECHO_ON:
-                       DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: Replied: %s\n", msg[replies]->msg));
-                       reply[replies].resp_retcode = PAM_SUCCESS;
-                       reply[replies].resp = COPY_STRING(udp->PAM_username);
+                       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, " ", " ");
+                       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) {
+                                       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));
+#endif
+                                       reply[replies].resp_retcode = PAM_SUCCESS;
+                                       reply[replies].resp = COPY_STRING(current_reply);
+                                       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);
+                               SAFE_FREE(reply);
+                               return PAM_CONV_ERR;
+                       }
                        break;
 
                case PAM_PROMPT_ECHO_OFF:
-                       reply[replies].resp_retcode = PAM_SUCCESS;
-                       if (!msg[replies]->msg) {
-                               free(reply);
-                               reply = NULL;
-                               return PAM_CONV_ERR;
+                       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, " ", " ");
+                       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) {
+                                       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);
+#ifdef DEBUG_PASSWORD
+                                       DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));
+#endif
+                                       found = True;
+                                       break;
+                               }
                        }
-
-                       DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: Replied: %s\n", msg[replies]->msg));
-
-                       fstrcpy(prompt_ret, msg[replies]->msg);
-                       strlower(prompt_ret);
-
-                       if (ms_fnmatch( oldpw_prompt, prompt_ret) == 0) {
-                               reply[replies].resp = COPY_STRING(udp->PAM_password);
-                       } else if (ms_fnmatch( newpw_prompt, prompt_ret) == 0) {
-                               reply[replies].resp = COPY_STRING(udp->PAM_newpassword);
-                       } else if (ms_fnmatch(repeatpw_prompt, prompt_ret) == 0) {
-                               reply[replies].resp = COPY_STRING(udp->PAM_newpassword);
-                       } else {
+                       /* PAM frees resp */
+                       
+                       if (!found) {
                                DEBUG(3,("smb_pam_passchange_conv: Could not find reply for PAM prompt: %s\n",msg[replies]->msg));
-                               DEBUG(5,("smb_pam_passchange_conv: Prompts available:\n OldPW: \"%s\"\nNewPW: \"%s\"\n \
-RepeatPW: \"%s\"\n",oldpw_prompt, newpw_prompt,repeatpw_prompt));
-                               free(reply);
-                               reply = NULL;
+                               free_pw_chat(pw_chat);
+                               SAFE_FREE(reply);
                                return PAM_CONV_ERR;
                        }
-                       /* PAM frees resp */
                        break;
 
                case PAM_TEXT_INFO:
@@ -262,15 +372,16 @@ RepeatPW: \"%s\"\n",oldpw_prompt, newpw_prompt,repeatpw_prompt));
                        reply[replies].resp_retcode = PAM_SUCCESS;
                        reply[replies].resp = NULL;
                        break;
-
+                       
                default:
                        /* Must be an error of some sort... */
-                       free(reply);
-                       reply = NULL;
+                       free_pw_chat(pw_chat);
+                       SAFE_FREE(reply);
                        return PAM_CONV_ERR;
                }
        }
-
+               
+       free_pw_chat(pw_chat);
        if (reply)
                *resp = reply;
        return PAM_SUCCESS;
@@ -283,24 +394,24 @@ RepeatPW: \"%s\"\n",oldpw_prompt, newpw_prompt,repeatpw_prompt));
 static void smb_free_pam_conv(struct pam_conv *pconv)
 {
        if (pconv)
-               safe_free(pconv->appdata_ptr);
+               SAFE_FREE(pconv->appdata_ptr);
 
-       safe_free(pconv);
+       SAFE_FREE(pconv);
 }
 
 /***************************************************************************
  Allocate a pam_conv struct.
 ****************************************************************************/
 
-static struct pam_conv *smb_setup_pam_conv(smb_pam_conv_fn smb_pam_conv_fnptr, char *user,
-                                       char *passwd, char *newpass)
+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));
 
        if (pconv == NULL || udp == NULL) {
-               safe_free(pconv);
-               safe_free(udp);
+               SAFE_FREE(pconv);
+               SAFE_FREE(udp);
                return NULL;
        }
 
@@ -338,9 +449,10 @@ 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, char *user, 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;
 
@@ -353,14 +465,16 @@ static BOOL smb_pam_start(pam_handle_t **pamh, char *user, char *rhost, struct p
        }
 
        if (rhost == NULL) {
-               rhost = client_name();
+               our_rhost = client_name();
                if (strequal(rhost,"UNKNOWN"))
-                       rhost = client_addr();
+                       our_rhost = client_addr();
+       } else {
+               our_rhost = rhost;
        }
 
 #ifdef PAM_RHOST
-       DEBUG(4,("smb_pam_start: PAM: setting rhost to: %s\n", rhost));
-       pam_error = pam_set_item(*pamh, PAM_RHOST, 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(!smb_pam_error_handler(*pamh, pam_error, "set rhost failed", 0)) {
                smb_pam_end(*pamh, pconv);
                *pamh = (pam_handle_t *)NULL;
@@ -383,10 +497,10 @@ static BOOL smb_pam_start(pam_handle_t **pamh, char *user, char *rhost, struct p
 /*
  * PAM Authentication Handler
  */
-static uint32 smb_pam_auth(pam_handle_t *pamh, char *user)
+static NTSTATUS smb_pam_auth(pam_handle_t *pamh, const char *user)
 {
        int pam_error;
-       uint32 nt_status = NT_STATUS_LOGON_FAILURE;
+       NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
 
        /*
         * To enable debugging set in /etc/pam.d/samba:
@@ -398,35 +512,27 @@ static uint32 smb_pam_auth(pam_handle_t *pamh, char *user)
        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;
                        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_NOPROBLEMO;
                        break;
                default:
                        DEBUG(0, ("smb_pam_auth: PAM: UNKNOWN ERROR while authenticating user %s\n", user));
-                       nt_status = NT_STATUS_LOGON_FAILURE;
                        break;
        }
 
@@ -437,40 +543,33 @@ static uint32 smb_pam_auth(pam_handle_t *pamh, char *user)
 /* 
  * PAM Account Handler
  */
-static uint32 smb_pam_account(pam_handle_t *pamh, char * user)
+static NTSTATUS smb_pam_account(pam_handle_t *pamh, const char * user)
 {
        int pam_error;
-       uint32 nt_status = NT_STATUS_ACCOUNT_DISABLED;
+       NTSTATUS nt_status = NT_STATUS_ACCOUNT_DISABLED;
 
        DEBUG(4,("smb_pam_account: PAM: Account Management for User: %s\n", user));
        pam_error = pam_acct_mgmt(pamh, PAM_SILENT); /* Is user account enabled? */
        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_NOPROBLEMO;
                        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;
        }
@@ -483,10 +582,10 @@ static uint32 smb_pam_account(pam_handle_t *pamh, char * user)
  * PAM Credential Setting
  */
 
-static uint32 smb_pam_setcred(pam_handle_t *pamh, char * user)
+static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, const char * user)
 {
        int pam_error;
-       uint32 nt_status = NT_STATUS_NO_TOKEN;
+       NTSTATUS nt_status = NT_STATUS_NO_TOKEN;
 
        /*
         * This will allow samba to aquire a kerberos token. And, when
@@ -498,27 +597,21 @@ static uint32 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_NOPROBLEMO;
                        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;
        }
 
@@ -529,7 +622,7 @@ static uint32 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;
 
@@ -557,7 +650,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, char * user)
+static BOOL smb_pam_chauthtok(pam_handle_t *pamh, const char * user)
 {
        int pam_error;
 
@@ -667,24 +760,24 @@ BOOL smb_pam_close_session(char *user, char *tty, char *rhost)
  * PAM Externally accessible Account handler
  */
 
-uint32 smb_pam_accountcheck(char * user)
+NTSTATUS smb_pam_accountcheck(const char * user)
 {
-       uint32 nt_status = NT_STATUS_ACCOUNT_DISABLED;
+       NTSTATUS nt_status = NT_STATUS_ACCOUNT_DISABLED;
        pam_handle_t *pamh = NULL;
        struct pam_conv *pconv = NULL;
 
        /* Ignore PAM if told to. */
 
        if (!lp_obey_pam_restrictions())
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
 
        if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, NULL, NULL)) == NULL)
-               return False;
+               return NT_STATUS_NO_MEMORY;
 
        if (!smb_pam_start(&pamh, user, NULL, pconv))
                return NT_STATUS_ACCOUNT_DISABLED;
 
-       if ((nt_status = smb_pam_account(pamh, user)) != NT_STATUS_NOPROBLEMO)
+       if (!NT_STATUS_IS_OK(nt_status = smb_pam_account(pamh, user)))
                DEBUG(0, ("smb_pam_accountcheck: PAM: Account Validation Failed - Rejecting User %s!\n", user));
 
        smb_pam_end(pamh, pconv);
@@ -695,10 +788,10 @@ uint32 smb_pam_accountcheck(char * user)
  * PAM Password Validation Suite
  */
 
-uint32 smb_pam_passcheck(char * user, char * password)
+NTSTATUS smb_pam_passcheck(const char * user, const char * password)
 {
        pam_handle_t *pamh = NULL;
-       uint32 nt_status = NT_STATUS_LOGON_FAILURE;
+       NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
        struct pam_conv *pconv = NULL;
 
        /*
@@ -713,19 +806,19 @@ uint32 smb_pam_passcheck(char * user, char * password)
        if (!smb_pam_start(&pamh, user, NULL, pconv))
                return NT_STATUS_LOGON_FAILURE;
 
-       if ((nt_status = smb_pam_auth(pamh, user)) != NT_STATUS_NOPROBLEMO) {
+       if (!NT_STATUS_IS_OK(nt_status = smb_pam_auth(pamh, user))) {
                DEBUG(0, ("smb_pam_passcheck: PAM: smb_pam_auth failed - Rejecting User %s !\n", user));
                smb_pam_end(pamh, pconv);
                return nt_status;
        }
 
-       if ((nt_status = smb_pam_account(pamh, user)) != NT_STATUS_NOPROBLEMO) {
+       if (!NT_STATUS_IS_OK(nt_status = smb_pam_account(pamh, user))) {
                DEBUG(0, ("smb_pam_passcheck: PAM: smb_pam_account failed - Rejecting User %s !\n", user));
                smb_pam_end(pamh, pconv);
                return nt_status;
        }
 
-       if ((nt_status = smb_pam_setcred(pamh, user)) != NT_STATUS_NOPROBLEMO) {
+       if (!NT_STATUS_IS_OK(nt_status = smb_pam_setcred(pamh, user))) {
                DEBUG(0, ("smb_pam_passcheck: PAM: smb_pam_setcred failed - Rejecting User %s !\n", user));
                smb_pam_end(pamh, pconv);
                return nt_status;
@@ -739,7 +832,7 @@ uint32 smb_pam_passcheck(char * user, char * password)
  * PAM Password Change Suite
  */
 
-BOOL smb_pam_passchange(char * user, char * oldpassword, char * newpassword)
+BOOL smb_pam_passchange(const char * user, const char * oldpassword, const char * newpassword)
 {
        /* Appropriate quantities of root should be obtained BEFORE calling this function */
        struct pam_conv *pconv = NULL;
@@ -763,19 +856,19 @@ BOOL smb_pam_passchange(char * user, char * oldpassword, char * newpassword)
 #else
 
 /* If PAM not used, no PAM restrictions on accounts. */
- uint32 smb_pam_accountcheck(char * user)
+NTSTATUS smb_pam_accountcheck(const char * user)
 {
-       return NT_STATUS_NOPROBLEMO;
+       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(char *user, char *tty, 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(char *in_user, char *tty, char *rhost)
 {
        return True;
 }