summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/bsd-misc.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b34780d25..f25c14761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
46 - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] 46 - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
47 Add a tcgetpgrp function. 47 Add a tcgetpgrp function.
48 - (dtucker) [Makefile.in moduli.c moduli.h] Add new files and to Makefile. 48 - (dtucker) [Makefile.in moduli.c moduli.h] Add new files and to Makefile.
49 - (dtucker) [openbsd-compat/bsd-misc.c] Fix cut-and-paste bug in tcgetpgrp.
49 50
5020030730 5120030730
51 - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal 52 - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal
@@ -784,4 +785,4 @@
784 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 785 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
785 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 786 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
786 787
787$Id: ChangeLog,v 1.2878 2003/08/02 14:07:35 dtucker Exp $ 788$Id: ChangeLog,v 1.2879 2003/08/02 14:36:16 dtucker Exp $
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 474aae1a6..da8f77046 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -25,7 +25,7 @@
25#include "includes.h" 25#include "includes.h"
26#include "xmalloc.h" 26#include "xmalloc.h"
27 27
28RCSID("$Id: bsd-misc.c,v 1.15 2003/08/02 13:33:48 dtucker Exp $"); 28RCSID("$Id: bsd-misc.c,v 1.16 2003/08/02 14:36:16 dtucker Exp $");
29 29
30/* 30/*
31 * NB. duplicate __progname in case it is an alias for argv[0] 31 * NB. duplicate __progname in case it is an alias for argv[0]
@@ -173,7 +173,7 @@ tcgetpgrp(int fd)
173{ 173{
174 int ctty_pgrp; 174 int ctty_pgrp;
175 175
176 if (ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) == -1) 176 if (ioctl(fd, TIOCGPGRP, &ctty_pgrp) == -1)
177 return(-1); 177 return(-1);
178 else 178 else
179 return(ctty_pgrp); 179 return(ctty_pgrp);