diff options
-rw-r--r-- | monitor.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -786,7 +786,7 @@ mm_answer_skeyrespond(int sock, Buffer *m) | |||
786 | 786 | ||
787 | #ifdef USE_PAM | 787 | #ifdef USE_PAM |
788 | int | 788 | int |
789 | mm_answer_pam_start(int socket, Buffer *m) | 789 | mm_answer_pam_start(int sock, Buffer *m) |
790 | { | 790 | { |
791 | if (!options.use_pam) | 791 | if (!options.use_pam) |
792 | fatal("UsePAM not set, but ended up in %s anyway", __func__); | 792 | fatal("UsePAM not set, but ended up in %s anyway", __func__); |
@@ -799,7 +799,7 @@ mm_answer_pam_start(int socket, Buffer *m) | |||
799 | } | 799 | } |
800 | 800 | ||
801 | int | 801 | int |
802 | mm_answer_pam_account(int socket, Buffer *m) | 802 | mm_answer_pam_account(int sock, Buffer *m) |
803 | { | 803 | { |
804 | u_int ret; | 804 | u_int ret; |
805 | 805 | ||
@@ -810,7 +810,7 @@ mm_answer_pam_account(int socket, Buffer *m) | |||
810 | 810 | ||
811 | buffer_put_int(m, ret); | 811 | buffer_put_int(m, ret); |
812 | 812 | ||
813 | mm_request_send(socket, MONITOR_ANS_PAM_ACCOUNT, m); | 813 | mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m); |
814 | 814 | ||
815 | return (ret); | 815 | return (ret); |
816 | } | 816 | } |
@@ -819,7 +819,7 @@ static void *sshpam_ctxt, *sshpam_authok; | |||
819 | extern KbdintDevice sshpam_device; | 819 | extern KbdintDevice sshpam_device; |
820 | 820 | ||
821 | int | 821 | int |
822 | mm_answer_pam_init_ctx(int socket, Buffer *m) | 822 | mm_answer_pam_init_ctx(int sock, Buffer *m) |
823 | { | 823 | { |
824 | 824 | ||
825 | debug3("%s", __func__); | 825 | debug3("%s", __func__); |
@@ -833,12 +833,12 @@ mm_answer_pam_init_ctx(int socket, Buffer *m) | |||
833 | } else { | 833 | } else { |
834 | buffer_put_int(m, 0); | 834 | buffer_put_int(m, 0); |
835 | } | 835 | } |
836 | mm_request_send(socket, MONITOR_ANS_PAM_INIT_CTX, m); | 836 | mm_request_send(sock, MONITOR_ANS_PAM_INIT_CTX, m); |
837 | return (0); | 837 | return (0); |
838 | } | 838 | } |
839 | 839 | ||
840 | int | 840 | int |
841 | mm_answer_pam_query(int socket, Buffer *m) | 841 | mm_answer_pam_query(int sock, Buffer *m) |
842 | { | 842 | { |
843 | char *name, *info, **prompts; | 843 | char *name, *info, **prompts; |
844 | u_int num, *echo_on; | 844 | u_int num, *echo_on; |
@@ -867,12 +867,12 @@ mm_answer_pam_query(int socket, Buffer *m) | |||
867 | xfree(prompts); | 867 | xfree(prompts); |
868 | if (echo_on != NULL) | 868 | if (echo_on != NULL) |
869 | xfree(echo_on); | 869 | xfree(echo_on); |
870 | mm_request_send(socket, MONITOR_ANS_PAM_QUERY, m); | 870 | mm_request_send(sock, MONITOR_ANS_PAM_QUERY, m); |
871 | return (0); | 871 | return (0); |
872 | } | 872 | } |
873 | 873 | ||
874 | int | 874 | int |
875 | mm_answer_pam_respond(int socket, Buffer *m) | 875 | mm_answer_pam_respond(int sock, Buffer *m) |
876 | { | 876 | { |
877 | char **resp; | 877 | char **resp; |
878 | u_int num; | 878 | u_int num; |
@@ -894,7 +894,7 @@ mm_answer_pam_respond(int socket, Buffer *m) | |||
894 | } | 894 | } |
895 | buffer_clear(m); | 895 | buffer_clear(m); |
896 | buffer_put_int(m, ret); | 896 | buffer_put_int(m, ret); |
897 | mm_request_send(socket, MONITOR_ANS_PAM_RESPOND, m); | 897 | mm_request_send(sock, MONITOR_ANS_PAM_RESPOND, m); |
898 | auth_method = "keyboard-interactive/pam"; | 898 | auth_method = "keyboard-interactive/pam"; |
899 | if (ret == 0) | 899 | if (ret == 0) |
900 | sshpam_authok = sshpam_ctxt; | 900 | sshpam_authok = sshpam_ctxt; |
@@ -902,13 +902,13 @@ mm_answer_pam_respond(int socket, Buffer *m) | |||
902 | } | 902 | } |
903 | 903 | ||
904 | int | 904 | int |
905 | mm_answer_pam_free_ctx(int socket, Buffer *m) | 905 | mm_answer_pam_free_ctx(int sock, Buffer *m) |
906 | { | 906 | { |
907 | 907 | ||
908 | debug3("%s", __func__); | 908 | debug3("%s", __func__); |
909 | (sshpam_device.free_ctx)(sshpam_ctxt); | 909 | (sshpam_device.free_ctx)(sshpam_ctxt); |
910 | buffer_clear(m); | 910 | buffer_clear(m); |
911 | mm_request_send(socket, MONITOR_ANS_PAM_FREE_CTX, m); | 911 | mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m); |
912 | return (sshpam_authok == sshpam_ctxt); | 912 | return (sshpam_authok == sshpam_ctxt); |
913 | } | 913 | } |
914 | #endif | 914 | #endif |