Date: Sun, 21 Oct 2007 21:15:59 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 127905 for review Message-ID: <200710212115.l9LLFx4A062720@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127905 Change 127905 by jb@jb_freebsd1 on 2007/10/21 21:15:09 IF6 Affected files ... .. //depot/projects/dtrace6/src/UPDATING#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/Makefile#3 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/africa#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/asia#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/dtrace6/src/sys/conf/options.arm#2 integrate .. //depot/projects/dtrace6/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/dtrace6/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/dtrace6/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/dtrace6/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/dtrace6/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.8#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.sh#2 integrate Differences ... ==== //depot/projects/dtrace6/src/UPDATING#2 (text+ko) ==== @@ -534,4 +534,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.416.2.33 2007/08/06 10:16:01 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.416.2.35 2007/10/21 04:22:46 julian Exp $ ==== //depot/projects/dtrace6/src/lib/libarchive/archive_read_support_format_zip.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.5.2.4 2007/07/19 14:31:52 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.5.2.5 2007/10/18 05:19:44 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -335,6 +335,10 @@ zip->entry_bytes_remaining = zip->compressed_size; zip->entry_offset = 0; + /* If there's no body, force read_data() to return EOF immediately. */ + if (zip->entry_bytes_remaining < 1) + zip->end_of_entry = 1; + /* Set up a more descriptive format name. */ sprintf(zip->format_name, "ZIP %d.%d (%s)", zip->version / 10, zip->version % 10, @@ -422,6 +426,9 @@ /* End-of-entry cleanup done. */ zip->end_of_entry_cleanup = 1; } + *offset = zip->entry_uncompressed_bytes_read; + *size = 0; + *buff = NULL; return (ARCHIVE_EOF); } ==== //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5.2.3 2007/07/05 01:56:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5.2.4 2007/10/19 03:50:48 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -142,12 +142,17 @@ format_octal(archive_entry_mtime(entry), &h.c_mtime, sizeof(h.c_mtime)); format_octal(pathlength, &h.c_namesize, sizeof(h.c_namesize)); + /* Non-regular files don't store bodies. */ + if (archive_entry_filetype(entry) != AE_IFREG) + archive_entry_set_size(entry, 0); + /* Symlinks get the link written as the body of the entry. */ p = archive_entry_symlink(entry); if (p != NULL && *p != '\0') format_octal(strlen(p), &h.c_filesize, sizeof(h.c_filesize)); else - format_octal(archive_entry_size(entry), &h.c_filesize, sizeof(h.c_filesize)); + format_octal(archive_entry_size(entry), + &h.c_filesize, sizeof(h.c_filesize)); ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) ==== //depot/projects/dtrace6/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio_newc.c,v 1.1.2.1 2007/07/05 01:56:40 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio_newc.c,v 1.1.2.2 2007/10/19 03:50:48 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -148,12 +148,17 @@ format_hex(pathlength, &h.c_namesize, sizeof(h.c_namesize)); format_hex(0, &h.c_checksum, sizeof(h.c_checksum)); + /* Non-regular files don't store bodies. */ + if (archive_entry_filetype(entry) != AE_IFREG) + archive_entry_set_size(entry, 0); + /* Symlinks get the link written as the body of the entry. */ p = archive_entry_symlink(entry); if (p != NULL && *p != '\0') format_hex(strlen(p), &h.c_filesize, sizeof(h.c_filesize)); else - format_hex(archive_entry_size(entry), &h.c_filesize, sizeof(h.c_filesize)); + format_hex(archive_entry_size(entry), + &h.c_filesize, sizeof(h.c_filesize)); ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) ==== //depot/projects/dtrace6/src/share/zoneinfo/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20.2.3 2007/10/10 00:09:08 edwin Exp $ +# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20.2.4 2007/10/18 13:02:54 edwin Exp $ # # HOW TO UPDATE THE ZONEINFO DATA ==== //depot/projects/dtrace6/src/share/zoneinfo/africa#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)africa 8.9 +# @(#)africa 8.10 # <pre> # This data is by no means authoritative; if you think you know better, @@ -224,9 +224,19 @@ # From Jesper Norgaard Welen (2007-08-15): [The following agree:] # http://www.nentjes.info/Bill/bill5.htm # http://www.timeanddate.com/worldclock/city.html?n=53 +# From Steffen Thorsen (2007-09-04): The official information...: +# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm +Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 - +# From Abdelrahman Hassan (2007-09-06): +# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter +# than the year of the Gregorian calendar, Ramadan shifts earlier each +# year. This year it will be observed September 13 (September is quite +# hot in Egypt), and the idea is to make fasting easier for workers by +# shifting business hours one hour out of daytime heat. Consequently, +# unless discontinued, next DST may end Thursday 28 August 2008. # From Paul Eggert (2007-08-17): -# For lack of better info, assume the new rule is first Thursday. -Rule Egypt 2007 max - Sep Thu>=1 23:00s 0 - +# For lack of better info, assume the new rule is last Thursday in August. +Rule Egypt 2008 max - Aug lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:00 - LMT 1900 Oct ==== //depot/projects/dtrace6/src/share/zoneinfo/asia#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)asia 8.11 +# @(#)asia 8.12 # <pre> # This data is by no means authoritative; if you think you know better, @@ -568,14 +568,15 @@ # Reingold's/Dershowitz' calculator gives correctly the Gregorian date # 2058-03-21 for 1 Farvardin 1437 (astronomical). # -# From Paul Eggert (2006-03-22): -# The above comments about post-2006 transitions may become relevant again, -# if Iran ever resuscitates DST, so we'll leave the comments in. -# # From Steffen Thorsen (2006-03-22): # Several of my users have reported that Iran will not observe DST anymore: # http://www.irna.ir/en/news/view/line-17/0603193812164948.htm # +# From Reuters (2007-09-16), with a heads-up from Jesper Norgaard Welen: +# ... the Guardian Council ... approved a law on Sunday to re-introduce +# daylight saving time ... +# http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916 +# # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Iran 1978 1980 - Mar 21 0:00 1:00 D Rule Iran 1978 only - Oct 21 0:00 0 S @@ -596,6 +597,36 @@ Rule Iran 2004 only - Sep 21 0:00 0 S Rule Iran 2005 only - Mar 22 0:00 1:00 D Rule Iran 2005 only - Sep 22 0:00 0 S +Rule Iran 2008 only - Mar 21 0:00 1:00 D +Rule Iran 2008 only - Sep 21 0:00 0 S +Rule Iran 2009 2011 - Mar 22 0:00 1:00 D +Rule Iran 2009 2011 - Sep 22 0:00 0 S +Rule Iran 2012 only - Mar 21 0:00 1:00 D +Rule Iran 2012 only - Sep 21 0:00 0 S +Rule Iran 2013 2015 - Mar 22 0:00 1:00 D +Rule Iran 2013 2015 - Sep 22 0:00 0 S +Rule Iran 2016 only - Mar 21 0:00 1:00 D +Rule Iran 2016 only - Sep 21 0:00 0 S +Rule Iran 2017 2019 - Mar 22 0:00 1:00 D +Rule Iran 2017 2019 - Sep 22 0:00 0 S +Rule Iran 2020 only - Mar 21 0:00 1:00 D +Rule Iran 2020 only - Sep 21 0:00 0 S +Rule Iran 2021 2023 - Mar 22 0:00 1:00 D +Rule Iran 2021 2023 - Sep 22 0:00 0 S +Rule Iran 2024 only - Mar 21 0:00 1:00 D +Rule Iran 2024 only - Sep 21 0:00 0 S +Rule Iran 2025 2027 - Mar 22 0:00 1:00 D +Rule Iran 2025 2027 - Sep 22 0:00 0 S +Rule Iran 2028 2029 - Mar 21 0:00 1:00 D +Rule Iran 2028 2029 - Sep 21 0:00 0 S +Rule Iran 2030 2031 - Mar 22 0:00 1:00 D +Rule Iran 2030 2031 - Sep 22 0:00 0 S +Rule Iran 2032 2033 - Mar 21 0:00 1:00 D +Rule Iran 2032 2033 - Sep 21 0:00 0 S +Rule Iran 2034 2035 - Mar 22 0:00 1:00 D +Rule Iran 2034 2035 - Sep 22 0:00 0 S +Rule Iran 2036 2037 - Mar 21 0:00 1:00 D +Rule Iran 2036 2037 - Sep 21 0:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Tehran 3:25:44 - LMT 1916 3:25:44 - TMT 1946 # Tehran Mean Time @@ -1518,6 +1549,17 @@ # I guess it is likely that next year's date will be moved as well, # because of the Ramadan. +# From Jesper Norgaard Welen (2007-09-18): +# According to Steffen Thorsen's web site the Gaza Strip and the rest of the +# Palestinian territories left DST early on 13.th. of September at 2:00. + +# From Paul Eggert (2007-09-20): +# My understanding is that Gaza and the West Bank disagree even over when +# the weekend is (Thursday+Friday versus Friday+Saturday), so I'd be a bit +# surprised if they agreed about DST. But for now, assume they agree. +# For lack of better information, predict that future changes will be +# the 2nd Thursday of September at 02:00. + # The rules for Egypt are stolen from the `africa' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -1533,7 +1575,7 @@ Rule Palestine 2005 only - Oct 4 2:00 0 - Rule Palestine 2006 max - Apr 1 0:00 1:00 S Rule Palestine 2006 only - Sep 22 0:00 0 - -Rule Palestine 2007 max - Oct Fri>=15 0:00 0 - +Rule Palestine 2007 max - Sep Thu>=8 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct ==== //depot/projects/dtrace6/src/share/zoneinfo/southamerica#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)southamerica 8.11 +# @(#)southamerica 8.12 # <pre> # This data is by no means authoritative; if you think you know better, @@ -424,6 +424,10 @@ # modern Brazilian eletronic voting machines which, apparently, can't deal # with a time change between the first and the second rounds of the elections. +# From Steffen Thorsen (2007-09-20): +# Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00: +# http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975 + # From Paul Eggert (2002-10-10): # The official decrees referenced below are mostly taken from # <a href="http://pcdsh01.on.br/DecHV.html">; @@ -557,13 +561,18 @@ # Decree <a href="http://pcdsh01.on.br/DecHV5539.gif">5,539</a>; (2005-09-19), # adopted by the same states as before. Rule Brazil 2005 only - Oct 16 0:00 1:00 S -# Decree <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2006/Decreto/D5920.htm">5,920</a>; -# (2006-10-03), adopted by the same states as before. -Rule Brazil 2006 max - Nov Sun>=1 0:00 1:00 S -Rule Brazil 2007 max - Feb lastSun 0:00 0 - +# Decree <a href="http://pcdsh01.on.br/DecHV5920.gif">5,920</a>; (2006-10-03), +# adopted by the same states as before. +Rule Brazil 2006 only - Nov 5 0:00 1:00 S +Rule Brazil 2007 only - Feb 25 0:00 0 - +# (Decree number not yet known) +# http://www.brasil.gov.br/noticias/ultimas_noticias/horario_verao070920/ +# (2007-09-20) after a heads-up from Steffen Thorsen: +Rule Brazil 2007 max - Oct Sun>=8 0:00 1:00 S +Rule Brazil 2008 max - Feb Sun>=15 0:00 0 - # The latest ruleset listed above says that the following states observe DST: # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP. -# For dates after mid-2007, the above rules with TO="max" are guesses +# For dates after mid-2008, the above rules with TO="max" are guesses # and are quite possibly wrong, but are more likely than no DST at all. @@ -1097,8 +1106,20 @@ -3:00 Uruguay UY%sT # Venezuela +# +# From Kiraz Janicke (2007-09-25), in +# http://www.venezuelanalysis.com/analysis/2645: +# The proposal ... involves turning the clock back half an hour from +# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone +# Venezuela had until December 31, 1964, when the current time zone +# was adopted. The change was due to take place on September 17 and +# then on September 24, but has since been postponed until December +# 31, to allow for compliance with international organizations, such +# as the International Office of Weights and Measures. + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Caracas -4:27:44 - LMT 1890 -4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time? -4:30 - VET 1965 # Venezuela Time - -4:00 - VET + -4:00 - VET 2008 + -4:30 - VET ==== //depot/projects/dtrace6/src/sys/arm/xscale/i80321/i80321_timer.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.5 2005/02/13 18:05:36 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.5.2.1 2007/10/17 23:29:02 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,6 +61,8 @@ #include <arm/xscale/xscalevar.h> +#include "opt_timer.h" + void (*i80321_hardclock_hook)(void) = NULL; struct i80321_timer_softc { device_t dev; @@ -76,7 +78,9 @@ static int32_t last = -1; static int ticked = 0; +#ifndef COUNTS_PER_SEC #define COUNTS_PER_SEC 200000000 /* 200MHz */ +#endif #define COUNTS_PER_USEC (COUNTS_PER_SEC / 1000000) static struct timecounter i80321_timer_timecounter = { ==== //depot/projects/dtrace6/src/sys/arm/xscale/i80321/std.iq31244#2 (text+ko) ==== @@ -1,6 +1,7 @@ #IQ31244 board configuration -#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.2 2004/11/18 00:05:09 cognet Exp $ +#$FreeBSD: src/sys/arm/xscale/i80321/std.iq31244,v 1.2.2.1 2007/10/17 23:29:02 cognet Exp $ include "../xscale/i80321/std.i80321" files "../xscale/i80321/files.iq31244" makeoptions KERNPHYSADDR=0xa0200000 makeoptions KERNVIRTADDR=0xc0200000 +options COUNTS_PER_SEC=198000000 ==== //depot/projects/dtrace6/src/sys/conf/options.arm#2 (text+ko) ==== @@ -1,9 +1,11 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.5.2.3 2007/02/27 00:27:50 cognet Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.5.2.4 2007/10/17 23:29:01 cognet Exp $ ARM32_NEW_VM_LAYOUT opt_vm.h ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h +ARM_KERN_DIRECTMAP opt_vm.h ARM_USE_SMALL_ALLOC opt_global.h +COUNTS_PER_SEC opt_timer.h CPU_SA1100 opt_global.h CPU_SA1110 opt_global.h CPU_ARM9 opt_global.h ==== //depot/projects/dtrace6/src/sys/ddb/db_command.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.2 2005/10/25 20:10:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60.2.3 2007/10/19 16:48:43 obrien Exp $"); #include <sys/param.h> #include <sys/linker_set.h> @@ -68,6 +68,7 @@ static db_cmdfcn_t db_fncall; static db_cmdfcn_t db_gdb; +static db_cmdfcn_t db_halt; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; static db_cmdfcn_t db_stack_trace; @@ -420,6 +421,8 @@ { "show", 0, 0, db_show_cmds }, { "ps", db_ps, 0, 0 }, { "gdb", db_gdb, 0, 0 }, + { "halt", db_halt, 0, 0 }, + { "reboot", db_reset, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, @@ -545,6 +548,13 @@ } static void +db_halt(db_expr_t dummy, boolean_t dummy2, db_expr_t dummy3, char *dummy4) +{ + + cpu_halt(); +} + +static void db_kill(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy1; boolean_t dummy2; ==== //depot/projects/dtrace6/src/sys/nfsclient/nfs_subs.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.140.2.2 2007/02/11 03:07:46 mohans Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.140.2.3 2007/10/17 16:07:10 jhb Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -478,7 +478,7 @@ struct mbuf *md; enum vtype vtyp; u_short vmode; - struct timespec mtime; + struct timespec mtime, mtime_save; int v3 = NFS_ISV3(vp); md = *mdp; @@ -545,6 +545,7 @@ vap->va_type = vtyp; vap->va_mode = (vmode & 07777); vap->va_rdev = rdev; + mtime_save = vap->va_mtime; vap->va_mtime = mtime; vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0]; if (v3) { @@ -608,6 +609,21 @@ np->n_size = vap->va_size; } } + /* + * The following checks are added to prevent a race between (say) + * a READDIR+ and a WRITE. + * READDIR+, WRITE requests sent out. + * READDIR+ resp, WRITE resp received on client. + * However, the WRITE resp was handled before the READDIR+ resp + * causing the post op attrs from the write to be loaded first + * and the attrs from the READDIR+ to be loaded later. If this + * happens, we have stale attrs loaded into the attrcache. + * We detect this by for the mtime moving back. We invalidate the + * attrcache when this happens. + */ + if (timespeccmp(&mtime_save, &vap->va_mtime, >)) + /* Size changed or mtime went backwards */ + np->n_attrstamp = 0; if (vaper != NULL) { bcopy((caddr_t)vap, (caddr_t)vaper, sizeof(*vap)); if (np->n_flag & NCHG) { ==== //depot/projects/dtrace6/src/sys/powerpc/powerpc/db_interface.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/db_interface.c,v 1.5 2004/07/27 07:04:58 grehan Exp $ */ +/* $FreeBSD: src/sys/powerpc/powerpc/db_interface.c,v 1.5.2.1 2007/10/19 16:48:43 obrien Exp $ */ /* $NetBSD: db_interface.c,v 1.20 2002/05/13 20:30:09 matt Exp $ */ /* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */ @@ -8,7 +8,6 @@ #include <sys/cons.h> #include <sys/kdb.h> #include <sys/ktr.h> -#include <sys/linker_set.h> #include <sys/lock.h> #include <sys/pcpu.h> #include <sys/proc.h> @@ -84,16 +83,3 @@ db_show_mdpcpu(struct pcpu *pc) { } - -/* - * PowerPC-specific ddb commands: - */ -DB_COMMAND(reboot, db_reboot) -{ - cpu_reset(); -} - -DB_COMMAND(halt, db_halt) -{ - cpu_halt(); -} ==== //depot/projects/dtrace6/src/sys/sparc64/sparc64/db_interface.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/db_interface.c,v 1.10 2004/07/10 23:47:20 marcel Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/db_interface.c,v 1.10.8.1 2007/10/19 16:48:43 obrien Exp $ */ #include <sys/param.h> @@ -32,7 +32,6 @@ #include <sys/cons.h> #include <sys/kdb.h> #include <sys/ktr.h> -#include <sys/linker_set.h> #include <sys/lock.h> #include <sys/pcpu.h> #include <sys/proc.h> @@ -94,13 +93,3 @@ db_show_mdpcpu(struct pcpu *pc) { } - -DB_COMMAND(reboot, db_reboot) -{ - cpu_reset(); -} - -DB_COMMAND(halt, db_halt) -{ - cpu_halt(); -} ==== //depot/projects/dtrace6/src/sys/vm/uma_core.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.119.2.19 2007/02/11 03:31:19 mohans Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.119.2.20 2007/10/18 18:45:53 jhb Exp $"); /* I should really use ktr.. */ /* @@ -1980,7 +1980,7 @@ * caller can't handle that. */ if (keg->uk_flags & UMA_ZFLAG_INTERNAL && keg->uk_recurse != 0) - if ((zone != slabzone) && (zone != slabrefzone)) + if (zone != slabzone && zone != slabrefzone && zone != zones) return (NULL); slab = NULL; ==== //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.55 2004/06/06 17:55:55 mtm Exp $ +.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.55.8.1 2007/10/19 08:16:30 mtm Exp $ .\" -.Dd March 30, 2004 +.Dd October 19, 2007 .Dt ADDUSER 8 .Os .Sh NAME @@ -66,7 +66,9 @@ .Xr pw 8 will accept. Generally this means it -may contain only lowercase characters or digits. +may contain only lowercase characters or digits but cannot begin with the +.Ql - +character. Maximum length is 16 characters. The reasons for this limit are historical. @@ -81,7 +83,7 @@ and recompile the world; people have done this and it works, but you will have problems with any precompiled programs, or source that assumes the 8-character -name limit and NIS. +name limit, such as NIS. The NIS protocol mandates an 8-character username. If you need a longer login name for e-mail addresses, you can define an alias in @@ -203,7 +205,7 @@ The format of the input file is described below. .It Fl g Ar login_group -Normaly, +Normally, if no login group is specified, it is assumed to be the same as the username. This option makes @@ -431,6 +433,7 @@ .Xr login.conf 5 , .Xr passwd 5 , .Xr shells 5 , +.Xr adding_user 8 , .Xr pw 8 , .Xr pwd_mkdb 8 , .Xr rmuser 8 , @@ -462,12 +465,12 @@ The .Nm utility attempts to mitigate the possibility of an attacker using this -feature by refusing to evaluate the file if it is not owned and writeable +feature by refusing to evaluate the file if it is not owned and writable only by the root user. In addition, shell special characters and operators will have to be escaped when used in the message file. .Pp -Also, password ageing and account expiry times are currently setable +Also, password ageing and account expiry times are currently settable only in batch mode or when specified in .Pa /etc/adduser.conf . The user should be able to set them in interactive mode as well. ==== //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.8#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/adduser/rmuser.8,v 1.23 2004/06/08 14:52:55 csjp Exp $ +.\" $FreeBSD: src/usr.sbin/adduser/rmuser.8,v 1.23.8.1 2007/10/19 08:16:30 mtm Exp $ .\" .Dd May 10, 2002 .Dt RMUSER 8 @@ -129,7 +129,7 @@ including the hash mark itself, is considered a comment and will not be processed. If the file is owned by anyone other than a user with -UID 0, or is writeable by anyone other than the owner, +UID 0, or is writable by anyone other than the owner, .Nm will refuse to continue. .It Fl y @@ -146,7 +146,7 @@ .It Fl v Enable verbose mode. Normally, -the output inlcudes one line per removed user; +the output includes one line per removed user; however, with this option .Nm ==== //depot/projects/dtrace6/src/usr.sbin/adduser/rmuser.sh#2 (text+ko) ==== @@ -24,7 +24,7 @@ # # Email: Mike Makonnen <mtm@FreeBSD.Org> # -# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9 2005/05/24 04:50:07 adamw Exp $ +# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9.2.1 2007/10/19 07:53:14 mtm Exp $ # ATJOBDIR="/var/at/jobs" @@ -86,10 +86,10 @@ echo -n " mailspool" rm ${MAILSPOOL}/$login fi - if [ -f ${MAILSPOOL}/${login}.pop ]; then - verbose && echo -n " ${MAILSPOOL}/${login}.pop" || + if [ -f ${MAILSPOOL}/.${login}.pop ]; then + verbose && echo -n " ${MAILSPOOL}/.${login}.pop" || echo -n " pop3" - rm ${MAILSPOOL}/${login}.pop + rm ${MAILSPOOL}/.${login}.pop fi verbose && echo '.' }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710212115.l9LLFx4A062720>