ctdb-daemon: Drop duplicate initialisation of request ID context

[nivanova/samba-autobuild/.git] / source3 / auth / pampass.c

diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index c4da1e676c128a7314f37b29b0b76420ea3b58ff..8cb894482aed1590925cf0d17c9e5391f70cc311 100644 (file)
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -168,7 +168,7 @@ static int smb_pam_conv(int num_msg,
                                break;
 
                        case PAM_TEXT_INFO:
-                               /* fall through */
+                               FALL_THROUGH;
 
                        case PAM_ERROR_MSG:
                                /* ignore it... */
@@ -237,7 +237,7 @@ static struct chat_struct *make_pw_chat(const char *p)
 
                ZERO_STRUCTP(t);
 
-               DLIST_ADD_END(list, t, struct chat_struct*);
+               DLIST_ADD_END(list, t);
 
                if (!next_token_talloc(frame, &p, &prompt, NULL)) {
                        break;
@@ -249,7 +249,7 @@ static struct chat_struct *make_pw_chat(const char *p)
 
                special_char_sub(prompt);
                fstrcpy(t->prompt, prompt);
-               strlower_m(t->prompt);
+               (void)strlower_m(t->prompt);
                trim_char(t->prompt, ' ', ' ');
 
                if (!next_token_talloc(frame, &p, &reply, NULL)) {
@@ -262,7 +262,7 @@ static struct chat_struct *make_pw_chat(const char *p)
 
                special_char_sub(reply);
                fstrcpy(t->reply, reply);
-               strlower_m(t->reply);
+               (void)strlower_m(t->reply);
                trim_char(t->reply, ' ', ' ');
 
        }
@@ -299,7 +299,7 @@ static int smb_pam_passchange_conv(int num_msg,
        if (num_msg <= 0)
                return PAM_CONV_ERR;
 
-       if ((pw_chat = make_pw_chat(lp_passwd_chat())) == NULL)
+       if ((pw_chat = make_pw_chat(lp_passwd_chat(talloc_tos()))) == NULL)
                return PAM_CONV_ERR;
 
        /*
@@ -390,7 +390,7 @@ static int smb_pam_passchange_conv(int num_msg,
                        break;
 
                case PAM_TEXT_INFO:
-                       /* fall through */
+                       FALL_THROUGH;
 
                case PAM_ERROR_MSG:
                        /* ignore it... */
@@ -524,7 +524,7 @@ static NTSTATUS smb_pam_auth(pam_handle_t *pamh, const char *user)
         */
 
        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: Authentication Error for user %s\n", user));
@@ -720,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;
@@ -748,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;
@@ -880,13 +880,13 @@ NTSTATUS smb_pam_accountcheck(const char *user, const char *rhost)
 }
 
 /* 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;
 }