summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-03 21:24:19 +1000
committerDamien Miller <djm@mindrot.org>2014-07-03 21:24:19 +1000
commite5c0d52ceb575c3db8c313e0b1aa3845943d7ba8 (patch)
tree38dd3c4459b009f696ae99a50b2186e4e1c3cf0e /session.c
parentc174a3b7c14e0d178c61219de2aa1110e209950c (diff)
- djm@cvs.openbsd.org 2014/07/03 03:34:09
[gss-serv.c session.c ssh-keygen.c] standardise on NI_MAXHOST for gethostname() string lengths; about 1/2 the cases were using it already. Fixes bz#2239 en passant
Diffstat (limited to 'session.c')
-rw-r--r--session.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/session.c b/session.c
index 11f2571e0..821867d59 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.271 2014/03/03 22:22:30 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.272 2014/07/03 03:34:09 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -49,6 +49,7 @@
49#include <errno.h> 49#include <errno.h>
50#include <fcntl.h> 50#include <fcntl.h>
51#include <grp.h> 51#include <grp.h>
52#include <netdb.h>
52#ifdef HAVE_PATHS_H 53#ifdef HAVE_PATHS_H
53#include <paths.h> 54#include <paths.h>
54#endif 55#endif
@@ -2653,7 +2654,7 @@ session_setup_x11fwd(Session *s)
2653{ 2654{
2654 struct stat st; 2655 struct stat st;
2655 char display[512], auth_display[512]; 2656 char display[512], auth_display[512];
2656 char hostname[MAXHOSTNAMELEN]; 2657 char hostname[NI_MAXHOST];
2657 u_int i; 2658 u_int i;
2658 2659
2659 if (no_x11_forwarding_flag) { 2660 if (no_x11_forwarding_flag) {