summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/monitor.c b/monitor.c
index 0d100ab56..e9693ef63 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.64 2005/10/13 22:24:31 stevesk Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -855,9 +855,7 @@ mm_answer_pam_account(int sock, Buffer *m)
855 ret = do_pam_account(); 855 ret = do_pam_account();
856 856
857 buffer_put_int(m, ret); 857 buffer_put_int(m, ret);
858 buffer_append(&loginmsg, "\0", 1); 858 buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg));
859 buffer_put_cstring(m, buffer_ptr(&loginmsg));
860 buffer_clear(&loginmsg);
861 859
862 mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m); 860 mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m);
863 861
@@ -1855,7 +1853,7 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
1855 buffer_clear(m); 1853 buffer_clear(m);
1856 buffer_put_int(m, major); 1854 buffer_put_int(m, major);
1857 1855
1858 mm_request_send(sock,MONITOR_ANS_GSSSETUP, m); 1856 mm_request_send(sock, MONITOR_ANS_GSSSETUP, m);
1859 1857
1860 /* Now we have a context, enable the step */ 1858 /* Now we have a context, enable the step */
1861 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1); 1859 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1);
@@ -1868,7 +1866,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
1868{ 1866{
1869 gss_buffer_desc in; 1867 gss_buffer_desc in;
1870 gss_buffer_desc out = GSS_C_EMPTY_BUFFER; 1868 gss_buffer_desc out = GSS_C_EMPTY_BUFFER;
1871 OM_uint32 major,minor; 1869 OM_uint32 major, minor;
1872 OM_uint32 flags = 0; /* GSI needs this */ 1870 OM_uint32 flags = 0; /* GSI needs this */
1873 u_int len; 1871 u_int len;
1874 1872
@@ -1885,7 +1883,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
1885 1883
1886 gss_release_buffer(&minor, &out); 1884 gss_release_buffer(&minor, &out);
1887 1885
1888 if (major==GSS_S_COMPLETE) { 1886 if (major == GSS_S_COMPLETE) {
1889 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); 1887 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
1890 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); 1888 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
1891 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); 1889 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
@@ -1935,7 +1933,7 @@ mm_answer_gss_userok(int sock, Buffer *m)
1935 debug3("%s: sending result %d", __func__, authenticated); 1933 debug3("%s: sending result %d", __func__, authenticated);
1936 mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m); 1934 mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m);
1937 1935
1938 auth_method="gssapi-with-mic"; 1936 auth_method = "gssapi-with-mic";
1939 1937
1940 /* Monitor loop will terminate if authenticated */ 1938 /* Monitor loop will terminate if authenticated */
1941 return (authenticated); 1939 return (authenticated);