2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 88e4fe267..8dd37b2c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
    platforms that don't have it.
  - (dtucker) [openbsd-compat/openbsd-compat.h] Add prototype for strtoul,
    group strto* function prototypes together.
+ - (dtucker) [openbsd-compat/bsd-misc.c] Handle the case where setpgrp() takes
+   an argument.  Pointed out by djm.
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2013/02/14 21:35:59
      [auth2-pubkey.c]
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index ad524b8b7..8dc7d02d1 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -253,10 +253,13 @@ isblank(int c)
 pid_t
 getpgid(pid_t pid)
 {
-#ifdef HAVE_GETPGRP
+#if defined(HAVE_GETPGRP) && !defined(GETPGRP_VOID)
+        return getpgrp(pid);
+#elif defined(HAVE_GETPGRP)
         if (pid == 0)
                 return getpgrp();
 #endif
+
         errno = ESRCH;
         return -1;
 }