[src/simonb-timecounters]: src/sys/kern make ntp_adjtime() work after kauth m...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90cd1111eea6
branches:  simonb-timecounters
changeset: 587909:90cd1111eea6
user:      drochner <drochner%NetBSD.org@localhost>
date:      Fri Jun 02 13:05:29 2006 +0000

description:
make ntp_adjtime() work after kauth merge

diffstat:

 sys/kern/kern_ntptime.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r e40065911988 -r 90cd1111eea6 sys/kern/kern_ntptime.c
--- a/sys/kern/kern_ntptime.c   Fri Jun 02 00:20:23 2006 +0000
+++ b/sys/kern/kern_ntptime.c   Fri Jun 02 13:05:29 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_ntptime.c,v 1.29.6.6 2006/06/02 00:13:12 kardel Exp $     */
+/*     $NetBSD: kern_ntptime.c,v 1.29.6.7 2006/06/02 13:05:29 drochner Exp $   */
 #include <sys/types.h>         /* XXX to get __HAVE_TIMECOUNTER, remove
                           after all ports are converted. */
 #ifdef __HAVE_TIMECOUNTER
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.59 2005/05/28 14:34:41 rwatson Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.29.6.6 2006/06/02 00:13:12 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.29.6.7 2006/06/02 13:05:29 drochner Exp $");
 
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
@@ -250,6 +250,7 @@
 
        if (ntv.modes != 0 && (error = kauth_authorize_generic(p->p_cred,
                                KAUTH_GENERIC_ISSUSER, &p->p_acflag)) != 0)
+               return (error);
 
        ntp_adjtime1(&ntv);
 
@@ -902,7 +903,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.29.6.6 2006/06/02 00:13:12 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.29.6.7 2006/06/02 13:05:29 drochner Exp $");
 
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
@@ -1018,6 +1019,7 @@
 
        if (ntv.modes != 0 && (error = kauth_authorize_generic(p->p_cred,
                                KAUTH_GENERIC_ISSUSER, &p->p_acflag)) != 0)
+               return (error);
 
        ntp_adjtime1(&ntv);