src/usr.bin/ssh/monitor_wrap.c - diff

Return to monitor_wrap.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/monitor_wrap.c between version 1.54 and 1.55

version 1.54, 2006/08/12 20:46:46

version 1.55, 2007/02/19 10:45:58

Line 63

#include "channels.h"

#include "session.h"

#include "servconf.h"

/* Imports */

extern int compat20;

Line 72

Line 73

extern struct monitor *pmonitor;

extern Buffer input, output;

extern Buffer loginmsg;

extern ServerOptions options;

int

mm_is_monitor(void)

Line 196

Line 198

{

Buffer m;

struct passwd *pw;

u_int pwlen;

u_int len;

ServerOptions *newopts;

debug3("%s entering", __func__);

Line 212

Line 215

buffer_free(&m);

return (NULL);

}

pw = buffer_get_string(&m, &pwlen);

pw = buffer_get_string(&m, &len);

if (pwlen != sizeof(struct passwd))

if (len != sizeof(struct passwd))

fatal("%s: struct passwd size mismatch", __func__);

pw->pw_name = buffer_get_string(&m, NULL);

pw->pw_passwd = buffer_get_string(&m, NULL);

Line 221

Line 224

pw->pw_class = buffer_get_string(&m, NULL);

pw->pw_dir = buffer_get_string(&m, NULL);

pw->pw_shell = buffer_get_string(&m, NULL);

/* copy options block as a Match directive may have changed some */

newopts = buffer_get_string(&m, &len);

if (len != sizeof(*newopts))

fatal("%s: option block size mismatch", __func__);

if (newopts->banner != NULL)

newopts->banner = buffer_get_string(&m, NULL);

copy_set_server_options(&options, newopts, 1);

xfree(newopts);

buffer_free(&m);

return (pw);