summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>1999-12-12 19:20:04 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>1999-12-12 19:20:04 +0000
commitda56fdc575a2442722d0ed3f765f846ec4a49666 (patch)
tree3ecd32b8e49cd16505b4a579fbd19962d9d817d1 /usr.bin/ssh/sshd.c
parent85361d56aa5b204fae0c32ff8b1828517ebdffe7 (diff)
type conflict for 'extern Type *options' in channels.c; dot@dotat.at
Diffstat (limited to 'usr.bin/ssh/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index a1229676045..361127b038d 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -11,7 +11,7 @@
*/
#include "includes.h"
-RCSID("$Id: sshd.c,v 1.73 1999/12/08 23:59:12 markus Exp $");
+RCSID("$Id: sshd.c,v 1.74 1999/12/12 19:20:03 markus Exp $");
#include <poll.h>
@@ -1619,7 +1619,7 @@ do_authenticated(struct passwd * pw)
screen = packet_get_int();
else
screen = 0;
- display = x11_create_display_inet(screen);
+ display = x11_create_display_inet(screen, options.x11_display_offset);
if (!display)
goto fail;