diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 4 |
2 files changed, 4 insertions, 5 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20030813 | ||
2 | - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge. | ||
3 | |||
1 | 20030811 | 4 | 20030811 |
2 | - (dtucker) OpenBSD CVS Sync | 5 | - (dtucker) OpenBSD CVS Sync |
3 | (thanks to Simon Wilkinson for help with this -dt) | 6 | (thanks to Simon Wilkinson for help with this -dt) |
@@ -815,4 +818,4 @@ | |||
815 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 818 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
816 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 819 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
817 | 820 | ||
818 | $Id: ChangeLog,v 1.2888 2003/08/11 13:00:33 dtucker Exp $ | 821 | $Id: ChangeLog,v 1.2889 2003/08/13 10:28:14 dtucker Exp $ |
@@ -1696,7 +1696,6 @@ session_break_req(Session *s) | |||
1696 | break_length = packet_get_int(); | 1696 | break_length = packet_get_int(); |
1697 | packet_check_eom(); | 1697 | packet_check_eom(); |
1698 | 1698 | ||
1699 | #if defined(TIOCSBRK) && defined(TIOCCBRK) | ||
1700 | if (s->ttyfd == -1) | 1699 | if (s->ttyfd == -1) |
1701 | return 0; | 1700 | return 0; |
1702 | /* we will sleep from 500ms to 3000ms */ | 1701 | /* we will sleep from 500ms to 3000ms */ |
@@ -1707,9 +1706,6 @@ session_break_req(Session *s) | |||
1707 | usleep(break_length * 1000); | 1706 | usleep(break_length * 1000); |
1708 | ioctl(s->ttyfd, TIOCCBRK, NULL); | 1707 | ioctl(s->ttyfd, TIOCCBRK, NULL); |
1709 | return 1; | 1708 | return 1; |
1710 | #else | ||
1711 | return 0; | ||
1712 | #endif | ||
1713 | } | 1709 | } |
1714 | 1710 | ||
1715 | static int | 1711 | static int |