s3/pam: move variable declaration into belonging ifdef section

[ira/wip.git] / source3 / auth / pampass.c

diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index 9345eed27afb6103c48a02d741f7602271f2fe62..e08670f481751add0301463e3dd77afc325f9bb5 100644 (file)
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -276,7 +276,7 @@ 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; 
        *resp = NULL;
@@ -286,7 +286,7 @@ static int smb_pam_passchange_conv(int num_msg,
        if (num_msg <= 0)
                return PAM_CONV_ERR;
 
-       if (pw_chat == NULL)
+       if ((pw_chat = make_pw_chat(lp_passwd_chat())) == NULL)
                return PAM_CONV_ERR;
 
        /*
@@ -462,8 +462,10 @@ static bool smb_pam_end(pam_handle_t *pamh, struct pam_conv *smb_pam_conv_ptr)
 static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rhost, struct pam_conv *pconv)
 {
        int pam_error;
+#ifdef PAM_RHOST
        const char *our_rhost;
        char addr[INET6_ADDRSTRLEN];
+#endif
 
        *pamh = (pam_handle_t *)NULL;
 
@@ -475,6 +477,7 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
                return False;
        }
 
+#ifdef PAM_RHOST
        if (rhost == NULL) {
                our_rhost = client_name(get_client_fd());
                if (strequal(our_rhost,"UNKNOWN"))
@@ -483,7 +486,6 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
                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(!smb_pam_error_handler(*pamh, pam_error, "set rhost failed", 0)) {