summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/monitor.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2007-10-29 04:08:09 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2007-10-29 04:08:09 +0000
commit4f4d4db73255c4376750bb3044b71eb08c38a517 (patch)
tree752e9051c72c3db84bbec9dd3e7ae2a6e14f35a8 /usr.bin/ssh/monitor.c
parentcf3cb9dede5a2147d34d8c1d8c7fbcf891bc1f8e (diff)
Send config block back to slave for invalid users too so options
set by a Match block (eg Banner) behave the same for non-existent users. Found by and ok djm@
Diffstat (limited to 'usr.bin/ssh/monitor.c')
-rw-r--r--usr.bin/ssh/monitor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 0eaa0ca4d36..a8871b7640b 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.93 2007/09/21 08:15:29 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.94 2007/10/29 04:08:08 dtucker Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -556,11 +556,11 @@ mm_answer_pwnamallow(int sock, Buffer *m)
buffer_put_cstring(m, pwent->pw_class);
buffer_put_cstring(m, pwent->pw_dir);
buffer_put_cstring(m, pwent->pw_shell);
+
+ out:
buffer_put_string(m, &options, sizeof(options));
if (options.banner != NULL)
buffer_put_cstring(m, options.banner);
-
- out:
debug3("%s: sending MONITOR_ANS_PWNAM: %d", __func__, allowed);
mm_request_send(sock, MONITOR_ANS_PWNAM, m);