CVS commit: src/usr.sbin/lpr/lpd
Module Name:src
Committed By: is
Date: Wed Nov 9 12:45:58 UTC 2011
Modified Files:
src/usr.sbin/lpr/lpd: lpd.8 lpd.c
Log Message:
If hosts.lpd contains '+', don't insist on reverse DNS == forward DNS.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/lpr/lpd/lpd.8
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/lpr/lpd/lpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/lpr/lpd/lpd.8
diff -u src/usr.sbin/lpr/lpd/lpd.8:1.33 src/usr.sbin/lpr/lpd/lpd.8:1.34
--- src/usr.sbin/lpr/lpd/lpd.8:1.33 Sun Jan 22 21:31:17 2006
+++ src/usr.sbin/lpr/lpd/lpd.8 Wed Nov 9 12:45:58 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: lpd.8,v 1.33 2006/01/22 21:31:17 wiz Exp $
+.\ $NetBSD: lpd.8,v 1.34 2011/11/09 12:45:58 is Exp $
.\
.\ Copyright (c) 1983, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -176,7 +176,11 @@ Second, all requests must come from one
the file
.Pa /etc/hosts.equiv
or
-.Pa /etc/hosts.lpd .
+.Pa /etc/hosts.lpd
+unless there is a line consisting of '+', in which case any host
+will be accepted that passes the
+.Xr hosts_access 5
+test and has reverse resolving set up.
Lastly, if the
.Li rs
capability is specified in the
Index: src/usr.sbin/lpr/lpd/lpd.c
diff -u src/usr.sbin/lpr/lpd/lpd.c:1.56 src/usr.sbin/lpr/lpd/lpd.c:1.57
--- src/usr.sbin/lpr/lpd/lpd.c:1.56 Tue Aug 30 19:27:37 2011
+++ src/usr.sbin/lpr/lpd/lpd.c Wed Nov 9 12:45:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpd.c,v 1.56 2011/08/30 19:27:37 joerg Exp $ */
+/* $NetBSD: lpd.c,v 1.57 2011/11/09 12:45:58 is Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
@@ -41,7 +41,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)lpd.c 8.7 (Berkeley) 5/10/95;
#else
-__RCSID($NetBSD: lpd.c,v 1.56 2011/08/30 19:27:37 joerg Exp $);
+__RCSID($NetBSD: lpd.c,v 1.57 2011/11/09 12:45:58 is Exp $);
#endif
#endif /* not lint */
@@ -133,6 +133,7 @@ static void startup(void);
static void chkhost(struct sockaddr *, int);
__dead static void usage(void);
static struct pollfd *socksetup(int, int, const char *, int *);
+static void chkplushost(int, FILE *, char*);
uid_t uid, euid;
int child_count;
@@ -362,6 +363,35 @@ main(int argc, char **argv)
}
}
+/*
+ * If there was a forward/backward name resolution mismatch, check
+ * that there's a '+' entry in fhost.
+ */
+
+void
+chkplushost(int good, FILE *fhost, char *hst)
+{
+ int c1, c2, c3;
+
+ if (good) {
+ return;
+ }
+
+ rewind(fhost);
+ while (EOF != (c1 = fgetc(fhost))) {
+ if (c1 == '+') {
+ c2 = fgetc(fhost);
+ if (c2 == ' ' || c2 == '\t' || c2 == '\n') {
+return;
+ }
+ }
+ do {
+ c3 = fgetc(fhost);
+ } while (c3 != EOF c3 != '\n');
+ }
+ fatal(address for your hostname (%s) not matched, hst);
+}
+
static void
reapchild(int signo)
{
@@ -606,25 +636,23 @@ chkhost(struct sockaddr *f, int check_op
fatal(Cannot print address);
/* Check for spoof, ala rlogind */
+ good = 0;
memset(hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
error = getaddrinfo(fromb, NULL, hints, res);
- if (error) {
- fatal(hostname for your address (%s) unknown: %s, hst,
- gai_strerror(error));
+ if (!error) {
+ for (r = res; good == 0 r; r = r-ai_next) {
+ error = getnameinfo(r-ai_addr, r-ai_addrlen,
+ip, sizeof(ip), NULL, 0, NI_NUMERICHOST);
+ if (!error !strcmp(hst, ip))
+good = 1;
+ }
+ if (res)
+ freeaddrinfo(res);
}
- good = 0;
- for (r = res; good == 0 r; r = r-ai_next) {
- error = getnameinfo(r-ai_addr, r-ai_addrlen, ip, sizeof(ip),
-NULL, 0, NI_NUMERICHOST);
- if (!error !strcmp(hst, ip))
- good = 1;
- }
- if (res)
- freeaddrinfo(res);
- if (good == 0)
- fatal(address for your hostname (%s) not matched, hst);
+
+ /* complain about !good later in chkplushost if needed. */
setproctitle(serving %s, from);
@@ -639,6 +667,7 @@ chkhost(struct sockaddr *f, int check_op
hostf = fopen(_PATH_HOSTSEQUIV, r);
if (hostf) {
if (__ivaliduser_sa(hostf, f, f-sa_len, DUMMY, DUMMY) == 0) {
+ chkplushost(good, hostf, hst);
(void)fclose(hostf);
return;
}
@@ -647,6 +676,7 @@ chkhost(struct sockaddr *f, int check_op
hostf = fopen(_PATH_HOSTSLPD, r);
if (hostf) {
if (__ivaliduser_sa(hostf, f, f-sa_len, DUMMY, DUMMY) == 0) {
+ chkplushost(good, hostf, hst);
(void)fclose(hostf);
return;
}
CVS commit: src/usr.sbin/lpr/lpd
Module Name:src Committed By: wiz Date: Wed Nov 9 14:16:01 UTC 2011 Modified Files: src/usr.sbin/lpr/lpd: lpd.8 Log Message: Use Sq, and remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/lpr/lpd/lpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/lpr/lpd/lpd.8 diff -u src/usr.sbin/lpr/lpd/lpd.8:1.34 src/usr.sbin/lpr/lpd/lpd.8:1.35 --- src/usr.sbin/lpr/lpd/lpd.8:1.34 Wed Nov 9 12:45:58 2011 +++ src/usr.sbin/lpr/lpd/lpd.8 Wed Nov 9 14:16:00 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: lpd.8,v 1.34 2011/11/09 12:45:58 is Exp $ +.\ $NetBSD: lpd.8,v 1.35 2011/11/09 14:16:00 wiz Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -176,9 +176,11 @@ Second, all requests must come from one the file .Pa /etc/hosts.equiv or -.Pa /etc/hosts.lpd -unless there is a line consisting of '+', in which case any host -will be accepted that passes the +.Pa /etc/hosts.lpd +unless there is a line consisting of +.Sq + , +in which case any host +will be accepted that passes the .Xr hosts_access 5 test and has reverse resolving set up. Lastly, if the
CVS commit: src/external/bsd/atf/dist/atf-c
Module Name:src Committed By: christos Date: Wed Nov 9 14:42:43 UTC 2011 Modified Files: src/external/bsd/atf/dist/atf-c: tc.c Log Message: need || instead of To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/dist/atf-c/tc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-c/tc.c diff -u src/external/bsd/atf/dist/atf-c/tc.c:1.10 src/external/bsd/atf/dist/atf-c/tc.c:1.11 --- src/external/bsd/atf/dist/atf-c/tc.c:1.10 Tue Nov 8 15:25:14 2011 +++ src/external/bsd/atf/dist/atf-c/tc.c Wed Nov 9 09:42:42 2011 @@ -164,7 +164,7 @@ write_resfile(const int fd, const char * ssize_t ret; int count = 0; -INV(arg == -1 reason != NULL); +INV(arg == -1 || reason != NULL); iov[count].iov_base = __UNCONST(result); iov[count++].iov_len = strlen(result);
CVS commit: src/tests/lib/libc/regex
Module Name:src Committed By: christos Date: Wed Nov 9 15:14:44 UTC 2011 Modified Files: src/tests/lib/libc/regex: t_exhaust.c Log Message: add a large timeout for libtre To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/regex/t_exhaust.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/regex/t_exhaust.c diff -u src/tests/lib/libc/regex/t_exhaust.c:1.4 src/tests/lib/libc/regex/t_exhaust.c:1.5 --- src/tests/lib/libc/regex/t_exhaust.c:1.4 Sun Nov 6 13:34:48 2011 +++ src/tests/lib/libc/regex/t_exhaust.c Wed Nov 9 10:14:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: t_exhaust.c,v 1.4 2011/11/06 18:34:48 christos Exp $ */ +/* $NetBSD: t_exhaust.c,v 1.5 2011/11/09 15:14:44 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: t_exhaust.c,v 1.4 2011/11/06 18:34:48 christos Exp $); +__RCSID($NetBSD: t_exhaust.c,v 1.5 2011/11/09 15:14:44 christos Exp $); #include stdio.h #include regex.h @@ -174,6 +174,8 @@ ATF_TC_HEAD(regcomp_too_big, tc) atf_tc_set_md_var(tc, descr, Check that large patterns don't crash, but return a proper error code); + // libtre needs it. + atf_tc_set_md_var(tc, timeout, 600); } ATF_TC_BODY(regcomp_too_big, tc)
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Wed Nov 9 17:05:50 UTC 2011 Modified Files: src/sys/arch/mips/mips: mips_fixup.c Log Message: Make sure to invalidate correct size. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/mips/mips_fixup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/mips_fixup.c diff -u src/sys/arch/mips/mips/mips_fixup.c:1.9 src/sys/arch/mips/mips/mips_fixup.c:1.10 --- src/sys/arch/mips/mips/mips_fixup.c:1.9 Sat Aug 27 13:23:52 2011 +++ src/sys/arch/mips/mips/mips_fixup.c Wed Nov 9 17:05:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_fixup.c,v 1.9 2011/08/27 13:23:52 bouyer Exp $ */ +/* $NetBSD: mips_fixup.c,v 1.10 2011/11/09 17:05:50 matt Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mips_fixup.c,v 1.9 2011/08/27 13:23:52 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: mips_fixup.c,v 1.10 2011/11/09 17:05:50 matt Exp $); #include opt_mips3_wired.h #include opt_multiprocessor.h @@ -138,7 +138,8 @@ mips_fixup_exceptions(mips_fixup_callbac } if (fixed) - mips_icache_sync_range((vaddr_t)start, end - start); + mips_icache_sync_range((vaddr_t)start, + sizeof(start[0]) * (end - start)); return fixed; }
CVS commit: src/sys/kern
Module Name:src
Committed By: drochner
Date: Wed Nov 9 18:29:28 UTC 2011
Modified Files:
src/sys/kern: vfs_xattr.c
Log Message:
for the *xattr() calls, return ENOTSUP rather than EOPNOTSUPP if
the filesystem doesn't support extended attributes -- this is how
it is documented in Linux manpages
(on Linux itself, ENOTSUP and EOPNOTSUPP are the same value)
approved by Emmanuel Dreyfus
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/kern/vfs_xattr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_xattr.c
diff -u src/sys/kern/vfs_xattr.c:1.28 src/sys/kern/vfs_xattr.c:1.29
--- src/sys/kern/vfs_xattr.c:1.28 Fri Jul 22 12:46:18 2011
+++ src/sys/kern/vfs_xattr.c Wed Nov 9 18:29:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_xattr.c,v 1.28 2011/07/22 12:46:18 manu Exp $ */
+/* $NetBSD: vfs_xattr.c,v 1.29 2011/11/09 18:29:28 drochner Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_xattr.c,v 1.28 2011/07/22 12:46:18 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_xattr.c,v 1.29 2011/11/09 18:29:28 drochner Exp $);
#include sys/param.h
#include sys/systm.h
@@ -786,6 +786,8 @@ xattr_native(const char *key) {
}
#undef MATCH_NS
+#define XATTR_ERRNO(e) ((e) == EOPNOTSUPP ? ENOTSUP : (e))
+
int
sys_setxattr(struct lwp *l, const struct sys_setxattr_args *uap, register_t *retval)
{
@@ -821,7 +823,7 @@ sys_setxattr(struct lwp *l, const struct
vrele(vp);
out:
*retval = (error == 0) ? 0 : -1;
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -859,7 +861,7 @@ sys_lsetxattr(struct lwp *l, const struc
vrele(vp);
out:
*retval = (error == 0) ? 0 : -1;
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -898,7 +900,7 @@ sys_fsetxattr(struct lwp *l, const struc
fd_putfile(SCARG(uap, fd));
out:
*retval = (error == 0) ? 0 : -1;
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -931,7 +933,7 @@ sys_getxattr(struct lwp *l, const struct
attrname, SCARG(uap, value), SCARG(uap, size), l, retval);
vrele(vp);
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -964,7 +966,7 @@ sys_lgetxattr(struct lwp *l, const struc
attrname, SCARG(uap, value), SCARG(uap, size), l, retval);
vrele(vp);
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -998,7 +1000,7 @@ sys_fgetxattr(struct lwp *l, const struc
attrname, SCARG(uap, value), SCARG(uap, size), l, retval);
fd_putfile(SCARG(uap, fd));
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -1051,7 +1053,7 @@ sys_listxattr(struct lwp *l, const struc
out:
vrele(vp);
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -1102,7 +1104,7 @@ sys_llistxattr(struct lwp *l, const stru
*retval = listsize_usr + listsize_sys;
out:
vrele(vp);
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -1156,7 +1158,7 @@ sys_flistxattr(struct lwp *l, const stru
out:
fd_putfile(SCARG(uap, fd));
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -1186,7 +1188,7 @@ sys_removexattr(struct lwp *l, const str
error = extattr_delete_vp(vp, namespace, attrname, l);
vrele(vp);
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -1216,7 +1218,7 @@ sys_lremovexattr(struct lwp *l, const st
error = extattr_delete_vp(vp, namespace, attrname, l);
vrele(vp);
- return (error);
+ return (XATTR_ERRNO(error));
}
int
@@ -1247,5 +1249,5 @@ sys_fremovexattr(struct lwp *l, const st
error = extattr_delete_vp(vp, namespace, attrname, l);
fd_putfile(SCARG(uap, fd));
- return (error);
+ return (XATTR_ERRNO(error));
}
CVS commit: src/external/ibm-public/postfix/dist
Module Name:src Committed By: tron Date: Wed Nov 9 19:06:34 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist: makedefs src/external/ibm-public/postfix/dist/src/util: sys_defs.h Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.2 -r1.3 \ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/dist/makedefs diff -u src/external/ibm-public/postfix/dist/makedefs:1.4 src/external/ibm-public/postfix/dist/makedefs:1.5 --- src/external/ibm-public/postfix/dist/makedefs:1.4 Sun Jul 31 10:05:03 2011 +++ src/external/ibm-public/postfix/dist/makedefs Wed Nov 9 19:06:34 2011 @@ -152,6 +152,8 @@ case $SYSTEM.$RELEASE in ;; OpenBSD.4*) SYSTYPE=OPENBSD4 ;; + OpenBSD.5*) SYSTYPE=OPENBSD5 + ;; ekkoBSD.1*) SYSTYPE=EKKOBSD1 ;; NetBSD.1*) SYSTYPE=NETBSD1 Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.2 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3 --- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.2 Tue Nov 8 22:21:30 2011 +++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Wed Nov 9 19:06:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_defs.h,v 1.2 2011/11/08 22:21:30 joerg Exp $ */ +/* $NetBSD: sys_defs.h,v 1.3 2011/11/09 19:06:34 tron Exp $ */ #ifndef _SYS_DEFS_H_INCLUDED_ #define _SYS_DEFS_H_INCLUDED_ @@ -30,6 +30,7 @@ || defined(FREEBSD8) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ +|| defined(OPENBSD5) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ || defined(NETBSD4) \ || defined(EKKOBSD1)
CVS commit: src/doc
Module Name:src Committed By: tron Date: Wed Nov 9 19:08:59 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Postfix 2.8.7 has been imported. To generate a diff of this commit: cvs rdiff -u -r1.886 -r1.887 src/doc/3RDPARTY cvs rdiff -u -r1.1622 -r1.1623 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.886 src/doc/3RDPARTY:1.887 --- src/doc/3RDPARTY:1.886 Sat Nov 5 23:03:20 2011 +++ src/doc/3RDPARTY Wed Nov 9 19:08:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.886 2011/11/05 23:03:20 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.887 2011/11/09 19:08:59 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -904,8 +904,8 @@ formatting in man pages, disallowing flo and more. Package: postfix -Version: 2.8.6 -Current Vers: 2.8.6 +Version: 2.8.7 +Current Vers: 2.8.7 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1622 src/doc/CHANGES:1.1623 --- src/doc/CHANGES:1.1622 Sat Nov 5 23:03:20 2011 +++ src/doc/CHANGES Wed Nov 9 19:08:59 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1622 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1623 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1161,3 +1161,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0: need to either add tre.h in /usr/include, or enhance regex.h and provide more tre_ - libc names aliases. [christos 2005] + postfix(1): Import version 2.8.7 [tron 2009]
CVS commit: src/usr.bin/time
Module Name:src
Committed By: christos
Date: Wed Nov 9 19:10:10 UTC 2011
Modified Files:
src/usr.bin/time: ext.h time.1 time.c
Log Message:
PR/45592: Greg A. Woods: changes to get time(1) to use CLOCK_MONOTONIC
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/time/ext.h
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/time/time.1
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/time/time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/time/ext.h
diff -u src/usr.bin/time/ext.h:1.1 src/usr.bin/time/ext.h:1.2
--- src/usr.bin/time/ext.h:1.1 Sat Feb 24 16:30:27 2007
+++ src/usr.bin/time/ext.h Wed Nov 9 14:10:10 2011
@@ -1,4 +1,5 @@
-/* $NetBSD: ext.h,v 1.1 2007/02/24 21:30:27 matt Exp $ */
+/* $NetBSD: ext.h,v 1.2 2011/11/09 19:10:10 christos Exp $ */
-void prusage(FILE *, struct rusage *, struct rusage *, struct timeval *,
-struct timeval *);
+/* borrowed from ../../bin/csh/extern.h */
+void prusage(FILE *, struct rusage *, struct rusage *, struct timespec *,
+struct timespec *);
Index: src/usr.bin/time/time.1
diff -u src/usr.bin/time/time.1:1.23 src/usr.bin/time/time.1:1.24
--- src/usr.bin/time/time.1:1.23 Sat Oct 1 21:51:00 2011
+++ src/usr.bin/time/time.1 Wed Nov 9 14:10:10 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: time.1,v 1.23 2011/10/02 01:51:00 dholland Exp $
+.\ $NetBSD: time.1,v 1.24 2011/11/09 19:10:10 christos Exp $
.\
.\ Copyright (c) 1980, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)time.1 8.1 (Berkeley) 6/6/93
.\
-.Dd October 1, 2011
+.Dd November 9, 2011
.Dt TIME 1
.Os
.Sh NAME
@@ -49,13 +49,13 @@ times
.Ar command .
After the command finishes,
.Nm
-writes the total elapsed time
+writes the total elapsed time (wall clock time),
.Pq Dq real ,
-the time spent executing
+the CPU time spent executing
.Ar command
at user level
.Pq Dq user ,
-and the time spent executing in the operating system kernel
+and the CPU time spent executing in the operating system kernel
.Pq Dq sys ,
to the standard error stream.
Times are reported in seconds.
@@ -83,7 +83,7 @@ Some shells, such as
.Xr csh 1
and
.Xr ksh 1 ,
-have their own and syntactically different builtin version of
+have their own and syntactically different built-in version of
.Nm .
The utility described here
is available as
@@ -159,6 +159,7 @@ will be that of
.Sh SEE ALSO
.Xr csh 1 ,
.Xr ksh 1 ,
+.Xr clock_gettime 2
.Xr getrusage 2
.Sh STANDARDS
The
Index: src/usr.bin/time/time.c
diff -u src/usr.bin/time/time.c:1.21 src/usr.bin/time/time.c:1.22
--- src/usr.bin/time/time.c:1.21 Wed Aug 31 12:24:58 2011
+++ src/usr.bin/time/time.c Wed Nov 9 14:10:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.21 2011/08/31 16:24:58 plunky Exp $ */
+/* $NetBSD: time.c,v 1.22 2011/11/09 19:10:10 christos Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = @(#)time.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: time.c,v 1.21 2011/08/31 16:24:58 plunky Exp $);
+__RCSID($NetBSD: time.c,v 1.22 2011/11/09 19:10:10 christos Exp $);
#endif /* not lint */
#include sys/types.h
@@ -58,6 +58,8 @@ __RCSID($NetBSD: time.c,v 1.21 2011/08/
__dead static void usage(void);
static void prl(long, const char *);
+static void prts(const char *, const char *, const struct timespec *,
+const char *);
static void prtv(const char *, const char *, const struct timeval *,
const char *);
@@ -71,7 +73,7 @@ main(int argc, char ** volatile argv)
int volatile cshflag;
const char *decpt;
const struct lconv *lconv;
- struct timeval before, after;
+ struct timespec before, after;
struct rusage ru;
(void)setlocale(LC_ALL, );
@@ -105,7 +107,7 @@ main(int argc, char ** volatile argv)
if (argc 1)
usage();
- gettimeofday(before, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, before);
switch(pid = vfork()) {
case -1: /* error */
err(EXIT_FAILURE, Vfork failed);
@@ -122,10 +124,10 @@ main(int argc, char ** volatile argv)
(void)signal(SIGQUIT, SIG_IGN);
if ((pid = wait4(pid, status, 0, ru)) == -1)
err(EXIT_FAILURE, wait4 %d failed, pid);
- (void)gettimeofday(after, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, after);
if (!WIFEXITED(status))
warnx(Command terminated abnormally.);
- timersub(after, before, after);
+ timespecsub(after, before, after);
if ((lconv = localeconv()) == NULL ||
(decpt = lconv-decimal_point) == NULL)
@@ -134,14 +136,14 @@ main(int argc, char ** volatile argv)
if (cshflag) {
static struct rusage null_ru;
before.tv_sec = 0;
- before.tv_usec = 0;
+ before.tv_nsec = 0;
prusage(stderr, null_ru, ru, after, before);
} else if (portableflag) {
- prtv(real , decpt, after, \n);
+ prts(real , decpt, after, \n);
prtv(user , decpt, ru.ru_utime, \n);
prtv(sys , decpt,
CVS commit: src/bin/csh
Module Name:src
Committed By: christos
Date: Wed Nov 9 19:16:01 UTC 2011
Modified Files:
src/bin/csh: csh.h dol.c extern.h proc.c proc.h time.c
Log Message:
sync with /usr/bin/time, use CLOCK_MONOTONIC
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/bin/csh/csh.h
cvs rdiff -u -r1.27 -r1.28 src/bin/csh/dol.c
cvs rdiff -u -r1.23 -r1.24 src/bin/csh/extern.h
cvs rdiff -u -r1.34 -r1.35 src/bin/csh/proc.c
cvs rdiff -u -r1.12 -r1.13 src/bin/csh/proc.h
cvs rdiff -u -r1.18 -r1.19 src/bin/csh/time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/csh.h
diff -u src/bin/csh/csh.h:1.21 src/bin/csh/csh.h:1.22
--- src/bin/csh/csh.h:1.21 Mon Jul 16 14:26:09 2007
+++ src/bin/csh/csh.h Wed Nov 9 14:16:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.h,v 1.21 2007/07/16 18:26:09 christos Exp $ */
+/* $NetBSD: csh.h,v 1.22 2011/11/09 19:16:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -141,7 +141,7 @@ Char *shtemp; /* Temp name for shel
#include sys/time.h
#include sys/types.h
-struct timeval time0; /* Time at which the shell started */
+struct timespec time0; /* Time at which the shell started */
struct rusage ru0;
/*
Index: src/bin/csh/dol.c
diff -u src/bin/csh/dol.c:1.27 src/bin/csh/dol.c:1.28
--- src/bin/csh/dol.c:1.27 Mon Aug 29 10:51:17 2011
+++ src/bin/csh/dol.c Wed Nov 9 14:16:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $ */
+/* $NetBSD: dol.c,v 1.28 2011/11/09 19:16:01 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)dol.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $);
+__RCSID($NetBSD: dol.c,v 1.28 2011/11/09 19:16:01 christos Exp $);
#endif
#endif /* not lint */
@@ -815,7 +815,7 @@ void
heredoc(Char *term)
{
Char obuf[BUFSIZE], lbuf[BUFSIZE], mbuf[BUFSIZE];
-struct timeval tv;
+struct timespec tv;
Char *Dv[2], *lbp, *obp, *mbp, **vp;
char *tmp;
int c, ocnt, lcnt, mcnt;
@@ -826,9 +826,9 @@ again:
if (open(tmp, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600) 0) {
if (errno == EEXIST) {
if (unlink(tmp) == -1) {
- (void)gettimeofday(tv, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, tv);
mbp = putnint)tv.tv_sec) ^
- ((int)tv.tv_usec) ^ ((int)getpid())) 0x00ff);
+ ((int)tv.tv_nsec) ^ ((int)getpid())) 0x00ff);
shtemp = Strspl(STRtmpsh, mbp);
xfree((ptr_t)mbp);
}
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.23 src/bin/csh/extern.h:1.24
--- src/bin/csh/extern.h:1.23 Mon Aug 29 10:51:17 2011
+++ src/bin/csh/extern.h Wed Nov 9 14:16:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.23 2011/08/29 14:51:17 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.24 2011/11/09 19:16:01 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -288,8 +288,8 @@ void plist(struct varent *);
*/
void donice(Char **, struct command *);
void dotime(Char **, struct command *);
-void prusage(FILE *, struct rusage *, struct rusage *, struct timeval *,
- struct timeval *);
+void prusage(FILE *, struct rusage *, struct rusage *, struct timespec *,
+ struct timespec *);
void ruadd(struct rusage *, struct rusage *);
void settimes(void);
void psecs(long);
Index: src/bin/csh/proc.c
diff -u src/bin/csh/proc.c:1.34 src/bin/csh/proc.c:1.35
--- src/bin/csh/proc.c:1.34 Mon Jul 16 14:26:10 2007
+++ src/bin/csh/proc.c Wed Nov 9 14:16:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.c,v 1.34 2007/07/16 18:26:10 christos Exp $ */
+/* $NetBSD: proc.c,v 1.35 2011/11/09 19:16:01 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)proc.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: proc.c,v 1.34 2007/07/16 18:26:10 christos Exp $);
+__RCSID($NetBSD: proc.c,v 1.35 2011/11/09 19:16:01 christos Exp $);
#endif
#endif /* not lint */
@@ -109,7 +109,7 @@ found:
}
else {
if (pp-p_flags (PTIME | PPTIME) || adrof(STRtime))
- (void)gettimeofday(pp-p_etime, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, pp-p_etime);
pp-p_rusage = ru;
if (WIFSIGNALED(w)) {
@@ -500,7 +500,7 @@ palloc(int pid, struct command *t)
}
pp-p_next = proclist.p_next;
proclist.p_next = pp;
-(void)gettimeofday(pp-p_btime, NULL);
+(void)clock_gettime(CLOCK_MONOTONIC, pp-p_btime);
}
static void
@@ -800,9 +800,9 @@ static void
ptprint(struct process *tp)
{
static struct rusage zru;
-static struct timeval ztime;
+static struct timespec ztime;
struct rusage ru;
-struct timeval tetime, diff;
+struct timespec tetime, diff;
struct process *pp;
pp = tp;
@@ -810,8 +810,8 @@ ptprint(struct process *tp)
tetime = ztime;
do {
ruadd(ru, pp-p_rusage);
- timersub(pp-p_etime, pp-p_btime, diff);
- if (timercmp(diff,
CVS commit: src/usr.bin/time
Module Name:src Committed By: wiz Date: Wed Nov 9 19:42:27 UTC 2011 Modified Files: src/usr.bin/time: time.1 Log Message: Sort sections, use Aq, add comma in enumeration. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/time/time.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/time/time.1 diff -u src/usr.bin/time/time.1:1.24 src/usr.bin/time/time.1:1.25 --- src/usr.bin/time/time.1:1.24 Wed Nov 9 19:10:10 2011 +++ src/usr.bin/time/time.1 Wed Nov 9 19:42:27 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: time.1,v 1.24 2011/11/09 19:10:10 christos Exp $ +.\ $NetBSD: time.1,v 1.25 2011/11/09 19:42:27 wiz Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -129,6 +129,10 @@ Resource usage is the total for the exec .Ar command and any child processes it spawns, as per .Xr wait4 2 . +.Sh FILES +.Bl -tag -width Xsys/resource.hX -compact +.It Aq sys/resource.h +.El .Sh EXIT STATUS The .Nm @@ -152,14 +156,10 @@ Otherwise, the exit status of .Nm will be that of .Ar command . -.Sh FILES -.Bl -tag -width \*[Lt]sys/resource.h\*[Gt] -compact -.It \*[Lt]sys/resource.h\*[Gt] -.El .Sh SEE ALSO .Xr csh 1 , .Xr ksh 1 , -.Xr clock_gettime 2 +.Xr clock_gettime 2 , .Xr getrusage 2 .Sh STANDARDS The
CVS commit: src/sys/net
Module Name:src
Committed By: christos
Date: Wed Nov 9 19:43:22 UTC 2011
Modified Files:
src/sys/net: if_gre.c
Log Message:
cosmetic, no functional change:
- sizeof(*var) instead of sizeof(type)
- sort the event counters in the discard the same as alloc for readability
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/net/if_gre.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.149 src/sys/net/if_gre.c:1.150
--- src/sys/net/if_gre.c:1.149 Tue Nov 1 21:17:59 2011
+++ src/sys/net/if_gre.c Wed Nov 9 14:43:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.149 2011/11/02 01:17:59 dyoung Exp $ */
+/* $NetBSD: if_gre.c,v 1.150 2011/11/09 19:43:22 christos Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.149 2011/11/02 01:17:59 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.150 2011/11/09 19:43:22 christos Exp $);
#include opt_atalk.h
#include opt_gre.h
@@ -235,14 +235,14 @@ gre_fp_wait(struct gre_softc *sc)
static void
gre_evcnt_detach(struct gre_softc *sc)
{
- evcnt_detach(sc-sc_unsupp_ev);
- evcnt_detach(sc-sc_pullup_ev);
- evcnt_detach(sc-sc_error_ev);
- evcnt_detach(sc-sc_block_ev);
evcnt_detach(sc-sc_recv_ev);
+ evcnt_detach(sc-sc_block_ev);
+ evcnt_detach(sc-sc_error_ev);
+ evcnt_detach(sc-sc_pullup_ev);
+ evcnt_detach(sc-sc_unsupp_ev);
- evcnt_detach(sc-sc_oflow_ev);
evcnt_detach(sc-sc_send_ev);
+ evcnt_detach(sc-sc_oflow_ev);
}
static void
@@ -277,7 +277,7 @@ gre_clone_create(struct if_clone *ifc, i
(any = sockaddr_any_by_family(AF_INET6)) == NULL)
return -1;
- sc = malloc(sizeof(struct gre_softc), M_DEVBUF, M_WAITOK|M_ZERO);
+ sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK|M_ZERO);
mutex_init(sc-sc_mtx, MUTEX_DRIVER, IPL_SOFTNET);
cv_init(sc-sc_condvar, gre wait);
cv_init(sc-sc_fp_condvar, gre fp);
CVS commit: src/games/factor
Module Name:src Committed By: drochner Date: Wed Nov 9 20:17:44 UTC 2011 Modified Files: src/games/factor: factor.c Log Message: remove duplicated #defines (in a usually unused part of the code) To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/games/factor/factor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/factor/factor.c diff -u src/games/factor/factor.c:1.25 src/games/factor/factor.c:1.26 --- src/games/factor/factor.c:1.25 Mon May 23 22:49:59 2011 +++ src/games/factor/factor.c Wed Nov 9 20:17:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: factor.c,v 1.25 2011/05/23 22:49:59 joerg Exp $ */ +/* $NetBSD: factor.c,v 1.26 2011/11/09 20:17:44 drochner Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = @(#)factor.c 8.4 (Berkeley) 5/4/95; #else -__RCSID($NetBSD: factor.c,v 1.25 2011/05/23 22:49:59 joerg Exp $); +__RCSID($NetBSD: factor.c,v 1.26 2011/11/09 20:17:44 drochner Exp $); #endif #endif /* not lint */ @@ -82,9 +82,6 @@ static int BN_dec2bn(BIGNUM **a, const c #define BN_new() ((BIGNUM *)calloc(sizeof(BIGNUM), 1)) #define BN_is_zero(v) (*(v) == 0) #define BN_is_one(v) (*(v) == 1) -#define BN_new() ((BIGNUM *)calloc(sizeof(BIGNUM), 1)) -#define BN_is_zero(v) (*(v) == 0) -#define BN_is_one(v) (*(v) == 1) #define BN_mod_word(a, b) (*(a) % (b)) #endif
CVS commit: src/dist/openpam/lib
Module Name:src
Committed By: drochner
Date: Wed Nov 9 20:26:41 UTC 2011
Modified Files:
src/dist/openpam/lib: openpam_configure.c
Log Message:
Don't allow '/' characters in the service argument to pam_start()
The service is blindly appended to config directories (/etc/pam.d/),
and if a user can control the service it can get PAM to read config
files from any location.
This is not a problem with most software because the service is
usually a constant string. The check protects 3rd party software
from being abused.
(CVE-2011-4122)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/dist/openpam/lib/openpam_configure.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/openpam/lib/openpam_configure.c
diff -u src/dist/openpam/lib/openpam_configure.c:1.5 src/dist/openpam/lib/openpam_configure.c:1.6
--- src/dist/openpam/lib/openpam_configure.c:1.5 Sun Jan 27 01:22:59 2008
+++ src/dist/openpam/lib/openpam_configure.c Wed Nov 9 20:26:41 2011
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: openpam_configure.c,v 1.5 2008/01/27 01:22:59 christos Exp $
+ * $Id: openpam_configure.c,v 1.6 2011/11/09 20:26:41 drochner Exp $
*/
#include ctype.h
@@ -289,6 +289,12 @@ openpam_load_chain(pam_handle_t *pamh,
size_t len;
int r;
+ /* don't allow to escape from policy_path */
+ if (strchr(service, '/')) {
+ openpam_log(PAM_LOG_ERROR, illegal service \%s\, service);
+ return (-PAM_SYSTEM_ERR);
+ }
+
for (path = openpam_policy_path; *path != NULL; ++path) {
len = strlen(*path);
if ((*path)[len - 1] == '/') {
CVS commit: src/sys/arch
Module Name:src Committed By: jym Date: Thu Nov 10 00:12:05 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: machdep.c src/sys/arch/i386/i386: machdep.c src/sys/arch/x86/include: cpu.h Log Message: Turn the 'i386_use_pae' variable into simply 'use_pae'. Technically speaking we are also running with PAE enabled in long mode under amd64, so this variable will be used in various places across x86 machdep to branch at runtime to functions that require extra handling for PAE mode. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.711 -r1.712 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x86/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.169 src/sys/arch/amd64/amd64/machdep.c:1.170 --- src/sys/arch/amd64/amd64/machdep.c:1.169 Sun Nov 6 15:51:09 2011 +++ src/sys/arch/amd64/amd64/machdep.c Thu Nov 10 00:12:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.169 2011/11/06 15:51:09 cherry Exp $ */ +/* $NetBSD: machdep.c,v 1.170 2011/11/10 00:12:04 jym Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -111,7 +111,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.169 2011/11/06 15:51:09 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.170 2011/11/10 00:12:04 jym Exp $); /* #define XENDEBUG_LOW */ @@ -242,7 +242,7 @@ int physmem; uint64_t dumpmem_low; uint64_t dumpmem_high; int cpu_class; - +int use_pae; #ifndef NO_SPARSE_DUMP int sparse_dump = 0; @@ -568,10 +568,10 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc NULL, 0, tsc_freq, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT | CTLFLAG_IMMEDIATE, + CTLFLAG_PERMANENT, CTLTYPE_INT, pae, SYSCTL_DESCR(Whether the kernel uses PAE), - NULL, 1, NULL, 0, + NULL, 0, use_pae, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL); #ifndef NO_SPARSE_DUMP /* XXXjld Does this really belong under machdep, and not e.g. kern? */ @@ -1646,6 +1646,8 @@ init_x86_64(paddr_t first_avail) pcb = lwp_getpcb(lwp0); + use_pae = 1; /* PAE always enabled in long mode */ + #ifdef XEN pcb-pcb_cr3 = xen_start_info.pt_base - KERNBASE; __PRINTK((pcb_cr3 0x%lx\n, xen_start_info.pt_base - KERNBASE)); Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.711 src/sys/arch/i386/i386/machdep.c:1.712 --- src/sys/arch/i386/i386/machdep.c:1.711 Sun Nov 6 15:35:29 2011 +++ src/sys/arch/i386/i386/machdep.c Thu Nov 10 00:12:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.711 2011/11/06 15:35:29 cherry Exp $ */ +/* $NetBSD: machdep.c,v 1.712 2011/11/10 00:12:04 jym Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.711 2011/11/06 15:35:29 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.712 2011/11/10 00:12:04 jym Exp $); #include opt_beep.h #include opt_compat_ibcs2.h @@ -246,12 +246,12 @@ struct mtrr_funcs *mtrr_funcs; int physmem; int cpu_class; +int use_pae; int i386_fpu_present; int i386_fpu_exception; int i386_fpu_fdivbug; int i386_use_fxsave; -int i386_use_pae = 0; int i386_has_sse; int i386_has_sse2; @@ -713,7 +713,7 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc CTLFLAG_PERMANENT, CTLTYPE_INT, pae, SYSCTL_DESCR(Whether the kernel uses PAE), - NULL, 0, i386_use_pae, 0, + NULL, 0, use_pae, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL); } @@ -1348,7 +1348,9 @@ init386(paddr_t first_avail) cpu_init_msrs(cpu_info_primary, true); #ifdef PAE - i386_use_pae = 1; + use_pae = 1; +#else + use_pae = 0; #endif #ifdef XEN Index: src/sys/arch/x86/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.41 src/sys/arch/x86/include/cpu.h:1.42 --- src/sys/arch/x86/include/cpu.h:1.41 Sun Nov 6 15:18:18 2011 +++ src/sys/arch/x86/include/cpu.h Thu Nov 10 00:12:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.41 2011/11/06 15:18:18 cherry Exp $ */ +/* $NetBSD: cpu.h,v 1.42 2011/11/10 00:12:05 jym Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -362,9 +362,9 @@ extern int cpu; extern int cpuid_level; extern int cpu_class; extern char cpu_brand_string[]; +extern int use_pae; extern int i386_use_fxsave; -extern int i386_use_pae; extern int i386_has_sse; extern int i386_has_sse2;
CVS commit: src/lib/libc
Module Name:src
Committed By: joerg
Date: Thu Nov 10 00:36:54 UTC 2011
Modified Files:
src/lib/libc: Makefile.inc
Log Message:
G/C -nostdinc usage, --sysroot is provided automatically.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.6 src/lib/libc/Makefile.inc:1.7
--- src/lib/libc/Makefile.inc:1.6 Sun May 30 08:28:53 2010
+++ src/lib/libc/Makefile.inc Thu Nov 10 00:36:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2010/05/30 08:28:53 tnozaki Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/11/10 00:36:54 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -53,9 +53,6 @@ LINTFLAGS+= -X 272
ARCHDIR= ${.CURDIR}/arch/${ARCHSUBDIR}
AFLAGS+= -I${ARCHDIR}
-.if defined(DESTDIR)
-AFLAGS+= -nostdinc -isystem ${DESTDIR}/usr/include
-.endif
CLEANFILES+= tags
# Don't try to lint the C library against itself when creating llib-lc.ln
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: joerg Date: Thu Nov 10 00:37:38 UTC 2011 Modified Files: src/sys/arch/mips/include: asm.h Log Message: Don't redefine _C_LABEL. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.45 src/sys/arch/mips/include/asm.h:1.46 --- src/sys/arch/mips/include/asm.h:1.45 Fri Jul 1 06:00:20 2011 +++ src/sys/arch/mips/include/asm.h Thu Nov 10 00:37:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.45 2011/07/01 06:00:20 matt Exp $ */ +/* $NetBSD: asm.h,v 1.46 2011/11/10 00:37:38 joerg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -84,12 +84,6 @@ #define MCOUNT #endif -#ifdef __NO_LEADING_UNDERSCORES__ -# define _C_LABEL(x) x -#else -# define _C_LABEL(x) __CONCAT(_,x) -#endif - #ifdef USE_AENT #define AENT(x)\ .aent x, 0
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: riz Date: Thu Nov 10 03:45:40 UTC 2011 Modified Files: src/sys/arch/i386/i386: dumpsys.c Log Message: i386_use_pae is now just use_pae. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/i386/dumpsys.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/dumpsys.c diff -u src/sys/arch/i386/i386/dumpsys.c:1.13 src/sys/arch/i386/i386/dumpsys.c:1.14 --- src/sys/arch/i386/i386/dumpsys.c:1.13 Mon Oct 31 12:42:53 2011 +++ src/sys/arch/i386/i386/dumpsys.c Thu Nov 10 03:45:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dumpsys.c,v 1.13 2011/10/31 12:42:53 yamt Exp $ */ +/* $NetBSD: dumpsys.c,v 1.14 2011/11/10 03:45:40 riz Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dumpsys.c,v 1.13 2011/10/31 12:42:53 yamt Exp $); +__KERNEL_RCSID(0, $NetBSD: dumpsys.c,v 1.14 2011/11/10 03:45:40 riz Exp $); #include sys/param.h #include sys/systm.h @@ -627,7 +627,7 @@ cpu_dump(void) * Add the machine-dependent header info. */ cpuhdr.pdppaddr = PDPpaddr; - if (i386_use_pae == 1) + if (use_pae == 1) cpuhdr.pdppaddr |= I386_KCORE_PAE; cpuhdr.nmemsegs = dump_nmemsegs; (void)dump_header_addbytes(cpuhdr, ALIGN(sizeof(cpuhdr)));
