back to EPERM if killpg (not -1) can't do it

SCCS-vsn: sys/kern/kern_sig.c 6.18

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index ce67d71..a9f368b 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)kern_sig.c  6.17 (Berkeley) %G%
+ *     @(#)kern_sig.c  6.18 (Berkeley) %G%

  */
 
 #include "../machine/reg.h"
  */
 
 #include "../machine/reg.h"


@@ -268,7 +268,7 @@ killpg1(signo, pgrp, all)
                if (signo)
                        psignal(p, signo);
        }
                if (signo)
                        psignal(p, signo);
        }

-       return (f == 0 ? ESRCH : error);
+       return (error ? error : (f == 0 ? ESRCH : 0));

 }
 
 /*
 }
 
 /*