Mercurial > dropbear
changeset 1071:696205e3dc99 pam
Remove ATTRIB_NORETURN from session_loop() since it returns.
The stack breaks pretty badly.
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 17 Mar 2015 21:58:32 +0800 |
| parents | 16379795f80b |
| children | |
| files | common-channel.c session.h svr-authpam.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common-channel.c Mon Mar 16 22:10:30 2015 +0800 +++ b/common-channel.c Tue Mar 17 21:58:32 2015 +0800 @@ -482,7 +482,7 @@ if (written < 0) { if (errno != EINTR && errno != EAGAIN) { - TRACE(("errno %d len %d", errno, len)) + TRACE(("errno %d", errno)) close_chan_fd(channel, fd, SHUT_WR); } } else {
--- a/session.h Mon Mar 16 22:10:30 2015 +0800 +++ b/session.h Tue Mar 17 21:58:32 2015 +0800 @@ -44,7 +44,7 @@ extern int exitflag; void common_session_init(int sock_in, int sock_out); -void session_loop() ATTRIB_NORETURN; +void session_loop(); void session_cleanup(); void send_session_identification(); void send_msg_ignore();
--- a/svr-authpam.c Mon Mar 16 22:10:30 2015 +0800 +++ b/svr-authpam.c Tue Mar 17 21:58:32 2015 +0800 @@ -162,15 +162,15 @@ } /* PAM conversation function - for now we only handle one message */ -int -pamConvFunc(int num_msg, +static int +dropbear_pam_conv_func(int num_msg, const struct pam_message **msgs, struct pam_response **respp, void *UNUSED(appdata_ptr)) { int ret = PAM_SYSTEM_ERR; - TRACE(("enter pamConvFunc")) + TRACE(("enter dropbear_pam_conv_func")) if (ses.recursion_count != 1) { dropbear_exit("PAM failure"); @@ -205,7 +205,7 @@ void svr_auth_pam() { int rc; struct pam_conv pamConv = { - pamConvFunc, + dropbear_pam_conv_func, NULL };