- (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge.

diff --git a/ChangeLog b/ChangeLog
index 20ba88694c8d13fd419ca932181b07cb06c1a924..2e2c5a3b5a9741ffd52485996f7d02627db171cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030813
+ - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge.
+
 20030811
  - (dtucker) OpenBSD CVS Sync
    (thanks to Simon Wilkinson for help with this -dt)
@@ -815,4 +818,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2888 2003/08/11 13:00:33 dtucker Exp $
+$Id: ChangeLog,v 1.2889 2003/08/13 10:28:14 dtucker Exp $

diff --git a/session.c b/session.c
index 325b1753a0df149ba0fa8ad35d5654c26cddd60b..69d925eff83a176fe9f52eee02b350fa958970e6 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1696,7 +1696,6 @@ session_break_req(Session *s)
        break_length = packet_get_int();
        packet_check_eom();
 
-#if defined(TIOCSBRK) && defined(TIOCCBRK)
        if (s->ttyfd == -1)
                return 0;
        /* we will sleep from 500ms to 3000ms */
@@ -1707,9 +1706,6 @@ session_break_req(Session *s)
        usleep(break_length * 1000);
        ioctl(s->ttyfd, TIOCCBRK, NULL);
        return 1;
-#else
-       return 0;
-#endif
 }
 
 static int