summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-31 00:48:57 +0100
committerColin Watson <cjwatson@debian.org>2010-03-31 00:48:57 +0100
commitd1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch)
treef0d13e1687800f36a3c4322b94ac5230ad17bdbf /monitor_wrap.c
parent964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff)
parent004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff)
merge 5.4p1
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index a737fce7a..a01500c81 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.68 2009/06/22 05:39:28 dtucker Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.69 2010/03/07 11:57:13 dtucker Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -347,19 +347,6 @@ mm_auth_rhosts_rsa_key_allowed(struct passwd *pw, char *user,
347 return (ret); 347 return (ret);
348} 348}
349 349
350static void
351mm_send_debug(Buffer *m)
352{
353 char *msg;
354
355 while (buffer_len(m)) {
356 msg = buffer_get_string(m, NULL);
357 debug3("%s: Sending debug: %s", __func__, msg);
358 packet_send_debug("%s", msg);
359 xfree(msg);
360 }
361}
362
363int 350int
364mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key) 351mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key)
365{ 352{
@@ -393,9 +380,6 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key)
393 have_forced = buffer_get_int(&m); 380 have_forced = buffer_get_int(&m);
394 forced_command = have_forced ? xstrdup("true") : NULL; 381 forced_command = have_forced ? xstrdup("true") : NULL;
395 382
396 /* Send potential debug messages */
397 mm_send_debug(&m);
398
399 buffer_free(&m); 383 buffer_free(&m);
400 384
401 return (allowed); 385 return (allowed);
@@ -1085,7 +1069,6 @@ mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
1085 *rkey = key; 1069 *rkey = key;
1086 xfree(blob); 1070 xfree(blob);
1087 } 1071 }
1088 mm_send_debug(&m);
1089 buffer_free(&m); 1072 buffer_free(&m);
1090 1073
1091 return (allowed); 1074 return (allowed);