From gk at FreeBSD.org Thu Oct 1 11:08:27 2009 From: gk at FreeBSD.org (Gleb Kurtsou) Date: Thu Oct 1 11:08:34 2009 Subject: PERFORCE change 169074 for review Message-ID: <200910011108.n91B8OCN092535@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169074 Change 169074 by gk@gk_h1 on 2009/10/01 11:07:39 use consistent names for pefs commands print supported algorithms Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#9 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#9 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#8 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#9 (text+ko) ==== @@ -59,11 +59,12 @@ static int pefs_setkey(int argc, char *argv[]); static int pefs_delkey(int argc, char *argv[]); static int pefs_flushkeys(int argc, char *argv[]); -static int pefs_setchain(int argc, char *argv[]); +static int pefs_addchain(int argc, char *argv[]); static int pefs_delchain(int argc, char *argv[]); static int pefs_randomchain(int argc, char *argv[]); static int pefs_showkeys(int argc, char *argv[]); -static int pefs_showchain(int argc, char *argv[]); +static int pefs_showchains(int argc, char *argv[]); +static int pefs_showalgs(int argc, char *argv[]); typedef int (*command_func_t)(int argc, char **argv); typedef int (*keyop_func_t)(struct pefs_keychain_head *kch, int fd, @@ -85,9 +86,10 @@ { "showkeys", pefs_showkeys }, { "status", pefs_showkeys }, { "randomchain", pefs_randomchain }, - { "setchain", pefs_setchain }, + { "addchain", pefs_addchain }, { "delchain", pefs_delchain }, - { "showchain", pefs_showchain }, + { "showchains", pefs_showchains }, + { "showalgs", pefs_showalgs }, { NULL, NULL }, }; @@ -405,9 +407,8 @@ pefs_showkeys(int argc, char *argv[]) { struct pefs_xkey k; - int chain, fd, i; + int fd, i; - chain = 1; while ((i = getopt(argc, argv, "")) != -1) switch(i) { case '?': @@ -442,9 +443,6 @@ } close(fd); - if (chain) { - } - return (0); } @@ -483,7 +481,7 @@ } static int -pefs_setchain(int argc, char *argv[]) +pefs_addchain(int argc, char *argv[]) { struct pefs_keychain *kc; struct pefs_keychain_head kch; @@ -690,7 +688,7 @@ } static int -pefs_showchain(int argc, char *argv[]) +pefs_showchains(int argc, char *argv[]) { struct pefs_xkey k; struct pefs_keyparam kp; @@ -813,7 +811,18 @@ return (0); } +static int +pefs_showalgs(int argc, char *argv[] __unused) +{ + if (argc != 0) + pefs_usage(); + + pefs_alg_list(stdout); + + return (0); +} + void pefs_usage(void) { @@ -824,12 +833,14 @@ " pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n" " pefs delkey [-cCpv] [-i iterations] [-k keyfile] filesystem\n" " pefs flushkeys filesystem\n" -" pefs setchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n" +" pefs showkeys filesystem\n" +" pefs addchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n" " [-A alg] [-I iterations] [-K keyfile] filesystem\n" " pefs delchain [-pv] [-i iterations] [-k keyfile] filesystem\n" -" pefs showchain [-p] [-i iterations] [-k keyfile] filesystem\n" " pefs randomchain [-v] [-a alg] [-n min] [-N max] filesystem\n" -" pefs showkeys filesystem\n"); +" pefs showchains [-p] [-i iterations] [-k keyfile] filesystem\n" +" pefs showalgs\n" +); exit(EX_USAGE); } ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#9 (text+ko) ==== @@ -74,5 +74,5 @@ const struct pefs_xkey *xk_parent); uintmax_t pefs_keyid_as_int(char *keyid); const char * pefs_alg_name(struct pefs_xkey *xk); -int pefs_alg_lookup(struct pefs_xkey *xk, const char *algname); +void pefs_alg_list(FILE *stream); ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ }; static struct algorithm algs[] = { - { "salsa20-256", PEFS_ALG_SALSA20, 256 }, { "aes128-ctr", PEFS_ALG_AES_CTR, 128 }, { "aes128", PEFS_ALG_AES_CTR, 128 }, { "aes192-ctr", PEFS_ALG_AES_CTR, 192 }, @@ -71,6 +70,7 @@ { "camellia192", PEFS_ALG_CAMELLIA_CTR, 192 }, { "camellia256-ctr", PEFS_ALG_CAMELLIA_CTR, 256 }, { "camellia256", PEFS_ALG_CAMELLIA_CTR, 256 }, + { "salsa20-256", PEFS_ALG_SALSA20, 256 }, { NULL, 0, 0 }, }; @@ -87,7 +87,26 @@ return (""); } -int +void +pefs_alg_list(FILE *stream) +{ + struct algorithm *prev, *alg; + + fprintf(stream, "Supported algorithms:\n"); + for (prev = NULL, alg = algs; alg->name != NULL; prev = alg++) { + if (prev != NULL && alg->id == prev->id && + alg->keybits == prev->keybits) { + fprintf(stream, "\t%s\t(alias for %s)\n", alg->name, prev->name); + } else if (alg->id == PEFS_ALG_DEFAULT && + alg->keybits == PEFS_ALG_DEFAULT_KEYBITS) { + fprintf(stream, "\t%s\t(default)\n", alg->name); + } else { + fprintf(stream, "\t%s\n", alg->name); + } + } +} + +static int pefs_alg_lookup(struct pefs_xkey *xk, const char *algname) { struct algorithm *alg; @@ -117,8 +136,11 @@ xk->pxk_keybits = PEFS_ALG_DEFAULT_KEYBITS; if (kp->kp_alg != NULL) { - if (pefs_alg_lookup(xk, kp->kp_alg) < 0) - errx(EX_USAGE, "invalid algorithm %s", kp->kp_alg); + if (pefs_alg_lookup(xk, kp->kp_alg) < 0) { + warnx("invalid algorithm %s", kp->kp_alg); + pefs_alg_list(stderr); + exit(EX_USAGE); + } } g_eli_crypto_hmac_init(&ctx, NULL, 0); From hselasky at FreeBSD.org Thu Oct 1 15:30:13 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Oct 1 15:30:19 2009 Subject: PERFORCE change 169085 for review Message-ID: <200910011530.n91FUCc0025737@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169085 Change 169085 by hselasky@hselasky_laptop001 on 2009/10/01 15:29:25 USB controller: (EHCI Hardware BUG workaround) The EHCI HW can use the qtd_next field instead of qtd_altnext when a short packet is received. This contradicts what is stated in the EHCI datasheet. Also the total-bytes field in the status field of the following TD gets corrupted upon reception of a short packet! We work this around in software by not queueing more than one job/TD at a time of up to 16Kbytes! The bug has been seen on multiple INTEL based EHCI chips. Other vendors have not been tested yet. - Applications using /dev/usb/X.Y.Z, where Z is non-zero are affected, but not applications using LibUSB v0.1, v1.2 and v2.0. - Mass Storage is affected. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#34 (text+ko) ==== @@ -131,6 +131,7 @@ uint8_t auto_data_toggle; uint8_t setup_alt_next; uint8_t last_frame; + uint8_t can_use_next; }; void @@ -1207,11 +1208,6 @@ xfer->td_transfer_cache = td; - /* update data toggle */ - - xfer->endpoint->toggle_next = - (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; - #if USB_DEBUG if (status & EHCI_QTD_STATERRS) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x" @@ -1235,6 +1231,9 @@ static void ehci_non_isoc_done(struct usb_xfer *xfer) { + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + ehci_qh_t *qh; + uint32_t status; usb_error_t err = 0; DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", @@ -1248,6 +1247,17 @@ } #endif + /* extract data toggle directly from the QH's overlay area */ + + qh = xfer->qh_start[xfer->flags_int.curr_dma_set]; + + usb_pc_cpu_invalidate(qh->page_cache); + + status = hc32toh(sc, qh->qh_qtd.qtd_status); + + xfer->endpoint->toggle_next = + (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; + /* reset scanner */ xfer->td_transfer_cache = xfer->td_transfer_first; @@ -1348,6 +1358,7 @@ } } else { ehci_qtd_t *td; + ehci_qh_t *qh; /* non-isochronous transfer */ @@ -1357,16 +1368,35 @@ */ td = xfer->td_transfer_cache; + qh = xfer->qh_start[xfer->flags_int.curr_dma_set]; + + usb_pc_cpu_invalidate(qh->page_cache); + + status = hc32toh(sc, qh->qh_qtd.qtd_status); + if (status & EHCI_QTD_ACTIVE) { + /* transfer is pending */ + goto done; + } + while (1) { usb_pc_cpu_invalidate(td->page_cache); status = hc32toh(sc, td->qtd_status); /* - * if there is an active TD the transfer isn't done + * Check if there is an active TD which + * indicates that the transfer isn't done. */ if (status & EHCI_QTD_ACTIVE) { /* update cache */ - xfer->td_transfer_cache = td; + if (xfer->td_transfer_cache != td) { + xfer->td_transfer_cache = td; + if (qh->qh_qtd.qtd_next & + htohc32(sc, EHCI_LINK_TERMINATE)) { + /* XXX - manually advance to next frame */ + qh->qh_qtd.qtd_next = td->qtd_self; + usb_pc_cpu_flush(td->page_cache); + } + } goto done; } /* @@ -1545,7 +1575,6 @@ ehci_qtd_t *td; ehci_qtd_t *td_next; ehci_qtd_t *td_alt_next; - uint32_t qtd_altnext; uint32_t buf_offset; uint32_t average; uint32_t len_old; @@ -1554,7 +1583,6 @@ uint8_t precompute; terminate = htohc32(temp->sc, EHCI_LINK_TERMINATE); - qtd_altnext = terminate; td_alt_next = NULL; buf_offset = 0; shortpkt_old = temp->shortpkt; @@ -1612,7 +1640,8 @@ td->qtd_status = temp->qtd_status | - htohc32(temp->sc, EHCI_QTD_SET_BYTES(average)); + htohc32(temp->sc, EHCI_QTD_IOC | + EHCI_QTD_SET_BYTES(average)); if (average == 0) { @@ -1687,11 +1716,23 @@ td->qtd_buffer_hi[x] = 0; } - if (td_next) { - /* link the current TD with the next one */ - td->qtd_next = td_next->qtd_self; + if (temp->can_use_next) { + if (td_next) { + /* link the current TD with the next one */ + td->qtd_next = td_next->qtd_self; + } + } else { + /* + * BUG WARNING: The EHCI HW can use the + * qtd_next field instead of qtd_altnext when + * a short packet is received! We work this + * around in software by not queueing more + * than one job/TD at a time! + */ + td->qtd_next = terminate; } - td->qtd_altnext = qtd_altnext; + + td->qtd_altnext = terminate; td->alt_next = td_alt_next; usb_pc_cpu_flush(td->page_cache); @@ -1703,15 +1744,9 @@ /* setup alt next pointer, if any */ if (temp->last_frame) { td_alt_next = NULL; - qtd_altnext = terminate; } else { /* we use this field internally */ td_alt_next = td_next; - if (temp->setup_alt_next) { - qtd_altnext = td_next->qtd_self; - } else { - qtd_altnext = terminate; - } } /* restore */ @@ -1756,6 +1791,8 @@ temp.qtd_status = 0; temp.last_frame = 0; temp.setup_alt_next = xfer->flags_int.short_frames_ok; + temp.can_use_next = (xfer->flags_int.control_xfr || + (UE_GET_DIR(xfer->endpointno) == UE_DIR_OUT)); if (xfer->flags_int.control_xfr) { if (xfer->endpoint->toggle_next) { @@ -1889,7 +1926,6 @@ /* the last TD terminates the transfer: */ td->qtd_next = htohc32(temp.sc, EHCI_LINK_TERMINATE); td->qtd_altnext = htohc32(temp.sc, EHCI_LINK_TERMINATE); - td->qtd_status |= htohc32(temp.sc, EHCI_QTD_IOC); usb_pc_cpu_flush(td->page_cache); From stas at FreeBSD.org Thu Oct 1 17:29:26 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Thu Oct 1 17:29:31 2009 Subject: PERFORCE change 169089 for review Message-ID: <200910011729.n91HTOZ0046675@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169089 Change 169089 by stas@stas_yandex on 2009/10/01 17:28:52 - Remove debug warning, we don't need to deal with any extra fields. Affected files ... .. //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#5 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#5 (text+ko) ==== @@ -405,7 +405,7 @@ # if defined(VGO_linux) /* no other fields to clear */ # elif defined(VGO_freebsd) -# warning "Needs love" + /* no other fields to clear */ # elif defined(VGO_aix5) tst->os_state.cancel_async = False; tst->os_state.cancel_disabled = False; From stas at FreeBSD.org Thu Oct 1 17:33:30 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Thu Oct 1 17:33:36 2009 Subject: PERFORCE change 169091 for review Message-ID: <200910011733.n91HXT7f047049@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169091 Change 169091 by stas@stas_yandex on 2009/10/01 17:33:04 - Fix one subtle error with pthread_exit/pthread_join. Before this change we were not passing the right argument value to thr_exit syscall and thus consumers sleeping on our wait channel were not awakened. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#44 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#44 (text+ko) ==== @@ -171,11 +171,11 @@ #if defined(VGP_x86_freebsd) /* FreeBSD has args on the stack */ asm volatile ( "movl %1, %0\n" /* set tst->status = VgTs_Empty */ - "movl %2, %%eax\n" /* set %eax = __NR_thr_exit */ - "leal %3, %%ebx\n" /* set %ebx = tst->os_state.exitcode */ + "movl %2, %%eax\n" /* set %eax = __NR_hr_exit */ + "movl %3, %%ebx\n" /* set %ebx = tst->os_state.exitcode */ "pushl %%ebx\n" /* arg on stack */ "pushl %%ebx\n" /* fake return address */ - "int $0x80\n" /* thr_exit(&tst->os_state.exitcode) */ + "int $0x80\n" /* thr_exit(tst->os_state.exitcode) */ "popl %%ebx\n" /* fake return address */ "popl %%ebx\n" /* arg off stack */ : "=m" (tst->status) @@ -184,9 +184,9 @@ asm volatile ( "movl %1, %0\n" /* set tst->status = VgTs_Empty */ "movq %2, %%rax\n" /* set %rax = __NR_thr_exit */ - "leaq %3, %%rdi\n" /* set %rdi = tst->os_state.exitcode */ + "movq %3, %%rdi\n" /* set %rdi = tst->os_state.exitcode */ "pushq %%rdi\n" /* fake return address */ - "syscall\n" /* thr_exit(&tst->os_state.exitcode) */ + "syscall\n" /* thr_exit(tst->os_state.exitcode) */ "popq %%rdi\n" /* fake return address */ : "=m" (tst->status) : "n" (VgTs_Empty), "n" (__NR_thr_exit), "m" (tst->os_state.exitcode)); @@ -1808,8 +1808,8 @@ PRE_MEM_WRITE( "thr_exit(status)", ARG1, sizeof(long) ); tst = VG_(get_ThreadState)(tid); tst->exitreason = VgSrc_ExitThread; - tst->os_state.exitcode = 0; - VG_(exit_thread)(tid); + tst->os_state.exitcode = ARG1; + SET_STATUS_Success(0); } PRE(sys_thr_set_name) From rwatson at FreeBSD.org Thu Oct 1 18:42:49 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Thu Oct 1 18:42:58 2009 Subject: PERFORCE change 169096 for review Message-ID: <200910011842.n91IgjG1053180@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169096 Change 169096 by rwatson@rwatson_freebsd_capabilities on 2009/10/01 18:42:11 Integrate TrustedBSD capabilities branch -- almost no conflicts as 8/9 have been fairly static since last integ. Main exception was syscalls.master as system call reservations for capability calls have gone upstream, but without implementations. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#10 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#11 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#11 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/chmod/chmod.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/utils.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/print.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/mv/mv.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/mask.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/merge.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/remove.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mknodes.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#6 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/head/assert.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bzip2/FREEBSD-vendor#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ee/ee.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic2mime#3 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/FREEBSD-vendor#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/FREEBSD-vendor#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/top/display.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/traceroute/as.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/traceroute/as.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/FREEBSD-vendor#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/apps/md4.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/d1_both.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/bftest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/bntest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/casttest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/destest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/dhtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/dsatest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ecdhtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ecdsatest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ectest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/enginetest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/evp_test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/exptest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_aesavs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_desmovs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_dsatest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_dssvs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_hmactest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_randtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rngvs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rsagtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rsastest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rsavtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_shatest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_test_suite.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/hmactest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ideatest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/jpaketest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/md2test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/md4test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/md5test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/mdc2test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/randtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rc2test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rc4test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rc5test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rmdtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rsa_test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/sha1test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/sha256t.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/sha512t.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/shatest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ssltest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/etc/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/periodic.conf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#10 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/freebsd-update.conf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/inetd.conf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.local.dist#3 delete .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.x11-4.dist#2 delete .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.x11.dist#2 delete .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/periodic/security/200.chkmounts#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/addswap#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/auto_linklocal#3 delete .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/defaultroute#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/devd#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/mroute6d#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netif#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/network_ipv6#3 delete .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ppp#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/route6d#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routed#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routing#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/rtadvd#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/static_arp#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/sysctl#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/wpa_supplicant#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#6 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/patch/common.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#12 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_zip.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_bz2.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/Versions.def#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#11 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isideogram.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isphonogram.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isrune.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isspecial.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_calc_mask.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_support.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_to_text.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_free.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_get.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_set.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_text.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/posix1e.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/ptsname.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdtime/localtime.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/setfib.2#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/stack_protector.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libdisk/change.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libjail/jail.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_proc.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_vnet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.3#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.core2.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc_capabilities.3#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc_read.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libradius/libradius.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libradius/radlib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/net.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/nfs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/rpc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rquotad/rquotad.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/release/scripts/lib32-make.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/scripts/mm-mtree.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/scripts/package-split.py#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/svnbranch.awk#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/core/geom.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifgif.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mksnap_ffs/mksnap_ffs.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/route/route.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/route/route.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/savecore/savecore.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/savecore/savecore.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/umount/umount.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/colldef/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/colldef/la_LN.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/colldef/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/Makefile#12 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ahci.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/dpms.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ed.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ip6.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ips.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/lindev.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.i386/Makefile#8 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mfi.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mpt.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/msk.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/polling.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/pts.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/pty.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/textdump.4#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/freebsd-update.conf.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/make.conf.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/procfs.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/tmpfs.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/release.7#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/tuning.7#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#9 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/VOP_ACCESS.9#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/acl.9#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/fail.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_amrr.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_beacon.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_bmiss.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_crypto.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_ddb.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_input.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_ioctl.9#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_node.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_output.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_proto.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_regdomain.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_scan.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_vap.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/kproc.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/kthread.9#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/sglist.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/vaccess.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/misc/bsd-family-tree#8 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/iso3166#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/mklocale/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/mklocale/la_LN.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/mklocale/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/monetdef/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/monetdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/msgdef/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/msgdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/msgdef/lv_LV.UTF-8.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/numericdef/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/timedef/lv_LV.UTF-8.src#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/africa#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/asia#9 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/australasia#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/europe#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/southamerica#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/local_apic.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/param.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/smp.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/_align.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/md_var.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/param.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/common.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mvreg.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/ixp425/ixdp425_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/gptboot/gptboot.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/vnode.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#18 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.amd64#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.i386#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.ia64#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.pc98#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.powerpc#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.sparc64#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/newvers.sh#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#14 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.amd64#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.arm#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.i386#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.pc98#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/age/if_age.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ale/if_ale.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/amr/amr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/asmc/asmcvar.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ah_osdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_regdomain.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/coretemp/coretemp.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/de/if_de.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hptiop/hptiop.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_tpublic.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgbe/ixgbe.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/lindev/full.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfi_ioctl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mge/if_mge.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mwl/if_mwl.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge_var.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/null/null.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pst/pst-iop.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pty/pty.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/rp/rp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/snp/snp.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hda_reg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_reg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scvesactl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/Makefile#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/gensequences#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/sequences#4 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken.c#6 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken.h#5 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_demo.c#4 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_scs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_stress.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_subr.h#4 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_subr_compat.h#4 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/twe/twe.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/ufm.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_aue.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axe.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdcereg.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uark.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubsa.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubser.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ucycom.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ufoma.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ugensa.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uipaq.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umct.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umoscom.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uplcom.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uslcom.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvisor.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvscom.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_cdc.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/blkback/blkback.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/netback/netback.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_disk.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_io.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/msi.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/_align.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/param.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/smp.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/i386/isa/vesa.c#4 delete .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/locore.s#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/param.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/smp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/isa/isahint.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#39 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_conf.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_cons.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#29 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_event.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#18 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_jail.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_linker.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_mib.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_poll.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_proc.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_subr.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sysctl.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_ule.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_bus.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_pcpu.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_sglist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_smp.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_generic.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_pipe.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#39 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#21 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_pts.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_pty.c#8 delete .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_export.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/_align.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/param.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/smp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/Makefile#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/drm/radeon/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/lindev/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/pty/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf_buffer.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bpfdesc.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_arp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ef.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_llatbl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_llatbl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_var.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_vlan.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/route.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/rtsock.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/vnet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/vnet.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_dfs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_input.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netatalk/at_control.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_proto.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctputil.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timewait.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_output.c#11 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From scottl at FreeBSD.org Thu Oct 1 18:45:52 2009 From: scottl at FreeBSD.org (Scott Long) Date: Thu Oct 1 18:45:58 2009 Subject: PERFORCE change 169097 for review Message-ID: <200910011845.n91IjpqV053433@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169097 Change 169097 by scottl@scottl-y1 on 2009/10/01 18:45:12 Prototype work for moving the boot-time CAM scan from SI_SUB_CONF_INTR_HOOK to its own SYSINIT. Affected files ... .. //depot/projects/firewire/sys/cam/cam_xpt.c#2 edit .. //depot/projects/firewire/sys/sys/kernel.h#2 edit Differences ... ==== //depot/projects/firewire/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -107,8 +107,6 @@ TAILQ_HEAD(,cam_eb) xpt_busses; u_int bus_generation; - struct intr_config_hook *xpt_config_hook; - struct mtx xpt_topo_lock; struct mtx xpt_lock; }; @@ -910,35 +908,19 @@ xpt_free_path(path); mtx_unlock(&xsoftc.xpt_lock); - /* - * Register a callback for when interrupts are enabled. - */ - xsoftc.xpt_config_hook = - (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_CAMXPT, M_NOWAIT | M_ZERO); - if (xsoftc.xpt_config_hook == NULL) { - printf("xpt_init: Cannot malloc config hook " - "- failing attach\n"); - return (ENOMEM); - } - - xsoftc.xpt_config_hook->ich_func = xpt_config; - if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_CAMXPT); - printf("xpt_init: config_intrhook_establish failed " - "- failing attach\n"); - } - /* fire up rescan thread */ if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { printf("xpt_init: failed to create rescan thread\n"); } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, + &cambio_ih); return (0); } +SYSINIT(cam_config, SI_SUB_CONFIG_CAM, SI_ORDER_FIRST, xpt_config, NULL); + static cam_status xptregister(struct cam_periph *periph, void *arg) { @@ -4697,6 +4679,13 @@ } xpt_for_all_busses(xptconfigfunc, NULL); } + + mtx_lock(&xsoftc.xpt_lock); + while (msleep(xpt_config, &xsoftc.xpt_lock, PCONFIG, "camhk", + 30 * hz) == EWOULDBLOCK) { + printf("Warning\n"); + } + mtx_unlock(&xsoftc.xpt_lock); } /* @@ -4727,6 +4716,7 @@ struct periph_driver **p_drv; int i; + mtx_lock(&xsoftc.xpt_lock); if (busses_to_config == 0) { /* Register all the peripheral drivers */ /* XXX This will have to change when we have loadable modules */ @@ -4743,12 +4733,11 @@ xpt_for_all_devices(xptpassannouncefunc, NULL); /* Release our hook so that the boot can continue. */ - config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_CAMXPT); - xsoftc.xpt_config_hook = NULL; + wakeup(xpt_config); } free(context, M_CAMXPT); + mtx_unlock(&xsoftc.xpt_lock); } static void ==== //depot/projects/firewire/sys/sys/kernel.h#2 (text+ko) ==== @@ -154,6 +154,7 @@ SI_SUB_KPROF = 0x9000000, /* kernel profiling*/ SI_SUB_KICK_SCHEDULER = 0xa000000, /* start the timeout events*/ SI_SUB_INT_CONFIG_HOOKS = 0xa800000, /* Interrupts enabled config */ + SI_SUB_CONFIG_CAM = 0xa900000, /* Interrupts enabled config */ SI_SUB_ROOT_CONF = 0xb000000, /* Find root devices */ SI_SUB_DUMP_CONF = 0xb200000, /* Find dump devices */ SI_SUB_RAID = 0xb380000, /* Configure GEOM classes */ From jhb at FreeBSD.org Thu Oct 1 19:32:45 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Thu Oct 1 19:32:53 2009 Subject: PERFORCE change 169100 for review Message-ID: <200910011932.n91JWhJl057713@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169100 Change 169100 by jhb@jhb_jhbbsd on 2009/10/01 19:32:01 IFC @169099 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#10 integrate .. //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/smpng/share/man/man9/acl.9#3 integrate .. //depot/projects/smpng/share/man/man9/fail.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/smpng/share/man/man9/vaccess.9#2 integrate .. //depot/projects/smpng/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#14 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#86 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#100 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#69 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#84 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#55 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#18 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#27 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#15 integrate .. //depot/projects/smpng/sys/arm/include/md_var.h#6 integrate .. //depot/projects/smpng/sys/arm/include/param.h#14 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#65 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/pxe.c#7 integrate .. //depot/projects/smpng/sys/boot/pc98/Makefile.inc#7 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#18 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#34 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#62 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#29 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#8 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#60 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#59 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#59 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#60 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#63 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#66 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/smpng/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/smpng/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/smpng/sys/conf/NOTES#178 integrate .. //depot/projects/smpng/sys/conf/files#253 integrate .. //depot/projects/smpng/sys/conf/files.amd64#69 integrate .. //depot/projects/smpng/sys/conf/files.i386#128 integrate .. //depot/projects/smpng/sys/conf/files.pc98#100 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#28 integrate .. //depot/projects/smpng/sys/conf/options#178 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/smpng/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/smpng/sys/contrib/x86emu/x86emu_util.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#43 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_aiboost.c#4 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#117 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#49 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#71 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#6 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#9 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#9 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#5 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#5 integrate .. //depot/projects/smpng/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/smpng/sys/dev/asmc/asmc.c#9 integrate .. //depot/projects/smpng/sys/dev/asmc/asmcvar.h#5 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#9 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#8 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#64 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#15 integrate .. //depot/projects/smpng/sys/dev/ciss/cissvar.h#14 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#9 integrate .. //depot/projects/smpng/sys/dev/de/if_devar.h#4 integrate .. //depot/projects/smpng/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#16 integrate .. //depot/projects/smpng/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#24 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#20 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/smpng/sys/dev/fb/s3_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#26 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#95 integrate .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#7 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#13 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#64 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#61 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#62 integrate .. //depot/projects/smpng/sys/dev/isp/isp_stds.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#15 delete .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#29 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#12 integrate .. //depot/projects/smpng/sys/dev/jme/if_jme.c#8 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#23 integrate .. //depot/projects/smpng/sys/dev/lindev/full.c#1 branch .. //depot/projects/smpng/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/smpng/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#22 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phyreg.h#8 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#21 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#11 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#6 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#34 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#19 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#113 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#21 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#33 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#31 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hda_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#40 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#27 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#17 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#73 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#23 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_io.c#5 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_share.h#5 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#18 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#145 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#54 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#18 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.h#13 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part.c#22 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#9 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#36 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#26 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#115 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#147 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#147 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#139 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#118 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#9 integrate .. //depot/projects/smpng/sys/i386/include/apm_bios.h#5 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#42 integrate .. //depot/projects/smpng/sys/i386/include/param.h#25 integrate .. //depot/projects/smpng/sys/i386/include/xen/xen-os.h#5 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#39 integrate .. //depot/projects/smpng/sys/i386/xen/locore.s#5 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#24 integrate .. //depot/projects/smpng/sys/kern/init_main.c#82 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#130 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#151 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#37 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#96 integrate .. //depot/projects/smpng/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#85 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#58 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#67 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#95 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#101 integrate .. //depot/projects/smpng/sys/kern/tty.c#98 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#133 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#122 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#64 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#172 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#100 integrate .. //depot/projects/smpng/sys/mips/include/param.h#6 integrate .. //depot/projects/smpng/sys/modules/Makefile#168 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#19 integrate .. //depot/projects/smpng/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/lindev/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfslockd/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/procfs/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#19 integrate .. //depot/projects/smpng/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/smpng/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/smpng/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/smpng/sys/net/bpf.c#91 integrate .. //depot/projects/smpng/sys/net/if.c#129 integrate .. //depot/projects/smpng/sys/net/if_llatbl.c#8 integrate .. //depot/projects/smpng/sys/net/if_var.h#71 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#8 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#77 integrate .. //depot/projects/smpng/sys/netinet/in.c#62 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#102 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#37 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#71 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#87 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#15 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#28 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#27 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#32 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#31 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#18 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#17 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#27 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#119 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#83 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#74 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#67 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#43 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#34 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#71 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#61 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#19 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#39 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#39 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#18 integrate .. //depot/projects/smpng/sys/netipsec/key.c#44 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#21 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#27 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#75 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#68 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#87 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#70 integrate .. //depot/projects/smpng/sys/pci/intpm.c#20 integrate .. //depot/projects/smpng/sys/pci/intpmreg.h#4 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#63 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#19 integrate .. //depot/projects/smpng/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#99 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#24 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#15 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#50 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/smpng/sys/sun4v/include/param.h#6 integrate .. //depot/projects/smpng/sys/sys/ata.h#32 integrate .. //depot/projects/smpng/sys/sys/bus.h#38 integrate .. //depot/projects/smpng/sys/sys/event.h#27 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#13 integrate .. //depot/projects/smpng/sys/sys/kbio.h#5 integrate .. //depot/projects/smpng/sys/sys/mman.h#13 integrate .. //depot/projects/smpng/sys/sys/param.h#157 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#18 integrate .. //depot/projects/smpng/sys/sys/smp.h#23 integrate .. //depot/projects/smpng/sys/sys/sx.h#34 integrate .. //depot/projects/smpng/sys/sys/syscall.h#94 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#94 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#99 integrate .. //depot/projects/smpng/sys/sys/systm.h#97 integrate .. //depot/projects/smpng/sys/sys/vnode.h#104 integrate .. //depot/projects/smpng/sys/teken/sequences#2 integrate .. //depot/projects/smpng/sys/teken/teken.c#2 integrate .. //depot/projects/smpng/sys/teken/teken.h#2 integrate .. //depot/projects/smpng/sys/teken/teken_demo.c#2 integrate .. //depot/projects/smpng/sys/teken/teken_scs.h#2 integrate .. //depot/projects/smpng/sys/teken/teken_stress.c#2 integrate .. //depot/projects/smpng/sys/teken/teken_subr.h#2 integrate .. //depot/projects/smpng/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_gjournal.c#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#80 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#103 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#81 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.359 2009/08/23 07:48:11 julian Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.360 2009/09/22 15:15:03 trasz Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -253,6 +253,7 @@ usbdi.9 \ utopia.9 \ vaccess.9 \ + vaccess_acl_nfs4.9 \ vaccess_acl_posix1e.9 \ vcount.9 \ vflush.9 \ ==== //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" (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/share/man/man9/VOP_ACCESS.9,v 1.26 2009/06/01 07:48:27 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.27 2009/09/22 15:15:03 trasz Exp $ .\" -.Dd June 1, 2009 +.Dd September 18, 2009 .Os .Dt VOP_ACCESS 9 .Sh NAME @@ -95,6 +95,7 @@ .El .Sh SEE ALSO .Xr vaccess 9 , +.Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , .Xr vnode 9 .Sh AUTHORS ==== //depot/projects/smpng/share/man/man9/acl.9#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/acl.9,v 1.19 2009/05/24 20:34:29 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/acl.9,v 1.20 2009/09/22 15:15:03 trasz Exp $ .\" -.Dd December 23, 1999 +.Dd September 18, 2009 .Os .Dt ACL 9 .Sh NAME @@ -207,6 +207,7 @@ .El .Sh SEE ALSO .Xr acl 3 , +.Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , .Xr VFS 9 , .Xr vnaccess 9 , ==== //depot/projects/smpng/share/man/man9/fail.9#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/fail.9,v 1.2 2009/05/28 15:02:52 zml Exp $ +.\" $FreeBSD: src/share/man/man9/fail.9,v 1.3 2009/09/18 14:05:56 brueffer Exp $ .\" .Dd May 10, 2009 .Dt FAIL 9 @@ -37,7 +37,6 @@ .Nm KFAIL_POINT_GOTO , .Nm fail_point , .Nm DEBUG_FP -. .Nd fail points .Sh SYNOPSIS .In sys/fail.h @@ -79,7 +78,7 @@ .Fn return value set in the sysctl MIB. See -.Sx SYSCTL SETTINGS +.Sx SYSCTL VARIABLES below. .Pp The remaining @@ -100,7 +99,6 @@ .Sy KFAIL_POINT_CODE(..., { error_var = RETURN_VALUE; goto label;}) .El -.Pp .Sh SYSCTL VARIABLES The .Fn KFAIL_POINT_* @@ -108,28 +106,28 @@ Many base kernel MIBs can be found in the .Sy debug.fail_point tree (referenced in code by -.Sy DEBUG_FP -). +.Sy DEBUG_FP ) . .Pp The sysctl variable may be set using the following grammar: .Pp +.Bd -literal :: ( "->" )* -.Pp + :: ( ( "%") | ( "*" ) )* [ "(" ")" ] -.Pp + :: [ "." ] | "." -.Pp + :: "off" | "return" | "sleep" | "panic" | "break" | "print" +.Ed .Pp -The -argument specifies which action to take: +The argument specifies which action to take: .Bl -tag -width ".Dv return" .It Sy off Take no action (does not trigger fail point code) @@ -158,13 +156,13 @@ but only 5 times total". .Pp The operator -> can be used to express cascading terms. -If you specify ->, it means that if doesn't -'execute', is evaluated. +If you specify ->, it means that if does not +.Ql execute , + is evaluated. For the purpose of this operator, the return() and print() operators are the only types that cascade. A return() term only cascades if the code executes, and a print() term only cascades when passed a non-zero argument. -.Pp .Sh EXAMPLES .Bl -tag .It Sy sysctl debug.fail_point.foobar="2.1%return(5)" @@ -175,7 +173,7 @@ 2/100ths of the time, execute .Fa code with RETURN_VALUE set to 5. -If that doesn't happen, 5% of the time execute +If that does not happen, 5% of the time execute .Fa code with RETURN_VALUE set to 22. .It Sy sysctl debug.fail_point.foobar="5*return(5)->0.1%return(22)" @@ -186,9 +184,8 @@ .It Sy sysctl debug.fail_point.foobar="1%*sleep(50)" 1/100th of the time, sleep 50ms. .El -.Pp .Sh CAVEATS -It's easy to shoot yourself in the foot by setting fail points too +It is easy to shoot yourself in the foot by setting fail points too aggressively or setting too many in combination. For example, forcing .Fn malloc @@ -201,7 +198,6 @@ .Fn fail_point_eval does not verify whether the context is appropriate for calling .Fn msleep . -.Pp .Sh AUTHORS .An -nosplit This manual page was written by ==== //depot/projects/smpng/share/man/man9/ieee80211.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.5 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.6 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt NET80211 9 @@ -225,7 +225,7 @@ structure. This method cannot sleep. The default method allocates zero'd memory using -.Xr malloc 9. +.Xr malloc 9 . Drivers should override this method to allocate extended storage for their own needs. Memory allocated by the driver must be tagged with @@ -301,7 +301,7 @@ and must initiate the work to scan a channel and schedule a timer to advance to the next channel in the scan list. This callback is done in a sleepable context. -The default method handles active scan work (e.g. sending ProbRequest +The default method handles active scan work (e.g. sending ProbeRequest frames), and schedules a call to .Xr ieee80211_scan_next 9 according to the maximum dwell time for the channel. @@ -558,4 +558,4 @@ .Xr ieee80211_send_action 9 , .Xr ieee80211_radiotap_attach 9 , .Xr ifnet 9 , -.Xr malloc 9 . +.Xr malloc 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_amrr.9#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/share/man/man9/ieee80211_amrr.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_amrr.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE8021_AMRR 9 @@ -191,4 +191,4 @@ (instead or in addition). .Sh SEE ALSO .Xr ieee80211 9 , -.Xr ieee80211_output 9 , +.Xr ieee80211_output 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_beacon.9#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/share/man/man9/ieee80211_beacon.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_beacon.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_BEACON 9 @@ -112,4 +112,4 @@ about eight vaps, at which point the overhead becomes significant and the channel becomes noticeably busy anyway. .Sh SEE ALSO -.Xr ieee80211 9 . +.Xr ieee80211 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_bmiss.9#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/share/man/man9/ieee80211_bmiss.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_bmiss.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_BMISS 9 @@ -86,6 +86,6 @@ it can be used in any operating mode where beacons from a peer station are received. .Sh SEE ALSO +.Xr wpa_supplicant 8 , .Xr ieee80211 9 , -.Xr ieee80211_vap 9 , -.Xr wpa_supplicant 8 , +.Xr ieee80211_vap 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_crypto.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_crypto.9,v 1.4 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_crypto.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $ .\" $Id: ieee80211_crypto.9,v 1.3 2004/03/04 10:42:56 bruce Exp $ .\" .Dd August 4, 2009 @@ -65,10 +65,10 @@ .\" .Ft int .Fo ieee80211_crypto_newkey -.Fa "struct ieee80211vap * -.Fa "int cipher -.Fa "int flags -.Fa "struct ieee80211_key * +.Fa "struct ieee80211vap *" +.Fa "int cipher" +.Fa "int flags" +.Fa "struct ieee80211_key *" .Fc .\" .Ft int @@ -141,7 +141,7 @@ .Pp Crypto modules can notify the system of two events. When a packet replay event is recognized -.Fn ieee80111_notify_replay_failure +.Fn ieee80211_notify_replay_failure can be used to signal the event. When a .Dv TKIP @@ -256,4 +256,4 @@ .Xr ioctl 2 , .Xr wlan_ccmp 4 , .Xr wlan_tkip 4 , -.Xr wlan_wep 4 . +.Xr wlan_wep 4 ==== //depot/projects/smpng/share/man/man9/ieee80211_ddb.9#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/share/man/man9/ieee80211_ddb.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_ddb.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_DDB 9 @@ -54,7 +54,7 @@ built for embedded environments where cross-machine or post-mortem debugging facilities like .Xr kgdb 1 -infeasible. +are infeasible. .Pp The most commonly used command is .Bd -literal -offset indent @@ -69,4 +69,4 @@ data structures in the system. .Sh SEE ALSO .Xr ddb 4 , -.Xr ieee80211 9 . +.Xr ieee80211 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_input.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_input.9,v 1.4 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_input.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_INPUT 9 @@ -113,4 +113,4 @@ (with the rssi presented as a filtered average over the last ten values and the noise floor the last reported value). .Sh SEE ALSO -.Xr ieee80211 9 . +.Xr ieee80211 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_node.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.5 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.6 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_NODE 9 @@ -248,4 +248,4 @@ .Sh SEE ALSO .Xr ddb 9 .Xr ieee80211 9 , -.Xr ieee80211_proto 9 , +.Xr ieee80211_proto 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_output.9#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_output.9,v 1.4 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_output.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $ .\" $Id: ieee80211_output.9,v 1.5 2004/03/04 12:31:18 bruce Exp $ .\" .Dd August 4, 2009 @@ -47,9 +47,9 @@ .\" .Ft void .Fo ieee80211_process_callback -.Fa struct ieee80211_node * -.Fa struct mbuf * -.Fa int +.Fa "struct ieee80211_node *" +.Fa "struct mbuf *" +.Fa "int" .Fc .Sh DESCRIPTION The @@ -101,7 +101,7 @@ .Nm net80211 handles activities such as background scanning and power save mode, frames will not be sent to a driver unless it is operating on the -BSS channel will +BSS channel with .Dq full power . .Pp All frames passed to a driver for transmit hold a reference to a ==== //depot/projects/smpng/share/man/man9/ieee80211_proto.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_proto.9,v 1.4 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_proto.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_PROTO 9 @@ -119,7 +119,7 @@ .Vt ic_bsschan are guaranteed to be usable. .It Dv IEEE80211_S_CSA -Channel Switch Annoucememnt (CSA) is pending. +Channel Switch Announcement (CSA) is pending. This state is reached only from .Dv IEEE80211_S_RUN when either a CSA is received from an access point (in station mode) @@ -229,11 +229,11 @@ or, in the case of card eject or vap destroy, work will be initiated outside the driver. .Sh SEE ALSO -.Xr ioctl 2 +.Xr ioctl 2 , +.Xr wpa_supplicant 8 , .Xr ieee80211 9 , -.Xr ifnet 9 +.Xr ifnet 9 , .Xr taskqueue 9 -.Xr wpa_supplicant 8 .Sh HISTORY The state machine concept was part of the original .Nm ieee80211 ==== //depot/projects/smpng/share/man/man9/ieee80211_radiotap.9#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.6 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.7 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_RADIOTAP 9 @@ -198,11 +198,11 @@ .\"power as unitless distance from maximum power set at factory calibration. .\"0 indicates maximum transmit power. .\"Monotonically nondecreasing with lower power levels. -\.".It Dv IEEE80211_RADIOTAP_DB_TX_ATTENUATION -\."This field contains a single unsigned 16-bit value, expressing transmit -\."power as decibel distance from maximum power set at factory calibration. -\."0 indicates maximum transmit power. -\."Monotonically nondecreasing with lower power levels. +.\".It Dv IEEE80211_RADIOTAP_DB_TX_ATTENUATION +.\"This field contains a single unsigned 16-bit value, expressing transmit +.\"power as decibel distance from maximum power set at factory calibration. +.\"0 indicates maximum transmit power. +.\"Monotonically nondecreasing with lower power levels. .It Dv IEEE80211_RADIOTAP_DBM_TX_POWER Transmit power expressed as decibels from a 1mW reference. This field is a single signed 8-bit value. @@ -223,9 +223,9 @@ RF noise power at the antenna, in decibels difference from an arbitrary, fixed reference. .It Dv IEEE80211_RADIOTAP_XCHANNEL -This field containts four values: a 32-bit unsigned bitmap of +This field contains four values: a 32-bit unsigned bitmap of flags that describe the channel attributes, a 16-bit unsigned -freqeuncy in MHz (typically the channel center), an 8-bit +frequency in MHz (typically the channel center), an 8-bit unsigned IEEE channel number, and a signed 8-bit value that holds the maximum regulatory transmit power cap in .5 dBm (8 bytes total). @@ -237,10 +237,10 @@ .Dv IEEE80211_RADIOTAP_CHANNEL and is the only way to completely express all channel attributes and the -mapping between channel freqeuncy and IEEE channel number. +mapping between channel frequency and IEEE channel number. .El .Sh EXAMPLES -Radiotap receive definitions for the Intersil Prims driver: +Radiotap receive definitions for the Intersil Prism driver: .Bd -literal -offset indent #define WI_RX_RADIOTAP_PRESENT \\ ((1 << IEEE80211_RADIOTAP_TSFT) \\ @@ -298,7 +298,6 @@ .\" .Sh AUTHORS .An -nosplit -.Pp The original version of this manual page was written by .An Bruce M. Simpson Aq bms@FreeBSD.org and ==== //depot/projects/smpng/share/man/man9/ieee80211_regdomain.9#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/share/man/man9/ieee80211_regdomain.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_regdomain.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_REGDOMAIN 9 @@ -112,7 +112,7 @@ This should be done whenever the channel table contents are modified. .Pp The -.Fn ieee80211_alloc_countrie +.Fn ieee80211_alloc_countryie function allocates an information element as specified by 802.11h. Because this is expensive to generate it is cached in .Vt ic_countryie @@ -140,4 +140,4 @@ .Sh SEE ALSO .Xr regdomain 5 , .Xr ifconfig 8 , -.Xr ieee80211 9 . +.Xr ieee80211 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_scan.9#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/share/man/man9/ieee80211_scan.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_scan.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE80211_SCAN 9 @@ -347,4 +347,4 @@ .Sh SEE ALSO .Xr ioctl 2 , .Xr ieee80211 9 . -.Xr ieee80211_proto 9 . +.Xr ieee80211_proto 9 ==== //depot/projects/smpng/share/man/man9/ieee80211_vap.9#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/share/man/man9/ieee80211_vap.9,v 1.1 2009/08/12 21:03:16 sam Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_vap.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $ .\" .Dd August 4, 2009 .Dt IEEE8021_VAP 9 @@ -151,4 +151,4 @@ .Sh SEE ALSO .Xr ieee80211 9 , .Xr ifnet 9 , -.Xr malloc 9 . +.Xr malloc 9 ==== //depot/projects/smpng/share/man/man9/vaccess.9#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From rwatson at FreeBSD.org Thu Oct 1 19:42:56 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Thu Oct 1 19:43:04 2009 Subject: PERFORCE change 169101 for review Message-ID: <200910011942.n91JgtKG058512@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169101 Change 169101 by rwatson@rwatson_freebsd_capabilities on 2009/10/01 19:42:15 Regenerate generated syscall files following integ. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_syscall.h#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysent.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscall.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscallnames.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_sysent.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_syscall.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_sysent.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_syscall.h#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysent.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#40 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#40 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#39 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#40 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#40 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#40 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.108 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.106 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.97 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp */ const char *freebsd32_syscallnames[] = { @@ -521,12 +521,12 @@ "freebsd32_msgctl", /* 511 = freebsd32_msgctl */ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */ "lpathconf", /* 513 = lpathconf */ - "#514", /* 514 = cap_new */ - "#515", /* 515 = cap_getrights */ - "#516", /* 516 = cap_enter */ - "#517", /* 517 = cap_getmode */ - "#518", /* 518 = pdfork */ - "#519", /* 519 = pdkill */ - "#520", /* 520 = pdgetpid */ - "#521", /* 521 = pdwait */ + "cap_new", /* 514 = cap_new */ + "cap_getrights", /* 515 = cap_getrights */ + "cap_enter", /* 516 = cap_enter */ + "cap_getmode", /* 517 = cap_getmode */ + "pdfork", /* 518 = pdfork */ + "pdkill", /* 519 = pdkill */ + "pdgetpid", /* 520 = pdgetpid */ + "pdwait", /* 521 = pdwait */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.108 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp */ #include "opt_compat.h" @@ -558,12 +558,12 @@ { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 511 = freebsd32_msgctl */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 512 = freebsd32_shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ + { AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, 0 }, /* 514 = cap_new */ + { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, 0 }, /* 516 = cap_enter */ + { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ + { AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ + { AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ + { AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ + { AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.30 2009/09/10 13:20:27 des Exp $ - * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscall.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscallnames.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_sysent.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.33 2009/09/10 13:20:27 des Exp $ - * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 191919 2009-05-08 20:06:37Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.29 2009/05/08 20:06:37 ed Exp */ #ifndef _IBCS2_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_syscall.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_sysent.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.101 2009/09/10 13:20:27 des Exp $ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.94 2008/11/09 10:45:13 ed Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_syscall.h#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysent.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#40 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.254 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp */ #include "opt_compat.h" @@ -35,12 +35,12 @@ /* The casts are bogus but will do for now. */ struct sysent sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED }, /* 1 = exit */ + { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED }, /* 2 = fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 4 = write */ { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED }, /* 6 = close */ { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = wait4 */ { compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = old creat */ { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = link */ @@ -51,199 +51,199 @@ { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = mknod */ { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = chmod */ { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0, 0 }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 17 = break */ { compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0 }, /* 18 = freebsd4 getfsstat */ - { compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, 0 }, /* 19 = old lseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, 0 }, /* 20 = getpid */ + { compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 19 = old lseek */ + { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED }, /* 20 = getpid */ { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = mount */ { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, 0 }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, 0 }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, 0 }, /* 25 = geteuid */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, SYF_CAPENABLED }, /* 23 = setuid */ + { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, SYF_CAPENABLED }, /* 24 = getuid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, SYF_CAPENABLED }, /* 25 = geteuid */ { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = ptrace */ - { AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, 0 }, /* 27 = recvmsg */ - { AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, 0 }, /* 28 = sendmsg */ - { AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, 0 }, /* 29 = recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, 0 }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, 0 }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, 0 }, /* 32 = getsockname */ + { AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 27 = recvmsg */ + { AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 28 = sendmsg */ + { AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 29 = recvfrom */ + { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 30 = accept */ + { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 31 = getpeername */ + { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 32 = getsockname */ { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = access */ { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0, 0 }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, 0 }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 }, /* 36 = sync */ + { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, SYF_CAPENABLED }, /* 35 = fchflags */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 36 = sync */ { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = kill */ { compat(AS(ostat_args),stat), AUE_STAT, NULL, 0, 0, 0 }, /* 38 = old stat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, 0 }, /* 39 = getppid */ + { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, SYF_CAPENABLED }, /* 39 = getppid */ { compat(AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0 }, /* 40 = old lstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, 0 }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, 0 }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, 0 }, /* 44 = profil */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, SYF_CAPENABLED }, /* 41 = dup */ + { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED }, /* 42 = pipe */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, SYF_CAPENABLED }, /* 43 = getegid */ + { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 44 = profil */ { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0, 0 }, /* 45 = ktrace */ - { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0 }, /* 46 = old sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, 0 }, /* 47 = getgid */ - { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 48 = old sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, 0 }, /* 49 = getlogin */ + { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 46 = old sigaction */ + { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 47 = getgid */ + { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 48 = old sigprocmask */ + { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED }, /* 49 = getlogin */ { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0, 0 }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ - { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, 0 }, /* 52 = old sigpending */ - { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, 0 }, /* 53 = sigaltstack */ + { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ + { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 58 = readlink */ { AS(execve_args), (sy_call_t *)execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 59 = execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 }, /* 60 = umask */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 60 = umask */ { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ - { compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, 0 }, /* 62 = old fstat */ + { compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED }, /* 62 = old fstat */ { compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0 }, /* 63 = old getkerninfo */ - { compat(0,getpagesize), AUE_NULL, NULL, 0, 0, 0 }, /* 64 = old getpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 65 = msync */ + { compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 64 = old getpagesize */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 65 = msync */ { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, 0 }, /* 66 = vfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, 0 }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, 0 }, /* 70 = sstk */ - { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, 0 }, /* 71 = old mmap */ + { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED }, /* 69 = sbrk */ + { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED }, /* 70 = sstk */ + { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 71 = old mmap */ { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0 }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, 0 }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, 0 }, /* 75 = madvise */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 73 = munmap */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED }, /* 74 = mprotect */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, SYF_CAPENABLED }, /* 75 = madvise */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 76 = obsolete vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, 0 }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 79 = getgroups */ + { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, SYF_CAPENABLED }, /* 78 = mincore */ + { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, SYF_CAPENABLED }, /* 79 = getgroups */ { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 }, /* 81 = getpgrp */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED }, /* 81 = getpgrp */ { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 82 = setpgid */ - { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, 0 }, /* 83 = setitimer */ + { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 83 = setitimer */ { compat(0,wait), AUE_WAIT4, NULL, 0, 0, 0 }, /* 84 = old wait */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 85 = swapon */ - { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, 0 }, /* 86 = getitimer */ - { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 87 = old gethostname */ + { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 86 = getitimer */ + { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 87 = old gethostname */ { compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 88 = old sethostname */ { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, 0 }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 }, /* 90 = dup2 */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, 0 }, /* 92 = fcntl */ - { AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, 0 }, /* 93 = select */ + { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, SYF_CAPENABLED }, /* 92 = fcntl */ + { AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED }, /* 93 = select */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, 0 }, /* 97 = socket */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 95 = fsync */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 96 = setpriority */ + { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, SYF_CAPENABLED }, /* 97 = socket */ { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, 0 }, /* 98 = connect */ - { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, 0 }, /* 99 = old accept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 }, /* 100 = getpriority */ - { compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, 0 }, /* 101 = old send */ - { compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, 0 }, /* 102 = old recv */ - { compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 103 = old sigreturn */ + { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 99 = old accept */ + { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 100 = getpriority */ + { compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, SYF_CAPENABLED }, /* 101 = old send */ + { compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, SYF_CAPENABLED }, /* 102 = old recv */ + { compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 103 = old sigreturn */ { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0, 0 }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, 0 }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, 0 }, /* 106 = listen */ + { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED }, /* 105 = setsockopt */ + { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, SYF_CAPENABLED }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 107 = obsolete vtimes */ - { compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, 0 }, /* 108 = old sigvec */ - { compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, 0 }, /* 109 = old sigblock */ - { compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, 0 }, /* 110 = old sigsetmask */ - { compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, 0 }, /* 111 = old sigsuspend */ - { compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, 0 }, /* 112 = old sigstack */ - { compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, 0 }, /* 113 = old recvmsg */ - { compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, 0 }, /* 114 = old sendmsg */ + { compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 108 = old sigvec */ + { compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 109 = old sigblock */ + { compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 110 = old sigsetmask */ + { compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 111 = old sigsuspend */ + { compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 112 = old sigstack */ + { compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 113 = old recvmsg */ + { compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 114 = old sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 115 = obsolete vtrace */ - { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, 0 }, /* 116 = gettimeofday */ - { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 }, /* 117 = getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, 0 }, /* 118 = getsockopt */ + { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, SYF_CAPENABLED }, /* 116 = gettimeofday */ + { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, SYF_CAPENABLED }, /* 117 = getrusage */ + { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 119 = resuba */ - { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, 0 }, /* 120 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, 0 }, /* 121 = writev */ + { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, SYF_CAPENABLED }, /* 120 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, SYF_CAPENABLED }, /* 121 = writev */ { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 122 = settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 }, /* 124 = fchmod */ - { compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, 0 }, /* 125 = old recvfrom */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, 0 }, /* 126 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, 0 }, /* 127 = setregid */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, SYF_CAPENABLED }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, SYF_CAPENABLED }, /* 124 = fchmod */ + { compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 125 = old recvfrom */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, SYF_CAPENABLED }, /* 126 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, SYF_CAPENABLED }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 128 = rename */ { compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 129 = old truncate */ - { compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 130 = old ftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 }, /* 131 = flock */ + { compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 130 = old ftruncate */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 131 = flock */ { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0, 0 }, /* 132 = mkfifo */ - { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, 0 }, /* 133 = sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, 0 }, /* 134 = shutdown */ - { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, 0 }, /* 135 = socketpair */ + { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, SYF_CAPENABLED }, /* 133 = sendto */ + { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, SYF_CAPENABLED }, /* 134 = shutdown */ + { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, SYF_CAPENABLED }, /* 135 = socketpair */ { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 136 = mkdir */ { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 137 = rmdir */ { AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES, NULL, 0, 0, 0 }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ { AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 140 = adjtime */ - { compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, 0 }, /* 141 = old getpeername */ - { compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 142 = old gethostid */ + { compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 141 = old getpeername */ + { compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 142 = old gethostid */ { compat(AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 143 = old sethostid */ - { compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 144 = old getrlimit */ - { compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 145 = old setrlimit */ + { compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 144 = old getrlimit */ + { compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 145 = old setrlimit */ { compat(AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0, 0 }, /* 146 = old killpg */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 }, /* 147 = setsid */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, SYF_CAPENABLED }, /* 147 = setsid */ { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 148 = quotactl */ { compat(0,quota), AUE_O_QUOTA, NULL, 0, 0, 0 }, /* 149 = old quota */ - { compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, 0 }, /* 150 = old getsockname */ + { compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 150 = old getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 151 = sem_lock */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 152 = sem_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 153 = asyncdaemon */ { AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 154 = nlm_syscall */ { AS(nfssvc_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 156 = old getdirentries */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED }, /* 156 = old getdirentries */ { compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0 }, /* 157 = freebsd4 statfs */ - { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, 0 }, /* 158 = freebsd4 fstatfs */ + { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED }, /* 158 = freebsd4 fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 159 = nosys */ { AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0, 0 }, /* 160 = lgetfh */ { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0, 0 }, /* 161 = getfh */ - { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 162 = freebsd4 getdomainname */ + { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 162 = freebsd4 getdomainname */ { compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 163 = freebsd4 setdomainname */ { compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0, 0 }, /* 164 = freebsd4 uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, 0 }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, 0 }, /* 166 = rtprio */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, SYF_CAPENABLED }, /* 165 = sysarch */ + { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED }, /* 166 = rtprio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 168 = nosys */ { AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 169 = semsys */ { AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 170 = msgsys */ { AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 171 = shmsys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 172 = nosys */ - { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, 0 }, /* 173 = freebsd6_pread */ - { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, 0 }, /* 174 = freebsd6_pwrite */ + { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED }, /* 173 = freebsd6_pread */ + { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED }, /* 174 = freebsd6_pwrite */ { AS(setfib_args), (sy_call_t *)setfib, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = setfib */ { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0 }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = sfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 178 = getdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 179 = setdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 180 = nosys */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, 0 }, /* 181 = setgid */ - { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, 0 }, /* 182 = setegid */ - { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, 0 }, /* 183 = seteuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 181 = setgid */ + { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED }, /* 182 = setegid */ + { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED }, /* 183 = seteuid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 184 = lfs_bmapv */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 185 = lfs_markv */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 186 = lfs_segclean */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 187 = lfs_segwait */ { AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0, 0 }, /* 188 = stat */ - { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 189 = fstat */ + { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED }, /* 189 = fstat */ { AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 190 = lstat */ { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0 }, /* 191 = pathconf */ - { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, 0 }, /* 192 = fpathconf */ + { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED }, /* 192 = fpathconf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 193 = nosys */ - { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 194 = getrlimit */ - { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 196 = getdirentries */ - { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 197 = freebsd6_mmap */ + { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 194 = getrlimit */ + { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 195 = setrlimit */ + { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED }, /* 196 = getdirentries */ + { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 197 = freebsd6_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 198 = __syscall */ - { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 199 = freebsd6_lseek */ + { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 199 = freebsd6_lseek */ { AS(freebsd6_truncate_args), (sy_call_t *)freebsd6_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 200 = freebsd6_truncate */ - { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 201 = freebsd6_ftruncate */ - { AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 202 = __sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, 0 }, /* 203 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, 0 }, /* 204 = munlock */ + { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 201 = freebsd6_ftruncate */ + { AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 202 = __sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 203 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 204 = munlock */ { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0, 0 }, /* 205 = undelete */ - { AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, 0 }, /* 206 = futimes */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 }, /* 207 = getpgid */ + { AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED }, /* 206 = futimes */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, SYF_CAPENABLED }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 208 = newreboot */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, 0 }, /* 209 = poll */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 209 = poll */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 210 = lkmnosys */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 211 = lkmnosys */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 212 = lkmnosys */ @@ -266,15 +266,15 @@ { 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 229 = freebsd7 shmctl */ { AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 230 = shmdt */ { AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 231 = shmget */ - { AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 232 = clock_gettime */ + { AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 232 = clock_gettime */ { AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 }, /* 233 = clock_settime */ - { AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, 0 }, /* 234 = clock_getres */ - { AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, 0 }, /* 235 = ktimer_create */ - { AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, 0 }, /* 236 = ktimer_delete */ - { AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, 0 }, /* 237 = ktimer_settime */ - { AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 238 = ktimer_gettime */ - { AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, 0 }, /* 239 = ktimer_getoverrun */ - { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 240 = nanosleep */ + { AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 234 = clock_getres */ + { AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 235 = ktimer_create */ + { AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 236 = ktimer_delete */ + { AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 237 = ktimer_settime */ + { AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 238 = ktimer_gettime */ + { AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 239 = ktimer_getoverrun */ + { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 240 = nanosleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 241 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 242 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 243 = nosys */ @@ -282,12 +282,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 245 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 246 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 247 = nosys */ - { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 248 = ntp_gettime */ + { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 248 = ntp_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = nosys */ - { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, 0 }, /* 250 = minherit */ + { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED }, /* 250 = minherit */ { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, 0 }, /* 251 = rfork */ - { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, 0 }, /* 252 = openbsd_poll */ - { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, 0 }, /* 253 = issetugid */ + { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 252 = openbsd_poll */ + { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED }, /* 253 = issetugid */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 254 = lchown */ { AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 255 = aio_read */ { AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 256 = aio_write */ @@ -306,12 +306,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 269 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 270 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0 }, /* 272 = getdents */ + { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED }, /* 272 = getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0 }, /* 274 = lchmod */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 275 = netbsd_lchown */ { AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0, 0 }, /* 276 = lutimes */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 277 = netbsd_msync */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 277 = netbsd_msync */ { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0 }, /* 278 = nstat */ { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 279 = nfstat */ { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 280 = nlstat */ @@ -323,8 +323,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 286 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 287 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 288 = nosys */ - { AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, 0 }, /* 289 = preadv */ - { AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, 0 }, /* 290 = pwritev */ + { AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, SYF_CAPENABLED }, /* 289 = preadv */ + { AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, SYF_CAPENABLED }, /* 290 = pwritev */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 291 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 292 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 293 = nosys */ @@ -344,9 +344,9 @@ { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0, 0 }, /* 307 = kldnext */ { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0, 0 }, /* 308 = kldstat */ { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0, 0 }, /* 309 = kldfirstmod */ - { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, 0 }, /* 310 = getsid */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 311 = setresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 312 = setresgid */ + { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, SYF_CAPENABLED }, /* 310 = getsid */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, SYF_CAPENABLED }, /* 311 = setresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, SYF_CAPENABLED }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 313 = obsolete signanosleep */ { AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 314 = aio_return */ { AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 315 = aio_suspend */ @@ -355,49 +355,49 @@ { AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 318 = oaio_read */ { AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 319 = oaio_write */ { AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 320 = olio_listio */ - { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, 0 }, /* 321 = yield */ + { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 321 = yield */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 322 = obsolete thr_sleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 323 = obsolete thr_wakeup */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, 0 }, /* 324 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0 }, /* 325 = munlockall */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, SYF_CAPENABLED }, /* 324 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, SYF_CAPENABLED }, /* 325 = munlockall */ { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0, 0 }, /* 326 = __getcwd */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, 0 }, /* 327 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, 0 }, /* 328 = sched_getparam */ - { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, 0 }, /* 329 = sched_setscheduler */ - { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, 0 }, /* 330 = sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, 0 }, /* 331 = sched_yield */ - { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, 0 }, /* 332 = sched_get_priority_max */ - { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, 0 }, /* 333 = sched_get_priority_min */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 327 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 328 = sched_getparam */ + { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 329 = sched_setscheduler */ + { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 330 = sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 331 = sched_yield */ + { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 332 = sched_get_priority_max */ + { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 333 = sched_get_priority_min */ { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0 }, /* 334 = sched_rr_get_interval */ - { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, 0 }, /* 335 = utrace */ - { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, 0 }, /* 336 = freebsd4 sendfile */ + { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 335 = utrace */ + { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 336 = freebsd4 sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0, 0 }, /* 337 = kldsym */ { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0, 0 }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 339 = pioctl */ - { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 340 = sigprocmask */ - { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, 0 }, /* 341 = sigsuspend */ - { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0 }, /* 342 = freebsd4 sigaction */ - { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, 0 }, /* 343 = sigpending */ - { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 344 = freebsd4 sigreturn */ - { AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, 0 }, /* 345 = sigtimedwait */ - { AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 346 = sigwaitinfo */ + { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 340 = sigprocmask */ + { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED }, /* 341 = sigsuspend */ + { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 342 = freebsd4 sigaction */ + { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 343 = sigpending */ + { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 344 = freebsd4 sigreturn */ + { AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED }, /* 345 = sigtimedwait */ + { AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 346 = sigwaitinfo */ { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0, 0 }, /* 347 = __acl_get_file */ { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0, 0 }, /* 348 = __acl_set_file */ - { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 349 = __acl_get_fd */ - { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 350 = __acl_set_fd */ + { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 349 = __acl_get_fd */ + { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 350 = __acl_set_fd */ { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0, 0 }, /* 351 = __acl_delete_file */ - { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 352 = __acl_delete_fd */ + { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 352 = __acl_delete_fd */ { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0, 0 }, /* 353 = __acl_aclcheck_file */ - { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 354 = __acl_aclcheck_fd */ + { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 354 = __acl_aclcheck_fd */ { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0 }, /* 355 = extattrctl */ { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0 }, /* 356 = extattr_set_file */ { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0 }, /* 357 = extattr_get_file */ { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0 }, /* 358 = extattr_delete_file */ { AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 359 = aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, 0 }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, 0 }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, 0 }, /* 362 = kqueue */ - { AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, 0 }, /* 363 = kevent */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, SYF_CAPENABLED }, /* 360 = getresuid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED }, /* 361 = getresgid */ + { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED }, /* 362 = kqueue */ + { AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 363 = kevent */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 364 = __cap_get_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 365 = __cap_set_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 366 = __cap_get_fd */ @@ -405,9 +405,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 370 = nosys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, 0 }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, 0 }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, 0 }, /* 373 = extattr_delete_fd */ + { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 371 = extattr_set_fd */ + { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 372 = extattr_get_fd */ + { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 373 = extattr_delete_fd */ { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0, 0 }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 375 = nfsclnt */ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, 0 }, /* 376 = eaccess */ @@ -418,20 +418,20 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 381 = kse_create */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 382 = kse_thr_interrupt */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 383 = kse_release */ - { AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0, 0 }, /* 384 = __mac_get_proc */ - { AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0, 0 }, /* 385 = __mac_set_proc */ - { AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 386 = __mac_get_fd */ + { AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 384 = __mac_get_proc */ + { AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 385 = __mac_set_proc */ + { AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 386 = __mac_get_fd */ { AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL, NULL, 0, 0, 0 }, /* 387 = __mac_get_file */ - { AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 388 = __mac_set_fd */ + { AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 388 = __mac_set_fd */ { AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL, NULL, 0, 0, 0 }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0, 0 }, /* 390 = kenv */ { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0, 0 }, /* 391 = lchflags */ - { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, 0 }, /* 392 = uuidgen */ - { AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, 0 }, /* 393 = sendfile */ + { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 392 = uuidgen */ + { AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 393 = sendfile */ { AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL, NULL, 0, 0, 0 }, /* 394 = mac_syscall */ { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0 }, /* 395 = getfsstat */ { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0 }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 397 = fstatfs */ + { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED }, /* 397 = fstatfs */ { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0 }, /* 398 = fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 399 = nosys */ { AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 400 = ksem_close */ @@ -450,13 +450,13 @@ { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0 }, /* 413 = extattr_get_link */ { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0 }, /* 414 = extattr_delete_link */ { AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL, NULL, 0, 0, 0 }, /* 415 = __mac_execve */ - { AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0, 0 }, /* 416 = sigaction */ - { AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 417 = sigreturn */ + { AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 416 = sigaction */ + { AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 417 = sigreturn */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 418 = __xstat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 419 = __xfstat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 420 = __xlstat */ - { AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0, 0 }, /* 421 = getcontext */ - { AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0, 0 }, /* 422 = setcontext */ + { AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 421 = getcontext */ + { AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 422 = setcontext */ { AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL, NULL, 0, 0, 0 }, /* 423 = swapcontext */ { AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF, NULL, 0, 0, 0 }, /* 424 = swapoff */ { AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL, NULL, 0, 0, 0 }, /* 425 = __acl_get_link */ @@ -464,59 +464,59 @@ { AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL, NULL, 0, 0, 0 }, /* 427 = __acl_delete_link */ { AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL, NULL, 0, 0, 0 }, /* 428 = __acl_aclcheck_link */ { AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0, 0 }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0, 0 }, /* 430 = thr_create */ - { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0, 0 }, /* 431 = thr_exit */ - { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0, 0 }, /* 432 = thr_self */ - { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0, 0 }, /* 433 = thr_kill */ - { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0, 0 }, /* 434 = _umtx_lock */ - { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0, 0 }, /* 435 = _umtx_unlock */ + { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 430 = thr_create */ + { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 431 = thr_exit */ + { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 432 = thr_self */ + { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 433 = thr_kill */ + { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 434 = _umtx_lock */ + { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 435 = _umtx_unlock */ { AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0, 0 }, /* 436 = jail_attach */ - { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, 0 }, /* 437 = extattr_list_fd */ + { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 437 = extattr_list_fd */ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0 }, /* 438 = extattr_list_file */ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0 }, /* 439 = extattr_list_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 440 = kse_switchin */ { AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0, 0 }, /* 442 = thr_suspend */ - { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0, 0 }, /* 443 = thr_wake */ + { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 442 = thr_suspend */ + { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 443 = thr_wake */ { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0, 0 }, /* 444 = kldunloadf */ { AS(audit_args), (sy_call_t *)audit, AUE_AUDIT, NULL, 0, 0, 0 }, /* 445 = audit */ { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 446 = auditon */ - { AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0, 0 }, /* 447 = getauid */ - { AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0, 0 }, /* 448 = setauid */ - { AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0, 0 }, /* 449 = getaudit */ - { AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0, 0 }, /* 450 = setaudit */ - { AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, 0 }, /* 451 = getaudit_addr */ - { AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, 0 }, /* 452 = setaudit_addr */ + { AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0, SYF_CAPENABLED }, /* 447 = getauid */ + { AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0, SYF_CAPENABLED }, /* 448 = setauid */ + { AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0, SYF_CAPENABLED }, /* 449 = getaudit */ + { AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0, SYF_CAPENABLED }, /* 450 = setaudit */ + { AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED }, /* 451 = getaudit_addr */ + { AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED }, /* 452 = setaudit_addr */ { AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 453 = auditctl */ - { AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0, 0 }, /* 454 = _umtx_op */ - { AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0, 0 }, /* 455 = thr_new */ - { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0, 0 }, /* 456 = sigqueue */ + { AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 454 = _umtx_op */ + { AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 455 = thr_new */ + { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 456 = sigqueue */ { AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 457 = kmq_open */ { AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 458 = kmq_setattr */ { AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 459 = kmq_timedreceive */ { AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 460 = kmq_timedsend */ { AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 461 = kmq_notify */ { AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 462 = kmq_unlink */ - { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0, 0 }, /* 463 = abort2 */ - { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0, 0 }, /* 464 = thr_set_name */ + { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 463 = abort2 */ + { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 464 = thr_set_name */ { AS(aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 465 = aio_fsync */ - { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0, 0 }, /* 466 = rtprio_thread */ + { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED }, /* 466 = rtprio_thread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 467 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 468 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 469 = __getpath_fromfd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 470 = __getpath_fromaddr */ - { AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0, 0 }, /* 471 = sctp_peeloff */ - { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0, 0 }, /* 472 = sctp_generic_sendmsg */ - { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ - { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0, 0 }, /* 474 = sctp_generic_recvmsg */ - { AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0, 0 }, /* 475 = pread */ - { AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0, 0 }, /* 476 = pwrite */ - { AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 477 = mmap */ - { AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 478 = lseek */ + { AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 471 = sctp_peeloff */ + { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 472 = sctp_generic_sendmsg */ + { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 473 = sctp_generic_sendmsg_iov */ + { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 474 = sctp_generic_recvmsg */ + { AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED }, /* 475 = pread */ + { AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED }, /* 476 = pwrite */ + { AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 477 = mmap */ + { AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 478 = lseek */ { AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 479 = truncate */ - { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 480 = ftruncate */ + { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 480 = ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0, 0 }, /* 481 = thr_kill2 */ - { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, 0 }, /* 482 = shm_open */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, SYF_CAPENABLED }, /* 482 = shm_open */ { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0, 0 }, /* 483 = shm_unlink */ { AS(cpuset_args), (sy_call_t *)cpuset, AUE_NULL, NULL, 0, 0, 0 }, /* 484 = cpuset */ { AS(cpuset_setid_args), (sy_call_t *)cpuset_setid, AUE_NULL, NULL, 0, 0, 0 }, /* 485 = cpuset_setid */ @@ -526,7 +526,7 @@ { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0, 0 }, /* 489 = faccessat */ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 491 = fchownat */ - { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, 0 }, /* 492 = fexecve */ + { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED }, /* 492 = fexecve */ { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 493 = fstatat */ { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0 }, /* 494 = futimesat */ { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0 }, /* 495 = linkat */ @@ -543,17 +543,17 @@ { AS(jail_get_args), (sy_call_t *)jail_get, AUE_NULL, NULL, 0, 0, 0 }, /* 506 = jail_get */ { AS(jail_set_args), (sy_call_t *)jail_set, AUE_NULL, NULL, 0, 0, 0 }, /* 507 = jail_set */ { AS(jail_remove_args), (sy_call_t *)jail_remove, AUE_NULL, NULL, 0, 0, 0 }, /* 508 = jail_remove */ - { AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, 0 }, /* 509 = closefrom */ + { AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 509 = closefrom */ { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 510 = __semctl */ { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 511 = msgctl */ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 512 = shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 514 = cap_new */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 515 = cap_getrights */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = cap_enter */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 517 = cap_getmode */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 518 = pdfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 519 = pdkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 520 = pdgetpid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ + { AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, SYF_CAPENABLED }, /* 514 = cap_new */ + { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, SYF_CAPENABLED }, /* 515 = cap_getrights */ + { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED }, /* 516 = cap_enter */ + { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED }, /* 517 = cap_getmode */ + { AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 518 = pdfork */ + { AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 519 = pdkill */ + { AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 520 = pdgetpid */ + { AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 }, /* 521 = pdwait */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#40 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.237 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp */ const char *syscallnames[] = { @@ -521,12 +521,12 @@ "msgctl", /* 511 = msgctl */ "shmctl", /* 512 = shmctl */ "lpathconf", /* 513 = lpathconf */ - "#514", /* 514 = cap_new */ - "#515", /* 515 = cap_getrights */ - "#516", /* 516 = cap_enter */ - "#517", /* 517 = cap_getmode */ - "#518", /* 518 = pdfork */ - "#519", /* 519 = pdkill */ - "#520", /* 520 = pdgetpid */ - "#521", /* 521 = pdwait */ + "cap_new", /* 514 = cap_new */ + "cap_getrights", /* 515 = cap_getrights */ + "cap_enter", /* 516 = cap_enter */ + "cap_getmode", /* 517 = cap_getmode */ + "pdfork", /* 518 = pdfork */ + "pdkill", /* 519 = pdkill */ + "pdgetpid", /* 520 = pdgetpid */ + "pdwait", /* 521 = pdwait */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#39 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#40 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.234 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp */ #define SYS_syscall 0 @@ -428,4 +428,12 @@ #define SYS_msgctl 511 #define SYS_shmctl 512 #define SYS_lpathconf 513 +#define SYS_cap_new 514 +#define SYS_cap_getrights 515 +#define SYS_cap_enter 516 +#define SYS_cap_getmode 517 +#define SYS_pdfork 518 +#define SYS_pdkill 519 +#define SYS_pdgetpid 520 +#define SYS_pdwait 521 #define SYS_MAXSYSCALL 522 ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#40 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.189 2009/09/30 08:48:59 rwatson Exp $ -# created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson +# $FreeBSD$ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp MIASM = \ syscall.o \ exit.o \ @@ -376,4 +376,12 @@ __semctl.o \ msgctl.o \ shmctl.o \ - lpathconf.o + lpathconf.o \ + cap_new.o \ + cap_getrights.o \ + cap_enter.o \ + cap_getmode.o \ + pdfork.o \ + pdkill.o \ + pdgetpid.o \ + pdwait.o ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#40 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.239 2009/09/30 08:48:59 rwatson Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1641,6 +1641,37 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From truncs at FreeBSD.org Thu Oct 1 19:49:03 2009 From: truncs at FreeBSD.org (Aditya Sarawgi) Date: Thu Oct 1 19:49:09 2009 Subject: PERFORCE change 169102 for review Message-ID: <200910011949.n91Jn2AC058920@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169102 Change 169102 by truncs@aditya on 2009/10/01 19:48:54 Remove unused file. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bitops.h#2 delete Differences ... From truncs at FreeBSD.org Thu Oct 1 20:13:29 2009 From: truncs at FreeBSD.org (Aditya Sarawgi) Date: Thu Oct 1 20:13:36 2009 Subject: PERFORCE change 169103 for review Message-ID: <200910012013.n91KDTa1061632@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169103 Change 169103 by truncs@aditya on 2009/10/01 20:13:08 Make the comment more verbose - include why these parameters were introduced in orlov block allocator. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#4 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#4 (text+ko) ==== @@ -57,15 +57,26 @@ /* * The path name on which the file system is mounted is maintained * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in - * the super block for this name. AVFPDIR is the expected number of - * files per directory. AVGDIRSIZE is obtained by multiplying AVFPDIR - * and AVFILESIZ which is assumed to be 16384. Both AVFPDIR and AVFFIZSIZ - * are taken from UFS and they are used in implementation of Orlov Block - * Allocator. + * the super block for this name. */ #define MAXMNTLEN 512 + +/* + * Grigoriy Orlov has done some extensive work to fine + * tune the layout preferences for directories within a filesystem. + * His algorithm can be tuned by adjusting the following parameters + * which tell the system the average file size and the average number + * of files per directory. These defaults are well selected for typical + * filesystems, but may need to be tuned for odd cases like filesystems + * being used for sqiud caches or news spools. + * AVFPDIR is the expected number of files per directory. AVGDIRSIZE is + * obtained by multiplying AVFPDIR and AVFILESIZ which is assumed to be + * 16384. + */ + #define AFPDIR 64 #define AVGDIRSIZE 1048576 + /* * Macros for access to superblock array structures */ From trasz at FreeBSD.org Thu Oct 1 20:30:49 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Thu Oct 1 20:31:10 2009 Subject: PERFORCE change 169104 for review Message-ID: <200910012030.n91KUmMI062884@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169104 Change 169104 by trasz@trasz_anger on 2009/10/01 20:29:49 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#43 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README.platform#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-pam.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth1.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/canohost.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/canohost.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/channels.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/config.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/config.h.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/defines.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/includes.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/jpake.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/jpake.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kex.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kex.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor_wrap.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/packet.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/packet.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/readconf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/readconf.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/roaming.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/schnorr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/servconf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/session.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-server.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_config#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_namespace.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshlogin.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/version.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/security/200.chkmounts#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/rtadvd#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/Makefile.inc#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rquotad/rquotad.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/libexec/sftp-server/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.sbin/sshd/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/lindev.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/msk.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/tuning.7#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cpufunc.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_cfgreg.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/md_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#54 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_ps.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ale/if_ale.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/de/if_de.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dpms/dpms.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_blit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lindev/full.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge_var.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hda_reg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#29 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uark.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubsa.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubser.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uchcom.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ucycom.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ufoma.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ugensa.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uipaq.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umct.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umoscom.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uplcom.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uslcom.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvscom.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_bus.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios_alloc.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_ebr.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#41 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#34 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/lindev/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfslockd/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_esp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ata.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/fcntl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/rwlock.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sx.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#37 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/sequences#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_demo.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_scs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_stress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr_compat.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/mmap/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/mmap/mmap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/nanobsd.sh#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/apm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/lp/lp.sh#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#43 (text+ko) ==== @@ -22,10 +22,61 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090926: + The rc.d/network_ipv6, IPv6 configuration script has been integrated + into rc.d/netif. The changes are the following: + + 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF + for IPv4. For aliases, $ifconfig_IF_aliasN should be used. + Note that both variables need the "inet6" keyword at the head. + + Do not set $ipv6_network_interfaces manually if you do not + understand what you are doing. It is not needed in most cases. + + $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but + they are obsolete. + + 2. $ipv6_enable is obsolete. Use $ipv6_prefer and + "inet6 accept_rtadv" keyword in ifconfig(8) instead. + + If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and + all configured interfaces have "inet6 accept_rtadv" in the + $ifconfig_IF_ipv6. These are for backward compatibility. + + 3. A new variable $ipv6_prefer has been added. If NO, IPv6 + functionality of interfaces with no corresponding + $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag, + and the default address selection policy of ip6addrctl(8) + is the IPv4-preferred one (see rc.d/ip6addrctl for more details). + Note that if you want to configure IPv6 functionality on the + disabled interfaces after boot, first you need to clear the flag by + using ifconfig(8) like: + + ifconfig em0 inet6 -ifdisabled + + If YES, the default address selection policy is set as + IPv6-preferred. + + The default value of $ipv6_prefer is NO. + + 4. If your system need to receive Router Advertisement messages, + define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8) + scripts automatically invoke rtsol(8) when the interface becomes + UP. The Router Advertisement messages are used for SLAAC + (State-Less Address AutoConfiguration). + 20090922: 802.11s D3.03 support was committed. This is incompatible with the previous code, which was based on D3.0. +20090912: + A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value + of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to + control whether accepting Router Advertisement messages or not. + Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and + a sysctl variable net.inet6.ip6.auto_linklocal is its default value. + The ifconfig(8) utility now supports these flags. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -979,4 +1030,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $ +$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 (text+ko) ==== @@ -535,7 +535,7 @@ .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ + +20090622 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 + [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] + alphabetize includes; reduces diff vs portable and style(9). + ok stevesk djm + (Id sync only; these were already in order in -portable) + +20090621 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2009/03/17 21:37:00 + [ssh.c] + pass correct argv[0] to openlog(); ok djm@ + - jmc@cvs.openbsd.org 2009/03/19 15:15:09 + [ssh.1] + for "Ciphers", just point the reader to the keyword in ssh_config(5), just + as we do for "MACs": this stops us getting out of sync when the lists + change; + fixes documentation/6102, submitted by Peter J. Philipp + alternative fix proposed by djm + ok markus + - tobias@cvs.openbsd.org 2009/03/23 08:31:19 + [ssh-agent.c] + Fixed a possible out-of-bounds memory access if the environment variable + SHELL is shorter than 3 characters. + with input by and ok dtucker + - tobias@cvs.openbsd.org 2009/03/23 19:38:04 + [ssh-agent.c] + My previous commit didn't fix the problem at all, so stick at my first + version of the fix presented to dtucker. + Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). + ok dtucker + - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 + [sftp-server.8 sshd.8 ssh-agent.1] + fix a few typographical errors found by spell(1). + ok dtucker@, jmc@ + - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 + [sshd_config.5] + fix possessive; ok djm@ + - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 + [sftp-server.c] + remove unused option character from getopt() optstring; ok markus@ + - jj@cvs.openbsd.org 2009/04/14 21:10:54 + [servconf.c] + Fixed a few the-the misspellings in comments. Skipped a bunch in + binutils,gcc and so on. ok jmc@ + - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 + [session.c] + use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; + ok djm@ markus@ + - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 + [sshd_config.5] + clarify that even internal-sftp needs /dev/log for logging to work; ok + markus@ + - jmc@cvs.openbsd.org 2009/04/18 18:39:10 + [sshd_config.5] + tweak previous; ok stevesk + - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 + [sshd_config.5] + clarify we cd to user's home after chroot; ok markus@ on + earlier version; tweaks and ok jmc@ + - andreas@cvs.openbsd.org 2009/05/25 06:48:01 + [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c + monitor.c] + Put the globals in packet.c into a struct and don't access it directly + from other files. No functional changes. + ok markus@ djm@ + - andreas@cvs.openbsd.org 2009/05/27 06:31:25 + [canohost.h canohost.c] + Add clear_cached_addr(), needed for upcoming changes allowing the peer + address to change. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:33:39 + [clientloop.c] + Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger + change from Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:34:36 + [kex.c kex.h] + Move the KEX_COOKIE_LEN define to kex.h + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:36:07 + [packet.h packet.c] + Add packet_put_int64() and packet_get_int64(), part of a larger change + from Martin Forssen. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:38:16 + [sshconnect.h sshconnect.c] + Un-static ssh_exchange_identification(), part of a larger change from + Martin Forssen and needed for upcoming changes. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c Added roaming.h roaming_common.c roaming_dummy.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ + Also, applied appropriate changes to Makefile.in + - andreas@cvs.openbsd.org 2009/06/12 20:43:22 + [monitor.c packet.c] + Fix warnings found by chl@ and djm@ and change roaming_atomicio's + return type to match atomicio's + Diff from djm@, ok markus@ + - andreas@cvs.openbsd.org 2009/06/12 20:58:32 + [packet.c] + Move some more statics into session_state + ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 + [kexdhs.c kexgexs.c] + abort if key_sign fails, preventing possible null deref. Based on report + from Paolo Ganci, ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 + [roaming.h roaming_common.c roaming_dummy.c] + Add tags for the benefit of the sync scripts + Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. + - (dtucker) [servconf.c sshd.c] More whitespace sync. + - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include in + ifdef. + +20090616 + - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t + is a struct with a __val member. Fixes build on, eg, Redhat 6.2. + +20090504 + - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include + variable declarations. Should prevent unused warnings anywhere it's set + (only Crays as far as I can tell) and be a no-op everywhere else. + +20090318 + - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem + that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. + Based on patch from vinschen at redhat com. + +20090308 + - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c + auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} + openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old + version of Cygwin. Patch from vinschen at redhat com. + +20090307 + - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it + exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS + has a /dev/random). + - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add + EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c + to use them. Allows building with older OpenSSL versions. + - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. + - (dtucker) [configure.ac] Missing comma in type list. + - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] + EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg + in openssl 0.9.6) so add an explicit test for it. + +20090306 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2009/03/05 07:18:19 + [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] + [sshconnect2.c] + refactor the (disabled) Schnorr proof code to make it a little more + generally useful + - djm@cvs.openbsd.org 2009/03/05 11:30:50 + [uuencode.c] + document what these functions do so I don't ever have to recuse into + b64_pton/ntop to remember their return values + 20090223 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2009/02/22 23:50:57 ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README#4 (text+ko) ==== @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.2 for the release notes. +See http://www.openssh.com/txt/release-5.3 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ +$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README.platform#3 (text+ko) ==== @@ -56,6 +56,18 @@ http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ +Linux +----- + +Some Linux distributions (including Red Hat/Fedora/CentOS) include +headers and library links in the -devel RPMs rather than the main +binary RPMs. If you get an error about headers, or complaining about a +missing prerequisite then you may need to install the equivalent +development packages. On Redhat based distros these may be openssl-devel, +zlib-devel and pam-devel, on Debian based distros these may be +libssl-dev, libz-dev and libpam-dev. + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -81,4 +93,4 @@ return the output from pam_nologin to the client. -$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $ +$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-pam.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */ +/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */ #include "includes.h" #include @@ -602,16 +602,16 @@ return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); + if (sshpam_session_open) { + debug("PAM: closing session"); + pam_close_session(sshpam_handle, PAM_SILENT); + sshpam_session_open = 0; + } if (sshpam_cred_established) { debug("PAM: deleting credentials"); pam_setcred(sshpam_handle, PAM_DELETE_CRED); sshpam_cred_established = 0; } - if (sshpam_session_open) { - debug("PAM: closing session"); - pam_close_session(sshpam_handle, PAM_SILENT); - sshpam_session_open = 0; - } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-passwd.c#3 (text+ko) ==== @@ -102,7 +102,7 @@ } #endif #ifdef HAVE_CYGWIN - if (is_winnt) { + { HANDLE hToken = cygwin_logon_user(pw, password); if (hToken == INVALID_HANDLE_VALUE) ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-sia.c#3 (text+ko) ==== @@ -34,10 +34,6 @@ #include #include #include -#include -#include -#include -#include #include "ssh.h" #include "key.h" @@ -53,52 +49,6 @@ extern int saved_argc; extern char **saved_argv; -static int -sia_password_change_required(const char *user) -{ - struct es_passwd *acct; - time_t pw_life; - time_t pw_date; - - set_auth_parameters(saved_argc, saved_argv); - - if ((acct = getespwnam(user)) == NULL) { - error("Couldn't access protected database entry for %s", user); - endprpwent(); - return (0); - } - - /* If forced password change flag is set, honor it */ - if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) { - endprpwent(); - return (1); - } - - /* Obtain password lifetime; if none, it can't have expired */ - if (acct->uflg->fg_expire) - pw_life = acct->ufld->fd_expire; - else if (acct->sflg->fg_expire) - pw_life = acct->sfld->fd_expire; - else { - endprpwent(); - return (0); - } - - /* Offset from last change; if none, it must be expired */ - if (acct->uflg->fg_schange) - pw_date = acct->ufld->fd_schange + pw_life; - else { - endprpwent(); - return (1); - } - - endprpwent(); - - /* If expiration date is prior to now, change password */ - - return (pw_date <= time((time_t *) NULL)); -} - int sys_auth_passwd(Authctxt *authctxt, const char *pass) { @@ -126,9 +76,6 @@ sia_ses_release(&ent); - authctxt->force_pwchange = sia_password_change_required( - authctxt->user); - return (1); } ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth1.c#3 (text+ko) ==== @@ -318,15 +318,7 @@ } #endif /* _UNICOS */ -#ifdef HAVE_CYGWIN - if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, - authctxt->pw)) { - packet_disconnect("Authentication rejected for uid %d.", - authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); - authenticated = 0; - } -#else +#ifndef HAVE_CYGWIN /* Special handling for root */ if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(meth->name)) { ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-jpake.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" +#include "auth.h" #include "buffer.h" -#include "auth.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-kbdint.c#3 (text+ko) ==== @@ -58,10 +58,6 @@ xfree(devs); xfree(lang); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-none.c#3 (text+ko) ==== @@ -61,10 +61,6 @@ { none_enabled = 0; packet_check_eom(); -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - return (0); -#endif if (options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-passwd.c#2 (text+ko) ==== @@ -68,10 +68,6 @@ logit("password change not supported"); else if (PRIVSEP(auth_password(authctxt, password)) == 1) authenticated = 1; -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - authenticated = 0; -#endif memset(password, 0, len); xfree(password); return authenticated; ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-pubkey.c#3 (text+ko) ==== @@ -170,10 +170,6 @@ key_free(key); xfree(pkalg); xfree(pkblob); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -24,7 +24,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $"); #include #include @@ -36,8 +36,8 @@ #include #include +#include "atomicio.h" #include "xmalloc.h" -#include "atomicio.h" #include "ssh2.h" #include "packet.h" #include "log.h" ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/canohost.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,6 +35,8 @@ #include "misc.h" static void check_ip_options(int, char *); +static char *canonical_host_ip = NULL; +static int cached_port = -1; /* * Return the canonical name of the host at the other end of the socket. The >>> TRUNCATED FOR MAIL (1000 lines) <<< From trasz at FreeBSD.org Thu Oct 1 20:30:51 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Thu Oct 1 20:31:10 2009 Subject: PERFORCE change 169105 for review Message-ID: <200910012030.n91KUn7F062889@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169105 Change 169105 by trasz@trasz_anger on 2009/10/01 20:30:29 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/UPDATING#15 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/README#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/README.platform#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/canohost.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/canohost.h#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/channels.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.h#4 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.h.in#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/defines.h#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/includes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/jpake.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/jpake.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/kex.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/kex.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/packet.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/packet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/readconf.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/readconf.h#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/roaming.h#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/schnorr.h#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/servconf.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/serverloop.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/session.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh.1#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_config#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#4 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd.8#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd_config#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/version.h#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#9 integrate .. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/network.subr#6 integrate .. //depot/projects/soc2009/trasz_limits/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/netif#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/rtadvd#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libradius/radlib.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/libexec/sftp-server/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#11 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/lindev.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/msk.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/procfs.5#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man7/tuning.7#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#9 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VOP_ACCESS.9#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/acl.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/vaccess.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/asia#7 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/southamerica#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/cam_periph.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/newvers.sh#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_age.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/de/if_de.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/dpms/dpms.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/r600_blit.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/lindev/full.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/scterm-teken.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twe.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/usb_controller.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axe.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uark.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubsa.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubser.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uchcom.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ucycom.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ufoma.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ugensa.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uipaq.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umct.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umodem.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umoscom.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvscom.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios_alloc.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sx.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_default.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_export.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/lindev/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/usb/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_hwmp.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_mesh.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/ata.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/event.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/fcntl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/rwlock.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sx.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/sequences#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_demo.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_scs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_stress.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr_compat.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/00.t#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/03.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/aclfuzzer.sh#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/tools-crossfs.test#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/mmap/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/mmap/mmap.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/inet.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#8 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/apm/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/lp/lp.sh#3 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/UPDATING#15 (text+ko) ==== @@ -22,6 +22,61 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090926: + The rc.d/network_ipv6, IPv6 configuration script has been integrated + into rc.d/netif. The changes are the following: + + 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF + for IPv4. For aliases, $ifconfig_IF_aliasN should be used. + Note that both variables need the "inet6" keyword at the head. + + Do not set $ipv6_network_interfaces manually if you do not + understand what you are doing. It is not needed in most cases. + + $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but + they are obsolete. + + 2. $ipv6_enable is obsolete. Use $ipv6_prefer and + "inet6 accept_rtadv" keyword in ifconfig(8) instead. + + If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and + all configured interfaces have "inet6 accept_rtadv" in the + $ifconfig_IF_ipv6. These are for backward compatibility. + + 3. A new variable $ipv6_prefer has been added. If NO, IPv6 + functionality of interfaces with no corresponding + $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag, + and the default address selection policy of ip6addrctl(8) + is the IPv4-preferred one (see rc.d/ip6addrctl for more details). + Note that if you want to configure IPv6 functionality on the + disabled interfaces after boot, first you need to clear the flag by + using ifconfig(8) like: + + ifconfig em0 inet6 -ifdisabled + + If YES, the default address selection policy is set as + IPv6-preferred. + + The default value of $ipv6_prefer is NO. + + 4. If your system need to receive Router Advertisement messages, + define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8) + scripts automatically invoke rtsol(8) when the interface becomes + UP. The Router Advertisement messages are used for SLAAC + (State-Less Address AutoConfiguration). + +20090922: + 802.11s D3.03 support was committed. This is incompatible with the + previous code, which was based on D3.0. + +20090912: + A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value + of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to + control whether accepting Router Advertisement messages or not. + Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and + a sysctl variable net.inet6.ip6.auto_linklocal is its default value. + The ifconfig(8) utility now supports these flags. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -975,4 +1030,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ +$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $ ==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -535,7 +535,7 @@ .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ + +20090622 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 + [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] + alphabetize includes; reduces diff vs portable and style(9). + ok stevesk djm + (Id sync only; these were already in order in -portable) + +20090621 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2009/03/17 21:37:00 + [ssh.c] + pass correct argv[0] to openlog(); ok djm@ + - jmc@cvs.openbsd.org 2009/03/19 15:15:09 + [ssh.1] + for "Ciphers", just point the reader to the keyword in ssh_config(5), just + as we do for "MACs": this stops us getting out of sync when the lists + change; + fixes documentation/6102, submitted by Peter J. Philipp + alternative fix proposed by djm + ok markus + - tobias@cvs.openbsd.org 2009/03/23 08:31:19 + [ssh-agent.c] + Fixed a possible out-of-bounds memory access if the environment variable + SHELL is shorter than 3 characters. + with input by and ok dtucker + - tobias@cvs.openbsd.org 2009/03/23 19:38:04 + [ssh-agent.c] + My previous commit didn't fix the problem at all, so stick at my first + version of the fix presented to dtucker. + Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). + ok dtucker + - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 + [sftp-server.8 sshd.8 ssh-agent.1] + fix a few typographical errors found by spell(1). + ok dtucker@, jmc@ + - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 + [sshd_config.5] + fix possessive; ok djm@ + - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 + [sftp-server.c] + remove unused option character from getopt() optstring; ok markus@ + - jj@cvs.openbsd.org 2009/04/14 21:10:54 + [servconf.c] + Fixed a few the-the misspellings in comments. Skipped a bunch in + binutils,gcc and so on. ok jmc@ + - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 + [session.c] + use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; + ok djm@ markus@ + - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 + [sshd_config.5] + clarify that even internal-sftp needs /dev/log for logging to work; ok + markus@ + - jmc@cvs.openbsd.org 2009/04/18 18:39:10 + [sshd_config.5] + tweak previous; ok stevesk + - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 + [sshd_config.5] + clarify we cd to user's home after chroot; ok markus@ on + earlier version; tweaks and ok jmc@ + - andreas@cvs.openbsd.org 2009/05/25 06:48:01 + [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c + monitor.c] + Put the globals in packet.c into a struct and don't access it directly + from other files. No functional changes. + ok markus@ djm@ + - andreas@cvs.openbsd.org 2009/05/27 06:31:25 + [canohost.h canohost.c] + Add clear_cached_addr(), needed for upcoming changes allowing the peer + address to change. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:33:39 + [clientloop.c] + Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger + change from Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:34:36 + [kex.c kex.h] + Move the KEX_COOKIE_LEN define to kex.h + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:36:07 + [packet.h packet.c] + Add packet_put_int64() and packet_get_int64(), part of a larger change + from Martin Forssen. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:38:16 + [sshconnect.h sshconnect.c] + Un-static ssh_exchange_identification(), part of a larger change from + Martin Forssen and needed for upcoming changes. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c Added roaming.h roaming_common.c roaming_dummy.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ + Also, applied appropriate changes to Makefile.in + - andreas@cvs.openbsd.org 2009/06/12 20:43:22 + [monitor.c packet.c] + Fix warnings found by chl@ and djm@ and change roaming_atomicio's + return type to match atomicio's + Diff from djm@, ok markus@ + - andreas@cvs.openbsd.org 2009/06/12 20:58:32 + [packet.c] + Move some more statics into session_state + ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 + [kexdhs.c kexgexs.c] + abort if key_sign fails, preventing possible null deref. Based on report + from Paolo Ganci, ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 + [roaming.h roaming_common.c roaming_dummy.c] + Add tags for the benefit of the sync scripts + Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. + - (dtucker) [servconf.c sshd.c] More whitespace sync. + - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include in + ifdef. + +20090616 + - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t + is a struct with a __val member. Fixes build on, eg, Redhat 6.2. + +20090504 + - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include + variable declarations. Should prevent unused warnings anywhere it's set + (only Crays as far as I can tell) and be a no-op everywhere else. + +20090318 + - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem + that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. + Based on patch from vinschen at redhat com. + +20090308 + - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c + auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} + openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old + version of Cygwin. Patch from vinschen at redhat com. + +20090307 + - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it + exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS + has a /dev/random). + - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add + EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c + to use them. Allows building with older OpenSSL versions. + - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. + - (dtucker) [configure.ac] Missing comma in type list. + - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] + EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg + in openssl 0.9.6) so add an explicit test for it. + +20090306 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2009/03/05 07:18:19 + [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] + [sshconnect2.c] + refactor the (disabled) Schnorr proof code to make it a little more + generally useful + - djm@cvs.openbsd.org 2009/03/05 11:30:50 + [uuencode.c] + document what these functions do so I don't ever have to recuse into + b64_pton/ntop to remember their return values + 20090223 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2009/02/22 23:50:57 ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/README#3 (text+ko) ==== @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.2 for the release notes. +See http://www.openssh.com/txt/release-5.3 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ +$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $ ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/README.platform#2 (text+ko) ==== @@ -56,6 +56,18 @@ http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ +Linux +----- + +Some Linux distributions (including Red Hat/Fedora/CentOS) include +headers and library links in the -devel RPMs rather than the main +binary RPMs. If you get an error about headers, or complaining about a +missing prerequisite then you may need to install the equivalent +development packages. On Redhat based distros these may be openssl-devel, +zlib-devel and pam-devel, on Debian based distros these may be +libssl-dev, libz-dev and libpam-dev. + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -81,4 +93,4 @@ return the output from pam_nologin to the client. -$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $ +$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $ ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-pam.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */ +/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */ #include "includes.h" #include @@ -602,16 +602,16 @@ return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); + if (sshpam_session_open) { + debug("PAM: closing session"); + pam_close_session(sshpam_handle, PAM_SILENT); + sshpam_session_open = 0; + } if (sshpam_cred_established) { debug("PAM: deleting credentials"); pam_setcred(sshpam_handle, PAM_DELETE_CRED); sshpam_cred_established = 0; } - if (sshpam_session_open) { - debug("PAM: closing session"); - pam_close_session(sshpam_handle, PAM_SILENT); - sshpam_session_open = 0; - } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-passwd.c#2 (text+ko) ==== @@ -102,7 +102,7 @@ } #endif #ifdef HAVE_CYGWIN - if (is_winnt) { + { HANDLE hToken = cygwin_logon_user(pw, password); if (hToken == INVALID_HANDLE_VALUE) ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-sia.c#2 (text+ko) ==== @@ -34,10 +34,6 @@ #include #include #include -#include -#include -#include -#include #include "ssh.h" #include "key.h" @@ -53,52 +49,6 @@ extern int saved_argc; extern char **saved_argv; -static int -sia_password_change_required(const char *user) -{ - struct es_passwd *acct; - time_t pw_life; - time_t pw_date; - - set_auth_parameters(saved_argc, saved_argv); - - if ((acct = getespwnam(user)) == NULL) { - error("Couldn't access protected database entry for %s", user); - endprpwent(); - return (0); - } - - /* If forced password change flag is set, honor it */ - if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) { - endprpwent(); - return (1); - } - - /* Obtain password lifetime; if none, it can't have expired */ - if (acct->uflg->fg_expire) - pw_life = acct->ufld->fd_expire; - else if (acct->sflg->fg_expire) - pw_life = acct->sfld->fd_expire; - else { - endprpwent(); - return (0); - } - - /* Offset from last change; if none, it must be expired */ - if (acct->uflg->fg_schange) - pw_date = acct->ufld->fd_schange + pw_life; - else { - endprpwent(); - return (1); - } - - endprpwent(); - - /* If expiration date is prior to now, change password */ - - return (pw_date <= time((time_t *) NULL)); -} - int sys_auth_passwd(Authctxt *authctxt, const char *pass) { @@ -126,9 +76,6 @@ sia_ses_release(&ent); - authctxt->force_pwchange = sia_password_change_required( - authctxt->user); - return (1); } ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth1.c#2 (text+ko) ==== @@ -318,15 +318,7 @@ } #endif /* _UNICOS */ -#ifdef HAVE_CYGWIN - if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, - authctxt->pw)) { - packet_disconnect("Authentication rejected for uid %d.", - authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); - authenticated = 0; - } -#else +#ifndef HAVE_CYGWIN /* Special handling for root */ if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(meth->name)) { ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-jpake.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" +#include "auth.h" #include "buffer.h" -#include "auth.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-kbdint.c#2 (text+ko) ==== @@ -58,10 +58,6 @@ xfree(devs); xfree(lang); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-none.c#2 (text+ko) ==== @@ -61,10 +61,6 @@ { none_enabled = 0; packet_check_eom(); -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - return (0); -#endif if (options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-passwd.c#2 (text+ko) ==== @@ -68,10 +68,6 @@ logit("password change not supported"); else if (PRIVSEP(auth_password(authctxt, password)) == 1) authenticated = 1; -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - authenticated = 0; -#endif memset(password, 0, len); xfree(password); return authenticated; ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-pubkey.c#2 (text+ko) ==== @@ -170,10 +170,6 @@ key_free(key); xfree(pkalg); xfree(pkblob); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From gk at FreeBSD.org Thu Oct 1 20:30:52 2009 From: gk at FreeBSD.org (Gleb Kurtsou) Date: Thu Oct 1 20:31:10 2009 Subject: PERFORCE change 169106 for review Message-ID: <200910012030.n91KUofl062894@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169106 Change 169106 by gk@gk_h1 on 2009/10/01 20:30:32 remove pefs_bypass add pefs_accessx pefs_rename: vput vnode after VOP_LOOKUP VOP_RENAME is expected to vrele vnodes in error case whitespace Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#5 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#10 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#6 edit .. //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.c#3 edit .. //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.h#2 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#13 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#13 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_hmac.c#3 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#13 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#19 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_xbase64.c#6 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -MOUNT= ${.CURDIR}/../mount +MOUNT= ${.CURDIR}/../mount SYS= ${.CURDIR}/../../sys .PATH: ${MOUNT} ${SYS}/geom/eli ${SYS}/crypto/sha2 ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#10 (text+ko) ==== @@ -370,7 +370,7 @@ warn("cannot open %s", argv[0]); return (EX_IOERR); } - + if (ioctl(fd, PEFS_SETKEY, &k) == -1) { warn("cannot set key"); error = EX_OSERR; @@ -463,7 +463,7 @@ } argc -= optind; argv += optind; - + if (!checkargs_fs(argc, argv)) { pefs_usage(); } @@ -805,7 +805,7 @@ pefs_keyid_as_int(k[1].pxk_keyid)); } } - + close(fd); return (0); @@ -882,7 +882,7 @@ return (cmd->func(argc, argv)); } } - + warnx("unknown command: %s", argv[1]); pefs_usage(); ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#6 (text+ko) ==== @@ -112,11 +112,11 @@ } if (db_data.size != sizeof(struct pefs_xkeyenc)) errx(EX_DATAERR, "keychain: db damaged"); - + kc = calloc(1, sizeof(struct pefs_keychain)); if (kc == NULL) err(EX_OSERR, "calloc"); - + memcpy(&ke, db_data.data, sizeof(struct pefs_xkeyenc)); error = pefs_key_decrypt(&ke, &kc_parent->kc_key); if (error) @@ -164,7 +164,7 @@ err(EX_OSERR, "calloc"); kc->kc_key = *xk; TAILQ_INSERT_HEAD(kch, kc, kc_entry); - + if (flags == 0) return (0); @@ -205,7 +205,7 @@ ke.keybits = htole32(xk->pxk_keybits); if (pefs_key_encrypt(&ke, xk) != 0) return (-1); - + db = keychain_dbopen(filesystem, PEFS_KEYCHAIN_USE, O_RDWR | O_CREAT); if (db == NULL) return (-1); ==== //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ static const char sigma[16] = "expand 32-byte k"; static const char tau[16] = "expand 16-byte k"; -void +void salsa20_keysetup(salsa20_ctx *x, const uint8_t *k, uint32_t kbits) { const char *constants; @@ -48,7 +48,7 @@ x->input[15] = U8TO32_LITTLE(constants + 12); } -void +void salsa20_ivsetup(salsa20_ctx *x, const uint8_t *iv, uint64_t offset) { x->skip = offset & ((1 << 6) - 1); @@ -60,10 +60,10 @@ x->input[9] = htole32((uint32_t) offset); } -void +void salsa20_crypt(salsa20_ctx *x, const uint8_t *m, uint8_t *c, uint32_t bytes) { - uint32_t x0, x1, x2, x3, x4, x5, x6, x7, + uint32_t x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15; uint8_t *ctarget = NULL; const uint8_t *msrc = NULL; ==== //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * salsa20-merged.c version 20051118 + * salsa20-merged.c version 20051118 * D. J. Bernstein * Public domain. */ ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#13 (text+ko) ==== @@ -171,7 +171,7 @@ void pefs_crypto_init(void); void pefs_crypto_uninit(void); -int pefs_node_get_nokey(struct mount *mp, struct vnode *lvp, +int pefs_node_get_nokey(struct mount *mp, struct vnode *lvp, struct vnode **vpp); int pefs_node_get_haskey(struct mount *mp, struct vnode *lvp, struct vnode **vpp, struct pefs_tkey *ptk); ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#13 (text+ko) ==== @@ -50,7 +50,7 @@ #define PEFS_CTR_BLOCK_SIZE 16 #define PEFS_NAME_BLOCK_SIZE 16 -#define PEFS_BLOCK_ROUND(block, a) (((a) + (block) - 1) & ~((block) - 1)) +#define PEFS_BLOCK_ROUND(block, a) (((a) + (block) - 1) & ~((block) - 1)) CTASSERT(PEFS_KEY_SIZE <= SHA512_DIGEST_LENGTH); CTASSERT(PEFS_TWEAK_SIZE == 64/8); @@ -98,23 +98,23 @@ static algop_keysetup_t pefs_camellia_keysetup; static algop_crypt_t pefs_camellia_crypt; -static const struct pefs_alg pefs_alg_salsa20 = { +static const struct pefs_alg pefs_alg_salsa20 = { PEFS_ALG_SALSA20, - pefs_salsa20_keysetup, + pefs_salsa20_keysetup, pefs_salsa20_ivsetup, pefs_salsa20_crypt }; -static const struct pefs_alg pefs_alg_aes = { +static const struct pefs_alg pefs_alg_aes = { PEFS_ALG_AES_CTR, - pefs_aes_keysetup, + pefs_aes_keysetup, pefs_ctr_ivsetup, pefs_aes_crypt }; -static const struct pefs_alg pefs_alg_camellia = { +static const struct pefs_alg pefs_alg_camellia = { PEFS_ALG_CAMELLIA_CTR, - pefs_camellia_keysetup, + pefs_camellia_keysetup, pefs_ctr_ivsetup, pefs_camellia_crypt }; @@ -143,9 +143,9 @@ void pefs_crypto_init(void) { - pefs_ctx_zone = uma_zcreate("pefs_ctx", sizeof(struct pefs_ctx), + pefs_ctx_zone = uma_zcreate("pefs_ctx", sizeof(struct pefs_ctx), NULL, NULL, NULL, (uma_fini)bzero, UMA_ALIGN_PTR, 0); - pefs_key_zone = uma_zcreate("pefs_key", sizeof(struct pefs_key), + pefs_key_zone = uma_zcreate("pefs_key", sizeof(struct pefs_key), NULL, NULL, NULL, (uma_fini)bzero, UMA_ALIGN_PTR, 0); } @@ -447,7 +447,7 @@ MPASS(size > PEFS_NAME_CSUM_SIZE && size <= MAXNAMLEN); psize = size - PEFS_NAME_CSUM_SIZE; - psize = PEFS_NAME_CSUM_SIZE + + psize = PEFS_NAME_CSUM_SIZE + PEFS_BLOCK_ROUND(PEFS_NAME_BLOCK_SIZE, psize); return (psize); @@ -479,7 +479,7 @@ MPASS(size > PEFS_NAME_CSUM_SIZE && size <= MAXNAMLEN && (size - PEFS_NAME_CSUM_SIZE) % PEFS_NAME_BLOCK_SIZE == 0); - + pefs_ctx_cpy(ctx, pk->pk_name_csum_ctx); csum_int = vmac(name + PEFS_NAME_CSUM_SIZE, size - PEFS_NAME_CSUM_SIZE, @@ -710,13 +710,13 @@ pos = c->pctr_pos; while (len) { - l = pos + len > PEFS_CTR_BLOCK_SIZE ? + l = pos + len > PEFS_CTR_BLOCK_SIZE ? PEFS_CTR_BLOCK_SIZE - pos : len; le_offset = htole64(c->pctr_offset); - memcpy(c->pctr_block + PEFS_TWEAK_SIZE, &le_offset, + memcpy(c->pctr_block + PEFS_TWEAK_SIZE, &le_offset, sizeof(uint64_t)); memcpy(c->pctr_block, c->pctr_tweak, PEFS_TWEAK_SIZE); - + cryptblock(ctx, c->pctr_block); for (i = 0; i < l; i++) { *(ciphertext++) = c->pctr_block[pos + i] ^ @@ -744,10 +744,10 @@ } static void -pefs_camellia_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext, +pefs_camellia_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext, uint8_t *ciphertext, uint32_t len) { - pefs_ctr_crypt(ctx, pefs_camellia_cryptblock, + pefs_ctr_crypt(ctx, pefs_camellia_cryptblock, plaintext, ciphertext, len); } @@ -764,10 +764,10 @@ } static void -pefs_aes_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext, +pefs_aes_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext, uint8_t *ciphertext, uint32_t len) { - pefs_ctr_crypt(ctx, pefs_aes_cryptblock, + pefs_ctr_crypt(ctx, pefs_aes_cryptblock, plaintext, ciphertext, len); } ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_hmac.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ else if (hkeylen <= SHA512_BLOCK_LENGTH) bcopy(hkey, ctx->kpad, hkeylen); else { - /* + /* * If key is longer than SHA512_BLOCK_LENGTH bytes * reset it to key = SHA512(key). */ @@ -94,7 +94,7 @@ /* mdsize == 0 means "Give me the whole hash!" */ if (mdsize == 0) mdsize = SHA512_DIGEST_LENGTH; - + bcopy(digest, md, mdsize); } ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#13 (text+ko) ==== @@ -127,7 +127,7 @@ pefs_node_zone = uma_zcreate("pefs_node", sizeof(struct pefs_node), NULL, NULL, NULL, (uma_fini) bzero, UMA_ALIGN_PTR, 0); - + pefs_node_hashtbl = hashinit(NPENODECACHE, M_PEFSHASH, &pefs_node_hash); mtx_init(&pefs_node_listmtx, "pefs_node_list", NULL, MTX_DEF); pefs_crypto_init(); @@ -240,7 +240,7 @@ struct vnode *nldvp; int error, locked, dlocked; int buflen = *encname_len; - + ASSERT_VOP_LOCKED(lvp, "pefs_node_lookup_name"); locked = VOP_ISLOCKED(lvp); if (ldvp) { @@ -250,7 +250,7 @@ } else { dlocked = 0; } - + vref(lvp); VOP_UNLOCK(lvp, 0); nldvp = lvp; @@ -277,34 +277,34 @@ pefs_node_lookup_key(struct pefs_mount *pm, struct vnode *lvp, struct vnode *ldvp, struct ucred *cred, struct pefs_tkey *ptk) { - char *namebuf; + char *namebuf; char *encname; int error, encname_len, name_len; - + namebuf = malloc((MAXNAMLEN + 1)*2, M_PEFSBUF, M_WAITOK | M_ZERO); encname = namebuf + MAXNAMLEN + 1; encname_len = MAXNAMLEN + 1; - + error = pefs_node_lookup_name(lvp, ldvp, cred, encname, &encname_len); if (error) { free(namebuf, M_PEFSBUF); return (error); } - + PEFSDEBUG("pefs_node_lookup_key: encname=%.*s\n", encname_len, encname); - - name_len = pefs_name_decrypt(NULL, pefs_rootkey(pm), ptk, - encname, encname_len, + + name_len = pefs_name_decrypt(NULL, pefs_rootkey(pm), ptk, + encname, encname_len, namebuf, MAXNAMLEN + 1); if (name_len > 0) { pefs_key_ref(ptk->ptk_key); - } else { + } else { PEFSDEBUG("pefs_node_lookup_key: not found: %.*s\n", encname_len, encname); } - - free(namebuf, M_PEFSBUF); - + + free(namebuf, M_PEFSBUF); + return (error); } @@ -361,7 +361,7 @@ * the caller's "spare" reference to created pefs vnode. */ static int -pefs_node_get(struct mount *mp, struct vnode *lvp, struct vnode **vpp, +pefs_node_get(struct mount *mp, struct vnode *lvp, struct vnode **vpp, pefs_node_init_fn *init_fn, void *context) { struct pefs_node *pn; ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#19 (text+ko) ==== @@ -281,7 +281,7 @@ offset = uio->uio_offset; pefs_chunk_setsize(&pc, pc.pc_size - uio->uio_resid); - de = pefs_enccn_lookup_dirent(dpn_key, &ptk, + de = pefs_enccn_lookup_dirent(dpn_key, &ptk, pc.pc_base, pc.pc_size, cnp->cn_nameptr, cnp->cn_namelen); if (de != NULL) @@ -370,14 +370,14 @@ continue; VI_LOCK(vp); pn = VP_TO_PN(vp); - if (((pn->pn_flags & PN_HASKEY) && + if (((pn->pn_flags & PN_HASKEY) && ((flags & PEFS_FLUSHKEY_ALL) || pn->pn_tkey.ptk_key == pk)) || ((pn->pn_flags & PN_HASKEY) == 0 && pk == NULL)) { vholdl(vp); MNT_IUNLOCK(mp); error = vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE); - if (error) { + if (error != 0) { vdrop(vp); MNT_ILOCK(mp); MNT_VNODE_FOREACH_ABORT_ILOCKED(mp, mvp); @@ -398,154 +398,6 @@ return (0); } -/* - * This is the 10-Apr-92 bypass routine. - * This version has been optimized for speed, throwing away some - * safety checks. It should still always work, but it's not as - * robust to programmer errors. - * - * In general, we map all vnodes going down and unmap them on the way back. - * As an exception to this, vnodes can be marked "unmapped" by setting - * the Nth bit in operation's vdesc_flags. - * - * Also, some BSD vnode operations have the side effect of vrele'ing - * their arguments. With stacking, the reference counts are held - * by the upper node, not the lower one, so we must handle these - * side-effects here. This is not of concern in Sun-derived systems - * since there are no such side-effects. - * - * This makes the following assumptions: - * - only one returned vpp - * - no INOUT vpp's (Sun's vop_open has one of these) - * - the vnode operation vector of the first vnode should be used - * to determine what implementation of the op should be invoked - * - all mapped vnodes are of our vnode-type (NEEDSWORK: - * problems on rmdir'ing mount points and renaming?) - */ -static int -pefs_bypass(struct vop_generic_args *ap, struct pefs_tkey *ptk) -{ - struct vnode **this_vp_p; - int error; - struct vnode *old_vps[VDESC_MAX_VPS]; - struct vnode **vps_p[VDESC_MAX_VPS]; - struct vnode ***vppp; - struct vnodeop_desc *descp = ap->a_desc; - int reles, i; - - if (pefs_bug_bypass) - printf ("pefs_bypass: %s\n", descp->vdesc_name); - -#ifdef DIAGNOSTIC - /* - * We require at least one vp. - */ - if (descp->vdesc_vp_offsets == NULL || - descp->vdesc_vp_offsets[0] == VDESC_NO_OFFSET) - panic ("pefs_bypass: no vp's in map"); -#endif - - /* - * Map the vnodes going in. - * Later, we'll invoke the operation based on - * the first mapped vnode's operation vector. - */ - reles = descp->vdesc_flags; - for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) { - if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET) - break; /* bail out at end of list */ - vps_p[i] = this_vp_p = VOPARG_OFFSETTO(struct vnode**, - descp->vdesc_vp_offsets[i],ap); - /* - * We're not guaranteed that any but the first vnode - * are of our type. Check for and don't map any - * that aren't. (We must always map first vp or vclean fails.) - */ - if (i && (*this_vp_p == NULLVP || - (*this_vp_p)->v_op != &pefs_vnodeops)) { - old_vps[i] = NULLVP; - } else { - old_vps[i] = *this_vp_p; - *(vps_p[i]) = PEFS_LOWERVP(*this_vp_p); - /* - * XXX - Several operations have the side effect - * of vrele'ing their vp's. We must account for - * that. (This should go away in the future.) - */ - if (reles & VDESC_VP0_WILLRELE) - VREF(*this_vp_p); - } - - } - - /* - * Call the operation on the lower layer - * with the modified argument structure. - */ - if (vps_p[0] && *vps_p[0]) - error = VCALL(ap); - else { - printf("pefs_bypass: no map for %s\n", descp->vdesc_name); - error = EINVAL; - } - - /* - * Maintain the illusion of call-by-value - * by restoring vnodes in the argument structure - * to their original value. - */ - reles = descp->vdesc_flags; - for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) { - if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET) - break; /* bail out at end of list */ - if (old_vps[i]) { - *(vps_p[i]) = old_vps[i]; -#if 0 - if (reles & VDESC_VP0_WILLUNLOCK) - VOP_UNLOCK(*(vps_p[i]), 0); -#endif - if (reles & VDESC_VP0_WILLRELE) - vrele(*(vps_p[i])); - } - } - - /* - * Map the possible out-going vpp - * (Assumes that the lower layer always returns - * a VREF'ed vpp unless it gets an error.) - */ - if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET && - !(descp->vdesc_flags & VDESC_NOMAP_VPP) && - !error) { - /* XXX should panic here unconditionally or remove the func */ - if (ptk == NULL || ptk->ptk_key == NULL) { - panic("vop_bypass: map of outgoing vnode without encrypted name: %s", descp->vdesc_name); - } - /* - * XXX - even though some ops have vpp returned vp's, - * several ops actually vrele this before returning. - * We must avoid these ops. - * (This should go away when these ops are regularized.) - */ - if (descp->vdesc_flags & VDESC_VPP_WILLRELE) - goto out; - vppp = VOPARG_OFFSETTO(struct vnode***, - descp->vdesc_vpp_offset,ap); - if (*vppp) { - error = pefs_node_get_haskey(old_vps[0]->v_mount, - **vppp, *vppp, ptk); - } - } - - out: - return (error); -} - -/* - * We have to carry on the locking protocol on the null layer vnodes - * as we progress through the tree. We also have to enforce read-only - * if this layer is mounted read-only. - */ static int pefs_lookup(struct vop_cachedlookup_args *ap) { @@ -565,7 +417,7 @@ pefs_enccn_init(&enccn); - if ((flags & ISLASTCN) && + if ((flags & ISLASTCN) && ((dvp->v_mount->mnt_flag & MNT_RDONLY) || pefs_no_keys(dvp)) && (cnp->cn_nameiop != LOOKUP)) return (EROFS); @@ -589,7 +441,7 @@ (cnp->cn_nameiop == DELETE && (cnp->cn_flags & DOWHITEOUT) && (cnp->cn_flags & ISWHITEOUT)))) { - /* + /* * Some filesystems (like ufs) update internal inode * fields during VOP_LOOKUP which are later used by * VOP_CREATE, VOP_MKDIR, etc. That's why we can't @@ -640,13 +492,13 @@ else error = pefs_node_get_haskey(dvp->v_mount, lvp, &vp, &enccn.pec_tkey); - if (error) { + if (error != 0) { vput(lvp); } else { *ap->a_vpp = vp; if ((cnp->cn_flags & MAKEENTRY) && cnp->cn_nameiop != CREATE) { - PEFSDEBUG("pefs_lookup: cache_enter %.*s\n", + PEFSDEBUG("pefs_lookup: cache_enter %.*s\n", (int)cnp->cn_namelen,cnp->cn_nameptr); cache_enter(dvp, vp, cnp); } @@ -669,16 +521,17 @@ pefs_open(struct vop_open_args *ap) { struct vnode *vp = ap->a_vp; + struct vnode *lvp = PEFS_LOWERVP(vp); struct pefs_node *pn = VP_TO_PN(vp); int error; if (pefs_no_keys(vp) && (ap->a_mode & (FWRITE | O_APPEND))) return (EROFS); - error = pefs_bypass(&ap->a_gen, NULL); + error = VOP_OPEN(lvp, ap->a_mode, ap->a_cred, ap->a_td, ap->a_fp); if (error == 0) { if ((pn->pn_flags & PN_HASKEY) == 0) - vp->v_object = PEFS_LOWERVP(vp)->v_object; + vp->v_object = lvp->v_object; else vnode_create_vobject(vp, 0, ap->a_td); } @@ -703,7 +556,7 @@ MPASS(pn->pn_flags & PN_HASKEY); error = VOP_GETATTR(lvp, &va, cred); - if (error) + if (error != 0) return (error); osize = va.va_size; @@ -713,7 +566,7 @@ if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) { vn_lock(vp, LK_UPGRADE | LK_RETRY); error = VOP_GETATTR(lvp, &va, cred); - if (error) + if (error != 0) return (error); osize = va.va_size; if (nsize <= osize) @@ -739,9 +592,10 @@ pefs_chunk_zero(&pc); pefs_data_encrypt_update(ctx, &pn->pn_tkey, &pc); puio = pefs_chunk_uio(&pc, offset, UIO_WRITE); - PEFSDEBUG("pefs_tryextend: resizing file; filling with zeros: offset=0x%jx, resid=0x%jx\n", offset, bsize); + PEFSDEBUG("pefs_tryextend: resizing file; filling with zeros: offset=0x%jx, resid=0x%jx\n", + offset, bsize); error = VOP_WRITE(lvp, puio, 0, cred); - if (error) { + if (error != 0) { /* try to reset */ VATTR_NULL(&va); va.va_size = osize; @@ -772,20 +626,20 @@ struct vattr *vap = ap->a_vap; int error; - if ((vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL || + if ((vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL || vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL || vap->va_mode != (mode_t)VNOVAL) && (vp->v_mount->mnt_flag & MNT_RDONLY || pefs_no_keys(vp))) return (EROFS); if (vap->va_size != VNOVAL) { - switch (vp->v_type) { - case VDIR: - return (EISDIR); - case VCHR: - case VBLK: - case VSOCK: - case VFIFO: + switch (vp->v_type) { + case VDIR: + return (EISDIR); + case VCHR: + case VBLK: + case VSOCK: + case VFIFO: if (vap->va_flags != VNOVAL) return (EOPNOTSUPP); return (0); @@ -805,11 +659,11 @@ error = pefs_tryextend(vp, vap->va_size, cred); else error = EOPNOTSUPP; /* TODO */ - if (error) + if (error != 0) return (error); vnode_pager_setsize(vp, vap->va_size); break; - default: + default: return (EOPNOTSUPP); } } @@ -823,13 +677,15 @@ static int pefs_getattr(struct vop_getattr_args *ap) { + struct vnode *vp = ap->a_vp; struct vattr *vap = ap->a_vap; int error; - if ((error = pefs_bypass((struct vop_generic_args *)ap, NULL)) != 0) + error = VOP_GETATTR(PEFS_LOWERVP(vp), vap, ap->a_cred); + if (error != 0) return (error); - vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0]; + vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0]; if (vap->va_type == VLNK) { vap->va_size = PEFS_NAME_PTON_SIZE(vap->va_size); } @@ -840,11 +696,8 @@ * Handle to disallow write access if mounted read-only. */ static int -pefs_access(struct vop_access_args *ap) +pefs_access_checkmode(struct vnode *vp, accmode_t accmode) { - struct vnode *vp = ap->a_vp; - accmode_t accmode = ap->a_accmode; - /* * Disallow write attempts on read-only layers; * unless the file is a socket, fifo, or a block or @@ -855,6 +708,10 @@ case VDIR: case VLNK: case VREG: + /* + * Do not check pefs_no_keys(vp) here because ioctls + * expect filesystem to be writable right after mount + */ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); break; @@ -862,21 +719,49 @@ break; } } - return (pefs_bypass((struct vop_generic_args *)ap, NULL)); + + return (0); +} + +static int +pefs_access(struct vop_access_args *ap) +{ + struct vnode *vp = ap->a_vp; + accmode_t accmode = ap->a_accmode; + int error; + + error = pefs_access_checkmode(vp, accmode); + if (error != 0) + return (error); + error = VOP_ACCESS(PEFS_LOWERVP(vp), accmode, ap->a_cred, ap->a_td); + return (error); +} + +static int +pefs_accessx(struct vop_accessx_args *ap) +{ + struct vnode *vp = ap->a_vp; + accmode_t accmode = ap->a_accmode; + int error; + + error = pefs_access_checkmode(vp, accmode); + if (error != 0) + return (error); + error = VOP_ACCESSX(PEFS_LOWERVP(vp), accmode, ap->a_cred, ap->a_td); + return (error); } -/* - * We handle this to eliminate null FS to lower FS - * file moving. Don't know why we don't allow this, - * possibly we should. - */ static int pefs_rename(struct vop_rename_args *ap) { struct vnode *fdvp = ap->a_fdvp; + struct vnode *lfdvp = PEFS_LOWERVP(fdvp); struct vnode *fvp = ap->a_fvp; + struct vnode *lfvp = PEFS_LOWERVP(fvp); struct vnode *tdvp = ap->a_tdvp; + struct vnode *ltdvp = PEFS_LOWERVP(tdvp); struct vnode *tvp = ap->a_tvp; + struct vnode *ltvp = (tvp == NULL ? NULL : PEFS_LOWERVP(tvp)); struct vnode *tovp = NULL; struct componentname *fcnp = ap->a_fcnp; struct componentname *tcnp = ap->a_tcnp; @@ -910,9 +795,14 @@ PEFSDEBUG("pefs_rename: target dir !HASKEY: %s\n", tcnp->cn_nameptr); /* Allow unencrypted to unencrypted rename. */ - error = pefs_bypass((struct vop_generic_args *)ap, - NULL); - return (error); + vref(lfdvp); + vref(lfvp); + vref(ltdvp); + if (ltvp != NULL) + vref(ltvp); + error = VOP_RENAME(lfdvp, lfvp, fcnp, ltdvp, ltvp, + tcnp); + goto done; } /* Target directory is encrypted. Files should be recreated. */ error = EXDEV; @@ -920,12 +810,12 @@ } error = pefs_enccn_get(&fenccn, fvp, fcnp); - if (error) { + if (error != 0) { goto bad; } error = pefs_enccn_create(&tenccn, fenccn.pec_tkey.ptk_key, fenccn.pec_tkey.ptk_tweak, tcnp); - if (error) { + if (error != 0) { pefs_enccn_free(&fenccn); goto bad; } @@ -933,27 +823,31 @@ tcnp->cn_nameiop = DELETE; error = VOP_LOOKUP(tdvp, &tovp, tcnp); tcnp->cn_nameiop = RENAME; - PEFSDEBUG("pefs_rename: lookup target vnode: %s: error=%d, tovp=%p\n", tcnp->cn_nameptr, error, tovp); + PEFSDEBUG("pefs_rename: lookup target vnode: %s: error=%d, tovp=%p\n", + tcnp->cn_nameptr, error, tovp); if (error == ENOENT) error = 0; } - if (error) { + if (error != 0) { pefs_enccn_free(&fenccn); pefs_enccn_free(&tenccn); goto bad; } - ap->a_fcnp = &fenccn.pec_cn; - ap->a_tcnp = &tenccn.pec_cn; - error = pefs_bypass((struct vop_generic_args *)ap, NULL); - ap->a_fcnp = fcnp; - ap->a_tcnp = tcnp; + vref(lfdvp); + vref(lfvp); + vref(ltdvp); + if (ltvp != NULL) + vref(ltvp); + error = VOP_RENAME(lfdvp, lfvp, &fenccn.pec_cn, ltdvp, ltvp, + &tenccn.pec_cn); pefs_enccn_free(&fenccn); pefs_enccn_free(&tenccn); - if (!error) { + if (error == 0) { if (tovp != NULL) { + MPASS(tovp->v_type == VREG); vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY); tcnp->cn_nameiop = DELETE; error = VOP_REMOVE(tdvp, tovp, tcnp); @@ -964,10 +858,18 @@ cache_purge(fdvp); cache_purge(fvp); } else { - if (tovp != NULL); - VOP_UNLOCK(tovp, 0); + if (tovp != NULL) + vput(tovp); } +done: + ASSERT_VOP_UNLOCKED(tdvp, "pefs_rename"); + vrele(fdvp); + vrele(fvp); + vrele(tdvp); + if (tvp != NULL) + vrele(tvp); + return (error); bad: @@ -975,7 +877,7 @@ vrele(tdvp); else vput(tdvp); - if (tvp) + if (tvp != NULL) vput(tvp); vrele(fdvp); vrele(fvp); @@ -1264,6 +1166,7 @@ pefs_readdir(struct vop_readdir_args *ap) { struct vnode *vp = ap->a_vp; + struct vnode *lvp = PEFS_LOWERVP(vp); struct uio *uio = ap->a_uio; struct ucred *cred = ap->a_cred; int *eofflag = ap->a_eofflag; @@ -1278,8 +1181,11 @@ int *a_ncookies; u_long **a_cookies; - if (pefs_no_keys(vp)) - return (pefs_bypass((struct vop_generic_args *)ap, NULL)); + if (pefs_no_keys(vp)) { + error = VOP_READDIR(lvp, uio, cred, eofflag, ap->a_ncookies, + ap->a_cookies); + return (error); + } if (ap->a_ncookies == NULL || ap->a_cookies == NULL) { a_ncookies = NULL; @@ -1295,9 +1201,9 @@ if (uio->uio_resid < pc.pc_size) pefs_chunk_setsize(&pc, uio->uio_resid); puio = pefs_chunk_uio(&pc, uio->uio_offset, uio->uio_rw); - error = VOP_READDIR(PEFS_LOWERVP(vp), puio, cred, eofflag, + error = VOP_READDIR(lvp, puio, cred, eofflag, a_ncookies, a_cookies); - if (error) + if (error != 0) break; if (pc.pc_size == puio->uio_resid) @@ -1364,6 +1270,7 @@ pefs_mkdir(struct vop_mkdir_args *ap) { struct vnode *dvp = ap->a_dvp; + struct vnode *lvp; struct componentname *cnp = ap->a_cnp; struct pefs_enccn enccn; int error; @@ -1374,13 +1281,17 @@ pefs_enccn_init(&enccn); PEFS_ENCCN_ASSERT_NOENT(dvp, cnp); error = pefs_enccn_create_node(&enccn, dvp, cnp); - if (error) { + if (error != 0) { return (error); } - ap->a_cnp = &enccn.pec_cn; - error = pefs_bypass((struct vop_generic_args *)ap, &enccn.pec_tkey); - ap->a_cnp = cnp; + error = VOP_MKDIR(PEFS_LOWERVP(dvp), &lvp, &enccn.pec_cn, ap->a_vap); + if (error == 0 && lvp != NULL) { + error = pefs_node_get_haskey(dvp->v_mount, lvp, ap->a_vpp, + &enccn.pec_tkey); + if (error != 0) + vput(lvp); + } pefs_enccn_free(&enccn); @@ -1401,20 +1312,17 @@ return (EROFS); pefs_enccn_init(&enccn); error = pefs_enccn_get(&enccn, vp, cnp); - if (error) { + if (error != 0) { PEFSDEBUG("pefs_rmdir: pefs_enccn_get failed: %d\n", error); return (error); } - ap->a_cnp = &enccn.pec_cn; - error = pefs_bypass((struct vop_generic_args *)ap, NULL); - ap->a_cnp = cnp; - + error = VOP_RMDIR(PEFS_LOWERVP(dvp), PEFS_LOWERVP(vp), &enccn.pec_cn); VP_TO_PN(vp)->pn_flags |= PN_WANTRECYCLE; pefs_enccn_free(&enccn); - if (!error) { + if (error == 0) { cache_purge(dvp); cache_purge(vp); } @@ -1426,6 +1334,7 @@ pefs_create(struct vop_create_args *ap) { struct vnode *dvp = ap->a_dvp; + struct vnode *lvp; struct componentname *cnp = ap->a_cnp; struct pefs_enccn enccn; int error; @@ -1436,13 +1345,17 @@ pefs_enccn_init(&enccn); PEFS_ENCCN_ASSERT_NOENT(dvp, cnp); error = pefs_enccn_create_node(&enccn, dvp, cnp); - if (error) { + if (error != 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From scottl at FreeBSD.org Fri Oct 2 01:58:50 2009 From: scottl at FreeBSD.org (Scott Long) Date: Fri Oct 2 01:58:57 2009 Subject: PERFORCE change 169116 for review Message-ID: <200910020158.n921wnsh031409@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169116 Change 169116 by scottl@scottl-y1 on 2009/10/02 01:58:39 Reduce the scope of the locking in xpt_finishconfig_func. The locking is wonky because of the device iteration code that needs to grab each SIM lock. Affected files ... .. //depot/projects/firewire/sys/cam/cam_xpt.c#3 edit Differences ... ==== //depot/projects/firewire/sys/cam/cam_xpt.c#3 (text+ko) ==== @@ -4716,7 +4716,6 @@ struct periph_driver **p_drv; int i; - mtx_lock(&xsoftc.xpt_lock); if (busses_to_config == 0) { /* Register all the peripheral drivers */ /* XXX This will have to change when we have loadable modules */ @@ -4733,11 +4732,12 @@ xpt_for_all_devices(xptpassannouncefunc, NULL); /* Release our hook so that the boot can continue. */ + mtx_lock(&xsoftc.xpt_lock); wakeup(xpt_config); + mtx_unlock(&xsoftc.xpt_lock); } free(context, M_CAMXPT); - mtx_unlock(&xsoftc.xpt_lock); } static void From scottl at FreeBSD.org Fri Oct 2 05:00:12 2009 From: scottl at FreeBSD.org (Scott Long) Date: Fri Oct 2 05:00:19 2009 Subject: PERFORCE change 169118 for review Message-ID: <200910020500.n92507Q3058475@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169118 Change 169118 by scottl@scottl-y1 on 2009/10/02 05:00:03 Clean up xpt_config timeout messages. Affected files ... .. //depot/projects/firewire/sys/cam/cam_xpt.c#4 edit Differences ... ==== //depot/projects/firewire/sys/cam/cam_xpt.c#4 (text+ko) ==== @@ -4628,9 +4628,13 @@ return(1); } +#define CAM_WARN_INTERVAL_SECS 60 + static void xpt_config(void *arg) { + u_int warned = 0; + /* * Now that interrupts are enabled, go find our devices */ @@ -4682,8 +4686,12 @@ mtx_lock(&xsoftc.xpt_lock); while (msleep(xpt_config, &xsoftc.xpt_lock, PCONFIG, "camhk", - 30 * hz) == EWOULDBLOCK) { - printf("Warning\n"); + CAM_WARN_INTERVAL_SECS * hz) == EWOULDBLOCK) { + if (++warned < 6) + printf("xpt_config: still waiting after %d seconds " + "for CAM buses to respond\n", + warned * CAM_WARN_INTERVAL_SECS); + KASSERT(warned < 6, ("xpt_config: waited too long")); } mtx_unlock(&xsoftc.xpt_lock); } From rene at FreeBSD.org Fri Oct 2 11:12:51 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Fri Oct 2 11:12:58 2009 Subject: PERFORCE change 169123 for review Message-ID: <200910021112.n92BCofn001777@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169123 Change 169123 by rene@rene_self on 2009/10/02 11:12:25 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/share/pgpkeys/csjp.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#26 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#23 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#21 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#7 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1162,8 +1162,12 @@ Using XDM - The XDM daemon program is - located in /usr/local/bin/xdm. This program + To start using XDM, install the + x11/xdm port (it is not + installed by default in recent versions of + &xorg;). + The XDM daemon program may then be + found in /usr/local/bin/xdm. This program can be run at any time as root and it will start managing the X display on the local machine. If XDM is to be run every ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 (text+ko) ==== @@ -1,7 +1,7 @@ - - Using KDE + + Using Qt - - Variable definitions - - - Variables for ports that use KDE - - - - - USE_KDELIBS_VER - - The port uses KDE libraries. It specifies the - major version of KDE to use and implies - USE_QT_VER of the appropriate - version. The only possible value is - 3. - - - - USE_KDEBASE_VER - - The port uses KDE base. It specifies the major - version of KDE to use and implies - USE_QT_VER of the appropriate version. - The only possible value is 3. - - - -
- - - - + Ports that require Qt @@ -5809,6 +5777,141 @@ + + Using KDE + + + Variable definitions (KDE 3.x only) + +
+ Variables for ports that use KDE 3.x + + + + + USE_KDELIBS_VER + + The port uses KDE libraries. It specifies the + major version of KDE to use and implies + USE_QT_VER of the appropriate + version. The only possible value is + 3. + + + + USE_KDEBASE_VER + + The port uses KDE base. It specifies the major + version of KDE to use and implies + USE_QT_VER of the appropriate version. + The only possible value is 3. + + + +
+ + + + + KDE 4 variable definitions + + If your application depends on KDE 4.x, set USE_KDE4 + to the list of required components. The most commonly used components are listed below + (up-to-date components are listed in _USE_KDE4_ALL in + /usr/ports/Mk/bsd.kde4.mk): + + + Available KDE4 components + + + + + Name + Description + + + + + + akonadi + Personal information management (PIM) storage service + + + + automoc4 + Makes port use automoc4 build tool + + + + kdebase + Basic KDE applications (Konqueror, Dolphin, Konsole) + + + + kdeexp + Experimental KDE libraries (with non-stable API) + + + + kdehier + Provides common KDE directories + + + + kdelibs + The base set of KDE libraries + + + + kdeprefix + If set, port will be installed into + ${KDE4_PREFIX} + instead of ${LOCALBASE} + + + + pimlibs + PIM libraries + + + + workspace + Applications and libraries which form desktop (Plasma, KWin) + + + + +
+ + KDE 4.x ports are installed into ${KDE4_PREFIX}, + which is /usr/local/kde4 currently, to avoid conflicts + with KDE 3.x ports. This is achieved by specifying kdeprefix + component, which overrides default PREFIX. The ports however + respect PREFIX set via MAKEFLAGS environment + variable and/or make arguments. + + + <makevar>USE_KDE4</makevar> example + + This is a simple example for KDE 4 port. USE_CMAKE + instructs port to utilize CMake — + configuration tool widely spread among KDE 4 projects. + USE_KDE4 brings dependency on KDE libraries and makes port using + automoc4 at build stage. Required KDE components + and other dependencies can be determined through configure log. + USE_KDE4 does not imply USE_QT_VER. + If port requires some of Qt4 components, USE_QT_VER should be set + and then needed components can be specified. + + USE_CMAKE= yes +USE_KDE4= automoc4 kdelibs kdeprefix +USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build + + + + + Using Java ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1011,6 +1011,11 @@ &pgpkey.cperciva; + + &a.csjp; + &pgpkey.csjp; + + &a.gerald; &pgpkey.gerald; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#23 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -60,6 +60,7 @@ + ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#21 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2635,6 +2635,21 @@ lstewart Received + + + gavin + 3 Zip 100 drives
+ 3 3ware cards + mav + Received + + + + Gareth Randall + HP C1636-00100 SCSI tape drive + cracauer + Received + &footer; ==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#7 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.80 2009/06/09 20:45:27 marius Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $ @@ -325,7 +325,7 @@ The Serbian BSD User Group - http://www.bsd-srbija.org/ + http://www.bsdserbia.org/ The Serbian BSD Users Group provides an open forum for all things BSD-related in the Serbian language. Located From rene at FreeBSD.org Fri Oct 2 11:23:02 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Fri Oct 2 11:23:08 2009 Subject: PERFORCE change 169125 for review Message-ID: <200910021123.n92BN1M2002530@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169125 Change 169125 by rene@rene_self on 2009/10/02 11:22:12 MFen handbook/x11 1.194 -> 1.195 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#17 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#17 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.21 2009/08/27 20:01:58 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.194 + %SRCID% 1.195 --> @@ -1239,7 +1239,11 @@ XDM gebruiken - De XDM daemon staat in + Om XDM te gebruiken moet de port + x11/xdm geïnstalleerd worden + (het wordt in recente versies van &xorg; niet + standaard geïnstalleerd). Het daemon-programma + XDM is daarna beschikbaar in /usr/local/bin/xdm. Dit programma kan als root altijd gestart worden en regelt dan het X weergavegedeelte van de lokale machine. Als From rwatson at FreeBSD.org Fri Oct 2 12:32:27 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Fri Oct 2 12:32:39 2009 Subject: PERFORCE change 169127 for review Message-ID: <200910021232.n92CWQC5008465@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169127 Change 169127 by rwatson@rwatson_freebsd_capabilities on 2009/10/02 12:32:03 Close a race in which a process managed using a process descriptor is exiting simultaneously with the process descriptor being closed by extending coverage of the proctree lock during close. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#13 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#13 (text+ko) ==== @@ -337,11 +337,11 @@ pd = fp->f_data; fp->f_ops = &badfileops; fp->f_data = NULL; + + sx_xlock(&proctree_lock); PROCDESC_LOCK(pd); pd->pd_flags |= PD_CLOSED; PROCDESC_UNLOCK(pd); - - sx_xlock(&proctree_lock); p = pd->pd_proc; PROC_LOCK(p); if (p->p_state == PRS_ZOMBIE) { From stas at FreeBSD.org Fri Oct 2 14:42:50 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 14:43:14 2009 Subject: PERFORCE change 169130 for review Message-ID: <200910021442.n92EgnCw029743@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169130 Change 169130 by stas@stas_yandex on 2009/10/02 14:42:33 - Add the workaround for memcheck's mprotect issue. Memcheck tracking scheme doesn't allow to mark memory bytes as unaddressable and defined simultaneously so if we mark them unaccessible on mprotect with PROT_NONE we loose any information on definiteness. So don't alter flags at all of permissions get decreased and operate only on unaccessible bytes if additional read/write permissions were granted. Affected files ... .. //depot/projects/valgrind/memcheck/mc_main.c#6 edit Differences ... ==== //depot/projects/valgrind/memcheck/mc_main.c#6 (text+ko) ==== @@ -1635,13 +1635,38 @@ } } +static void make_mem_defined_if_unaddressable ( Addr a, SizeT len ) +{ + SizeT i; + UChar vabits2; + DEBUG("make_mem_defined_if_unaddressable(%p, %llu)\n", a, (ULong)len); + for (i = 0; i < len; i++) { + vabits2 = get_vabits2( a+i ); + if (vabits2 == VA_BITS2_NOACCESS) { + set_vabits2(a+i, VA_BITS2_DEFINED); + if (UNLIKELY(MC_(clo_mc_level) >= 3)) { + MC_(helperc_b_store1)( a+i, 0 ); /* clear the origin tag */ + } + } + } +} + /* Track changes in the virtual memory space. */ static void track_perms_change( Addr a, SizeT len, Bool rr, Bool ww, Bool xx ) { +/* if (!(rr || ww)) MC_(make_mem_noaccess) ( a, len ); - MC_(make_mem_defined) ( a, len ); +*/ + /* + * Valgrind's memory management implementation is brain-damaged + * so we can't mark memory as unaccessible but defined :-( + * Thus we don't alter it if the new bits indicate the range + * as unaccessible and only change access bits for unaccessible + * bytes if permissions were given + */ + make_mem_defined_if_unaddressable ( a, len ); } From stas at FreeBSD.org Fri Oct 2 14:46:54 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 14:47:08 2009 Subject: PERFORCE change 169131 for review Message-ID: <200910021446.n92EkrWq030031@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169131 Change 169131 by stas@stas_yandex on 2009/10/02 14:46:18 - Add forgotten conditional. Affected files ... .. //depot/projects/valgrind/memcheck/mc_main.c#7 edit Differences ... ==== //depot/projects/valgrind/memcheck/mc_main.c#7 (text+ko) ==== @@ -1666,7 +1666,8 @@ * as unaccessible and only change access bits for unaccessible * bytes if permissions were given */ - make_mem_defined_if_unaddressable ( a, len ); + if (rr || ww) + make_mem_defined_if_unaddressable ( a, len ); } From stas at FreeBSD.org Fri Oct 2 14:46:55 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 14:47:09 2009 Subject: PERFORCE change 169132 for review Message-ID: <200910021446.n92EkrkE030036@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169132 Change 169132 by stas@stas_yandex on 2009/10/02 14:46:47 - Reflect the line numbers change in addressable test. Affected files ... .. //depot/projects/valgrind/memcheck/tests/addressable.stderr.exp#5 edit Differences ... ==== //depot/projects/valgrind/memcheck/tests/addressable.stderr.exp#5 (text+ko) ==== @@ -9,26 +9,16 @@ For counts of detected and suppressed errors, rerun with: -v ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) Unaddressable byte(s) found during client check request - at 0x........: test2 (addressable.c:48) - by 0x........: main (addressable.c:125) + at 0x........: test2 (addressable.c:50) + by 0x........: main (addressable.c:127) Address 0x........ is not stack'd, malloc'd or (recently) free'd Invalid write of size 1 - at 0x........: test2 (addressable.c:51) - by 0x........: main (addressable.c:125) + at 0x........: test2 (addressable.c:53) + by 0x........: main (addressable.c:127) Address 0x........ is not stack'd, malloc'd or (recently) free'd -Process terminating with default action of signal N (SIGSEGV or SIGBUS) - Bad memory (SIGSEGV or SIGBUS) at address 0x........ - at 0x........: test2 (addressable.c:51) - by 0x........: main (addressable.c:125) - If you believe this happened as a result of a stack - overflow in your program's main thread (unlikely but - possible), you can try to increase the size of the - main thread stack using the --main-stacksize= flag. - The main thread stack size used in this run was .... - HEAP SUMMARY: in use at exit: ... bytes in ... blocks total heap usage: ... allocs, ... frees, ... bytes allocated @@ -36,38 +26,15 @@ For a detailed leak analysis, rerun with: --leak-check=full For counts of detected and suppressed errors, rerun with: -v -ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) - -HEAP SUMMARY: - in use at exit: ... bytes in ... blocks - total heap usage: ... allocs, ... frees, ... bytes allocated - -For a detailed leak analysis, rerun with: --leak-check=full - -For counts of detected and suppressed errors, rerun with: -v -ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) - -Process terminating with default action of signal N (SIGSEGV or SIGBUS) - Bad memory (SIGSEGV or SIGBUS) at address 0x........ - at 0x........: test4 (addressable.c:74) - by 0x........: main (addressable.c:125) - -HEAP SUMMARY: - in use at exit: ... bytes in ... blocks - total heap usage: ... allocs, ... frees, ... bytes allocated - -For a detailed leak analysis, rerun with: --leak-check=full - -For counts of detected and suppressed errors, rerun with: -v ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) Uninitialised byte(s) found during client check request - at 0x........: test5 (addressable.c:85) - by 0x........: main (addressable.c:125) + at 0x........: test5 (addressable.c:87) + by 0x........: main (addressable.c:127) Address 0x........ is not stack'd, malloc'd or (recently) free'd Uninitialised byte(s) found during client check request - at 0x........: test5 (addressable.c:91) - by 0x........: main (addressable.c:125) + at 0x........: test5 (addressable.c:93) + by 0x........: main (addressable.c:127) Address 0x........ is not stack'd, malloc'd or (recently) free'd From stas at FreeBSD.org Fri Oct 2 15:12:22 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 15:12:29 2009 Subject: PERFORCE change 169133 for review Message-ID: <200910021512.n92FCLEl032865@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169133 Change 169133 by stas@stas_yandex on 2009/10/02 15:11:31 - Use the same exit(2) parameter name as other OSes does - that's what regressions tests expect. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#45 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#45 (text+ko) ==== @@ -693,7 +693,7 @@ ThreadState* tst; PRINT("exit( %ld )", ARG1); - PRE_REG_READ1(void, "exit", int, exitcode); + PRE_REG_READ1(void, "exit", int, status); tst = VG_(get_ThreadState)(tid); /* Mark all threads (including this one) to exit. */ From truncs at FreeBSD.org Fri Oct 2 15:34:47 2009 From: truncs at FreeBSD.org (Aditya Sarawgi) Date: Fri Oct 2 15:35:34 2009 Subject: PERFORCE change 169134 for review Message-ID: <200910021534.n92FYkR1034398@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169134 Change 169134 by truncs@aditya on 2009/10/02 15:34:00 Fix typo. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#5 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#5 (text+ko) ==== @@ -68,7 +68,7 @@ * which tell the system the average file size and the average number * of files per directory. These defaults are well selected for typical * filesystems, but may need to be tuned for odd cases like filesystems - * being used for sqiud caches or news spools. + * being used for squid caches or news spools. * AVFPDIR is the expected number of files per directory. AVGDIRSIZE is * obtained by multiplying AVFPDIR and AVFILESIZ which is assumed to be * 16384. From stas at FreeBSD.org Fri Oct 2 16:00:15 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 16:00:20 2009 Subject: PERFORCE change 169135 for review Message-ID: <200910021600.n92G0EIa036185@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169135 Change 169135 by stas@stas_yandex on 2009/10/02 15:59:57 - Fix a couple of regressions tests. Affected files ... .. //depot/projects/valgrind/memcheck/tests/amd64/Makefile.am#4 edit .. //depot/projects/valgrind/memcheck/tests/amd64/xor-undef-amd64.stderr.exp-freebsd#1 add .. //depot/projects/valgrind/memcheck/tests/noisy_child.stderr.exp#4 edit Differences ... ==== //depot/projects/valgrind/memcheck/tests/amd64/Makefile.am#4 (text+ko) ==== @@ -18,7 +18,7 @@ more_x87_fp.stderr.exp more_x87_fp.stdout.exp more_x87_fp.vgtest \ sse_memory.stderr.exp sse_memory.stdout.exp sse_memory.vgtest \ xor-undef-amd64.stderr.exp xor-undef-amd64.stdout.exp \ - xor-undef-amd64.vgtest + xor-undef-amd64.stderr.exp-freebsd xor-undef-amd64.vgtest check_PROGRAMS = bt_everything bug132146 fxsave-amd64 \ xor-undef-amd64 ==== //depot/projects/valgrind/memcheck/tests/noisy_child.stderr.exp#4 (text+ko) ==== @@ -12,6 +12,23 @@ at 0x........: free (vg_replace_malloc.c:...) by 0x........: main (noisy_child.c:24) +Invalid free() / delete / delete[] + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: do_child_badness (noisy_child.c:10) + by 0x........: main (noisy_child.c:34) + Address 0x........ is 0 bytes inside a block of size 10 free'd + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: main (noisy_child.c:24) + + +HEAP SUMMARY: + in use at exit: ... bytes in ... blocks + total heap usage: ... allocs, ... frees, ... bytes allocated + +For a detailed leak analysis, rerun with: --leak-check=full + +For counts of detected and suppressed errors, rerun with: -v +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) HEAP SUMMARY: in use at exit: ... bytes in ... blocks From stas at FreeBSD.org Fri Oct 2 16:07:22 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 16:07:29 2009 Subject: PERFORCE change 169136 for review Message-ID: <200910021607.n92G7M9p037628@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169136 Change 169136 by stas@stas_yandex on 2009/10/02 16:06:58 - Account for 32-bit version of ld-elf in FreeBSD suppressions file as well. Affected files ... .. //depot/projects/valgrind/freebsd.supp#5 edit Differences ... ==== //depot/projects/valgrind/freebsd.supp#5 (text+ko) ==== @@ -7,7 +7,7 @@ { rtld-1 Memcheck:Cond - obj:/libexec/ld-elf.so.1 + obj:/libexec/ld-elf*.so.1 } { libc puts leak From stas at FreeBSD.org Fri Oct 2 17:16:39 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 17:16:45 2009 Subject: PERFORCE change 169138 for review Message-ID: <200910021716.n92HGc0e053738@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169138 Change 169138 by stas@stas_yandex on 2009/10/02 17:15:51 - It's safer to use types that actually assumed later. Affected files ... .. //depot/projects/valgrind/memcheck/tests/x86/more_x86_fp.c#3 edit Differences ... ==== //depot/projects/valgrind/memcheck/tests/x86/more_x86_fp.c#3 (text+ko) ==== @@ -87,7 +87,7 @@ long double la; int16_t fpuc; int i; - int64_t lla; + long long int lla; int ia; int16_t wa; double ra; From trasz at FreeBSD.org Fri Oct 2 17:20:43 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 17:20:50 2009 Subject: PERFORCE change 169139 for review Message-ID: <200910021720.n92HKgnC054088@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169139 Change 169139 by trasz@trasz_victim on 2009/10/02 17:20:24 Rework rule storage to store pointers to subjects instead of their id's. Affected files ... .. //depot/projects/soc2009/trasz_limits/TODO#11 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#61 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#12 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#22 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#24 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#34 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/TODO#11 (text+ko) ==== @@ -1,7 +1,4 @@ - - In hrl_rule, instead of keeping subject ids, keep links to a process, - uidinfo and gidinfo, the same way we do with loginclasses. - - Why did I put the loginclass pointer into the proc and not into the cred? - Make the limits lists protected by the subjects lock (e.g. process lock) ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#61 (text+ko) ==== @@ -71,11 +71,11 @@ }; struct dict subjectnames[] = { - { "process", HRL_SUBJECT_PROCESS }, - { "user", HRL_SUBJECT_USER }, - { "group", HRL_SUBJECT_GROUP }, - { "loginclass", HRL_SUBJECT_LOGINCLASS }, - { "jail", HRL_SUBJECT_JAIL }, + { "process", HRL_SUBJECT_TYPE_PROCESS }, + { "user", HRL_SUBJECT_TYPE_USER }, + { "group", HRL_SUBJECT_TYPE_GROUP }, + { "loginclass", HRL_SUBJECT_TYPE_LOGINCLASS }, + { "jail", HRL_SUBJECT_TYPE_JAIL }, { NULL, -1 }}; struct dict resourcenames[] = { @@ -195,7 +195,7 @@ } static const char * -hrl_subject_name(int subject) +hrl_subject_type_name(int subject) { int i; @@ -204,7 +204,7 @@ return (subjectnames[i].d_name); } - panic("hrl_subject_name: unknown subject"); + panic("hrl_subject_type_name: unknown subject type %d", subject); } static const char * @@ -217,7 +217,7 @@ return (actionnames[i].d_name); } - panic("hrl_action_name: unknown action"); + panic("hrl_action_name: unknown action %d", action); } static const char * @@ -230,7 +230,7 @@ return (resourcenames[i].d_name); } - panic("hrl_resource_name: unknown resource"); + panic("hrl_resource_name: unknown resource %d", resource); } static void @@ -259,26 +259,26 @@ hrl_available_resource(const struct proc *p, const struct hrl_rule *rule) { int resource, i; - int64_t available, found = 0; + int64_t available = INT64_MAX, found = 0; struct ucred *cred = p->p_ucred; mtx_assert(&hrl_lock, MA_OWNED); resource = rule->hr_resource; switch (rule->hr_per) { - case HRL_SUBJECT_PROCESS: + case HRL_SUBJECT_TYPE_PROCESS: available = rule->hr_amount - p->p_usage.hu_resources[resource]; break; - case HRL_SUBJECT_USER: + case HRL_SUBJECT_TYPE_USER: available = rule->hr_amount - cred->cr_ruidinfo->ui_usage.hu_resources[resource]; break; - case HRL_SUBJECT_GROUP: + case HRL_SUBJECT_TYPE_GROUP: if (hrl_group_accounting) { for (i = 0; i < cred->cr_ngroups; i++) { - if (cred->cr_gidinfos[i]->gi_gid != - rule->hr_subject_id) + if (cred->cr_gidinfos[i] != + rule->hr_subject.hs_gip) continue; found = 1; @@ -288,12 +288,12 @@ KASSERT(found, ("hrl_available_resource: group not found")); } break; - case HRL_SUBJECT_LOGINCLASS: + case HRL_SUBJECT_TYPE_LOGINCLASS: available = rule->hr_amount - p->p_loginclass->lc_usage.hu_resources[resource]; - available = INT64_MAX; + available = INT64_MAX; /* XXX */ break; - case HRL_SUBJECT_JAIL: + case HRL_SUBJECT_TYPE_JAIL: available = rule->hr_amount - cred->cr_prison->pr_usage.hu_resources[resource]; break; @@ -479,11 +479,11 @@ struct ucred *cred; struct prison *pr; - KASSERT(amount > 0, ("hrl_alloc: invalid amount for %s: %lld", + KASSERT(amount > 0, ("hrl_alloc: invalid amount for %s: %ju", hrl_resource_name(resource), amount)); #if 0 - printf("hrl_alloc: allocating %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); + printf("hrl_alloc: allocating %ju of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid); #endif mtx_lock(&hrl_lock); @@ -540,7 +540,7 @@ struct ucred *cred; struct prison *pr; - KASSERT(amount >= 0, ("hrl_allocated: invalid amount for %s: %lld", + KASSERT(amount >= 0, ("hrl_allocated: invalid amount for %s: %ju", hrl_resource_name(resource), amount)); #if 0 @@ -599,7 +599,7 @@ struct ucred *cred; struct prison *pr; - KASSERT(amount > 0, ("hrl_free: invalid amount for %s: %lld", + KASSERT(amount > 0, ("hrl_free: invalid amount for %s: %ju", hrl_resource_name(resource), amount)); #if 0 @@ -608,8 +608,8 @@ mtx_lock(&hrl_lock); KASSERT(amount <= p->p_usage.hu_resources[resource], - ("hrl_free: freeing %lld of %s, which is more than allocated " - "%lld for %s (pid %d)", amount, hrl_resource_name(resource), + ("hrl_free: freeing %ju of %s, which is more than allocated " + "%ld for %s (pid %d)", amount, hrl_resource_name(resource), p->p_usage.hu_resources[resource], p->p_comm, p->p_pid)); p->p_usage.hu_resources[resource] -= amount; p->p_loginclass->lc_usage.hu_resources[resource] -= amount; @@ -684,14 +684,40 @@ hrl_rule_matches(const struct hrl_rule *rule, const struct hrl_rule *filter) { - if (filter->hr_subject != HRL_SUBJECT_UNDEFINED) { - if (rule->hr_subject != filter->hr_subject) + if (filter->hr_subject_type != HRL_SUBJECT_TYPE_UNDEFINED) { + if (rule->hr_subject_type != filter->hr_subject_type) return (0); - } - if (filter->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED) { - if (rule->hr_subject_id != filter->hr_subject_id) - return (0); + switch (filter->hr_subject_type) { + case HRL_SUBJECT_TYPE_PROCESS: + if (filter->hr_subject.hs_proc != + filter->hr_subject.hs_proc) + return (0); + break; + case HRL_SUBJECT_TYPE_USER: + if (filter->hr_subject.hs_uip != + filter->hr_subject.hs_uip) + return (0); + break; + case HRL_SUBJECT_TYPE_GROUP: + if (filter->hr_subject.hs_gip != + filter->hr_subject.hs_gip) + return (0); + break; + case HRL_SUBJECT_TYPE_LOGINCLASS: + if (filter->hr_subject.hs_loginclass != + filter->hr_subject.hs_loginclass) + return (0); + break; + case HRL_SUBJECT_TYPE_JAIL: + if (filter->hr_subject.hs_prison != + filter->hr_subject.hs_prison) + return (0); + break; + default: + panic("hrl_rule_matches: unknown subject type %d", + filter->hr_subject_type); + } } if (filter->hr_resource != HRL_RESOURCE_UNDEFINED) { @@ -709,7 +735,7 @@ return (0); } - if (filter->hr_per != HRL_SUBJECT_UNDEFINED) { + if (filter->hr_per != HRL_SUBJECT_TYPE_UNDEFINED) { if (rule->hr_per != filter->hr_per) return (0); } @@ -828,6 +854,69 @@ return (removed); } +static void +hrl_rule_acquire_subject(struct hrl_rule *rule) +{ + + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_UNDEFINED: + case HRL_SUBJECT_TYPE_PROCESS: + break; + case HRL_SUBJECT_TYPE_USER: + if (rule->hr_subject.hs_uip != NULL) + uihold(rule->hr_subject.hs_uip); + break; + case HRL_SUBJECT_TYPE_GROUP: + if (rule->hr_subject.hs_gip != NULL) + gihold(rule->hr_subject.hs_gip); + break; + case HRL_SUBJECT_TYPE_LOGINCLASS: + if (rule->hr_subject.hs_loginclass != NULL) + loginclass_acquire(rule->hr_subject.hs_loginclass); + break; + case HRL_SUBJECT_TYPE_JAIL: + if (rule->hr_subject.hs_loginclass != NULL) + prison_hold(rule->hr_subject.hs_prison); + break; + default: + panic("hrl_rule_acquire_subject: unknown subject type %d", + rule->hr_subject_type); + } +} + +static void +hrl_rule_release_subject(struct hrl_rule *rule) +{ + + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_UNDEFINED: + case HRL_SUBJECT_TYPE_PROCESS: + break; + case HRL_SUBJECT_TYPE_USER: + if (rule->hr_subject.hs_uip != NULL) + uifree(rule->hr_subject.hs_uip); + break; + case HRL_SUBJECT_TYPE_GROUP: + if (rule->hr_subject.hs_gip != NULL) + gifree(rule->hr_subject.hs_gip); + break; + case HRL_SUBJECT_TYPE_LOGINCLASS: + if (rule->hr_subject.hs_loginclass != NULL) + loginclass_release(rule->hr_subject.hs_loginclass); + break; + case HRL_SUBJECT_TYPE_JAIL: + if (rule->hr_subject.hs_prison != NULL) { + prison_free(rule->hr_subject.hs_prison); + sx_xunlock(&allprison_lock); + } + break; + default: + panic("hrl_rule_release_subject: unknown subject type %d", + rule->hr_subject_type); + } +} + + struct hrl_rule * hrl_rule_alloc(int flags) { @@ -836,9 +925,13 @@ rule = uma_zalloc(hrl_rule_zone, flags); if (rule == NULL) return (NULL); - rule->hr_subject = HRL_SUBJECT_UNDEFINED; - rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED; - rule->hr_per = HRL_SUBJECT_UNDEFINED; + rule->hr_subject_type = HRL_SUBJECT_TYPE_UNDEFINED; + rule->hr_subject.hs_proc = NULL; + rule->hr_subject.hs_uip = NULL; + rule->hr_subject.hs_gip = NULL; + rule->hr_subject.hs_loginclass = NULL; + rule->hr_subject.hs_prison = NULL; + rule->hr_per = HRL_SUBJECT_TYPE_UNDEFINED; rule->hr_resource = HRL_RESOURCE_UNDEFINED; rule->hr_action = HRL_ACTION_UNDEFINED; rule->hr_amount = HRL_AMOUNT_UNDEFINED; @@ -855,13 +948,18 @@ copy = uma_zalloc(hrl_rule_zone, flags); if (copy == NULL) return (NULL); - copy->hr_subject = rule->hr_subject; - copy->hr_subject_id = rule->hr_subject_id; + copy->hr_subject_type = rule->hr_subject_type; + copy->hr_subject.hs_proc = rule->hr_subject.hs_proc; + copy->hr_subject.hs_uip = rule->hr_subject.hs_uip; + copy->hr_subject.hs_gip = rule->hr_subject.hs_gip; + copy->hr_subject.hs_loginclass = rule->hr_subject.hs_loginclass; + copy->hr_subject.hs_prison = rule->hr_subject.hs_prison; copy->hr_per = rule->hr_per; copy->hr_resource = rule->hr_resource; copy->hr_action = rule->hr_action; copy->hr_amount = rule->hr_amount; refcount_init(©->hr_refcount, 1); + hrl_rule_acquire_subject(copy); return (copy); } @@ -882,10 +980,7 @@ KASSERT(rule->hr_refcount > 0, ("rule->hr_refcount > 0")); if (refcount_release(&rule->hr_refcount)) { - if (rule->hr_subject == HRL_SUBJECT_LOGINCLASS && - rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED) - loginclass_release((struct loginclass *)(long) - rule->hr_subject_id); + hrl_rule_release_subject(rule); uma_zfree(hrl_rule_zone, rule); } } @@ -894,17 +989,40 @@ hrl_rule_fully_specified(const struct hrl_rule *rule) { - if (rule->hr_subject == HRL_SUBJECT_UNDEFINED) + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_UNDEFINED: return (0); - if (rule->hr_subject_id == HRL_SUBJECT_ID_UNDEFINED) - return (0); + case HRL_SUBJECT_TYPE_PROCESS: + if (rule->hr_subject.hs_proc == NULL) + return (0); + break; + case HRL_SUBJECT_TYPE_USER: + if (rule->hr_subject.hs_uip == NULL) + return (0); + break; + case HRL_SUBJECT_TYPE_GROUP: + if (rule->hr_subject.hs_gip == NULL) + return (0); + break; + case HRL_SUBJECT_TYPE_LOGINCLASS: + if (rule->hr_subject.hs_loginclass == NULL) + return (0); + break; + case HRL_SUBJECT_TYPE_JAIL: + if (rule->hr_subject.hs_prison == NULL) + return (0); + break; + default: + panic("hrl_rule_fully_specified: unknown subject type %d", + rule->hr_subject_type); + } if (rule->hr_resource == HRL_RESOURCE_UNDEFINED) return (0); if (rule->hr_action == HRL_ACTION_UNDEFINED) return (0); if (rule->hr_amount == HRL_AMOUNT_UNDEFINED) return (0); - if (rule->hr_per == HRL_SUBJECT_UNDEFINED) + if (rule->hr_per == HRL_SUBJECT_TYPE_UNDEFINED) return (0); return (1); @@ -913,11 +1031,11 @@ static struct hrl_rule * hrl_rule_from_string(char *rulestr) { - int error; + int error = 0; char *subjectstr, *subject_idstr, *resourcestr, *actionstr, *amountstr, *perstr; - struct loginclass *lc; struct hrl_rule *rule; + id_t id; rule = hrl_rule_alloc(M_WAITOK); @@ -929,32 +1047,64 @@ perstr = rulestr; if (subjectstr == NULL || subjectstr[0] == '\0') - rule->hr_subject = HRL_SUBJECT_UNDEFINED; + rule->hr_subject_type = HRL_SUBJECT_TYPE_UNDEFINED; else { - error = str2value(subjectstr, &rule->hr_subject, subjectnames); + error = str2value(subjectstr, &rule->hr_subject_type, subjectnames); if (error) goto out; } - /* - * Login classes don't have any ID. Instead, we just put a pointer - * to the 'struct loginclass' into the hr_subject_id field. - */ - if (rule->hr_subject == HRL_SUBJECT_LOGINCLASS) { - if (subject_idstr == NULL || subject_idstr[0] == '\0') { - rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED; - } else { - lc = loginclass_find(subject_idstr); - rule->hr_subject_id = (long)lc; - } + if (subject_idstr == NULL || subject_idstr[0] == '\0') { + rule->hr_subject.hs_proc = NULL; + rule->hr_subject.hs_uip = NULL; + rule->hr_subject.hs_gip = NULL; + rule->hr_subject.hs_loginclass = NULL; + rule->hr_subject.hs_prison = NULL; } else { - if (subject_idstr == NULL || subject_idstr[0] == '\0') - rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED; - else { - error = str2id(subject_idstr, &rule->hr_subject_id); + + /* + * Loginclasses don't have any numerical ID's. + */ + if (rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS) { + error = str2id(subject_idstr, &id); if (error) goto out; } + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_UNDEFINED: + error = EINVAL; + goto out; + case HRL_SUBJECT_TYPE_PROCESS: + sx_assert(&allproc_lock, SA_LOCKED); + rule->hr_subject.hs_proc = pfind(id); + if (rule->hr_subject.hs_proc == NULL) { + error = ESRCH; + goto out; + } + PROC_UNLOCK(rule->hr_subject.hs_proc); + break; + case HRL_SUBJECT_TYPE_USER: + rule->hr_subject.hs_uip = uifind(id); + break; + case HRL_SUBJECT_TYPE_GROUP: + rule->hr_subject.hs_gip = gifind(id); + break; + case HRL_SUBJECT_TYPE_LOGINCLASS: + rule->hr_subject.hs_loginclass = loginclass_find(subject_idstr); + break; + case HRL_SUBJECT_TYPE_JAIL: + sx_xlock(&allprison_lock); + rule->hr_subject.hs_prison = prison_find(id); + if (rule->hr_subject.hs_prison == NULL) { + sx_xunlock(&allprison_lock); + error = ESRCH; + goto out; + } + break; + default: + panic("hrl_rule_from_string: unknown subject type %d", + rule->hr_subject_type); + } } if (resourcestr == NULL || resourcestr[0] == '\0') @@ -983,17 +1133,13 @@ } if (perstr == NULL || perstr[0] == '\0') - rule->hr_per = HRL_SUBJECT_UNDEFINED; + rule->hr_per = HRL_SUBJECT_TYPE_UNDEFINED; else { error = str2value(perstr, &rule->hr_per, subjectnames); if (error) goto out; } - if (rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED && - rule->hr_subject == HRL_SUBJECT_UNDEFINED) - goto out; - out: if (error) { hrl_rule_release(rule); @@ -1019,8 +1165,8 @@ KASSERT(hrl_rule_fully_specified(rule), ("rule not fully specified")); - if ((rule->hr_subject == HRL_SUBJECT_GROUP || - rule->hr_per == HRL_SUBJECT_GROUP) && !hrl_group_accounting) + if ((rule->hr_subject_type == HRL_SUBJECT_TYPE_GROUP || + rule->hr_per == HRL_SUBJECT_TYPE_GROUP) && !hrl_group_accounting) return (EOPNOTSUPP); if (rule->hr_action == HRL_ACTION_DELAY) @@ -1031,101 +1177,79 @@ */ hrl_rule_remove(rule); - switch (rule->hr_subject) { - case HRL_SUBJECT_PROCESS: - /* - * The sx lock is to keep the process from going away. - */ - sx_slock(&proctree_lock); - p = pfind(rule->hr_subject_id); - if (p == NULL) { - sx_sunlock(&proctree_lock); - return (ESRCH); - } - - PROC_UNLOCK(p); + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_PROCESS: + p = rule->hr_subject.hs_proc; + KASSERT(p != NULL, ("hrl_rule_add: NULL proc")); hrl_limit_add(&p->p_limits, rule); - sx_sunlock(&proctree_lock); /* * In case of per-process rule, we don't have anything more * to do. */ return (0); - case HRL_SUBJECT_USER: - uip = uifind(rule->hr_subject_id); - KASSERT(uip != NULL, ("hrl_rule_add: uifind failed")); + case HRL_SUBJECT_TYPE_USER: + uip = rule->hr_subject.hs_uip; + KASSERT(uip != NULL, ("hrl_rule_add: NULL uip")); hrl_limit_add(&uip->ui_limits, rule); - /* - * Don't call uifree(2); we don't want the uidinfo - * to go away, because the rule should stay there even - * if there are no processes with that uid. The same - * applies to the cases below. - */ break; - case HRL_SUBJECT_GROUP: - gip = gifind_existing(rule->hr_subject_id); - KASSERT(gip != NULL, ("hrl_rule_add: gifind failed")); + case HRL_SUBJECT_TYPE_GROUP: + gip = rule->hr_subject.hs_gip; + KASSERT(gip != NULL, ("hrl_rule_add: NULL gip")); hrl_limit_add(&gip->gi_limits, rule); break; - case HRL_SUBJECT_LOGINCLASS: - lc = (struct loginclass *)(long)rule->hr_subject_id; + case HRL_SUBJECT_TYPE_LOGINCLASS: + lc = rule->hr_subject.hs_loginclass; + KASSERT(lc != NULL, ("hrl_rule_add: NULL loginclass")); hrl_limit_add(&lc->lc_limits, rule); break; - case HRL_SUBJECT_JAIL: - sx_xlock(&allprison_lock); - pr = prison_find(rule->hr_subject_id); - if (pr == NULL) { - sx_xunlock(&allprison_lock); - return (ESRCH); - } + case HRL_SUBJECT_TYPE_JAIL: + pr = rule->hr_subject.hs_prison; + KASSERT(pr != NULL, ("hrl_rule_add: NULL pr")); hrl_limit_add(&pr->pr_limits, rule); - sx_xunlock(&allprison_lock); break; default: - panic("hrl_rule_add_limits: unknown subject %d", - rule->hr_subject); + panic("hrl_rule_add_limits: unknown subject type %d", + rule->hr_subject_type); } /* * Now go through all the processes and add the new rule to the ones * it applies to. */ - sx_slock(&proctree_lock); + sx_assert(&allproc_lock, SA_LOCKED); FOREACH_PROC_IN_SYSTEM(p) { cred = p->p_ucred; - switch (rule->hr_subject) { - case HRL_SUBJECT_USER: - if (cred->cr_uid == rule->hr_subject_id || - cred->cr_ruid == rule->hr_subject_id) + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_USER: + if (cred->cr_uidinfo == rule->hr_subject.hs_uip || + cred->cr_ruidinfo == rule->hr_subject.hs_uip) break; continue; - case HRL_SUBJECT_GROUP: - if (groupmember(rule->hr_subject_id, cred)) + case HRL_SUBJECT_TYPE_GROUP: + if (groupmember(rule->hr_subject.hs_gip->gi_gid, cred)) break; continue; - case HRL_SUBJECT_LOGINCLASS: - lc = (struct loginclass *)(long)rule->hr_subject_id; /* XXX: This line is here to remove cc warning; investigate. */ - if (p->p_loginclass == lc) + case HRL_SUBJECT_TYPE_LOGINCLASS: + if (p->p_loginclass == rule->hr_subject.hs_loginclass) break; continue; - case HRL_SUBJECT_JAIL: + case HRL_SUBJECT_TYPE_JAIL: for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) - if (pr->pr_id == rule->hr_subject_id) + if (pr->pr_id == rule->hr_subject.hs_prison->pr_id) break; continue; default: - panic("hrl_rule_add_limits: unknown subject %d", - rule->hr_subject); + panic("hrl_rule_add_limits: unknown subject type %d", + rule->hr_subject_type); } hrl_limit_add(&p->p_limits, rule); } - sx_sunlock(&proctree_lock); return (0); } @@ -1148,15 +1272,10 @@ int error, found = 0; struct proc *p; - if (filter->hr_subject == HRL_SUBJECT_PROCESS && - filter->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED) { - sx_slock(&proctree_lock); - p = pfind(filter->hr_subject_id); - if (p == NULL) - return (ESRCH); - PROC_UNLOCK(p); + if (filter->hr_subject_type == HRL_SUBJECT_TYPE_PROCESS && + filter->hr_subject.hs_proc != NULL) { + p = filter->hr_subject.hs_proc; found = hrl_limit_remove_matching(&p->p_limits, filter); - sx_sunlock(&proctree_lock); if (found) return (0); return (ESRCH); @@ -1172,13 +1291,12 @@ (void *)&found); KASSERT(error == 0, ("gi_limits_foreach failed")); - sx_slock(&proctree_lock); + sx_assert(&allproc_lock, SA_LOCKED); FOREACH_PROC_IN_SYSTEM(p) { found += hrl_limit_remove_matching(&p->p_limits, filter); if (error == 0) found = 1; } - sx_sunlock(&proctree_lock); if (found) return (0); @@ -1191,25 +1309,52 @@ static void hrl_rule_to_sbuf(struct sbuf *sb, const struct hrl_rule *rule) { - if (rule->hr_subject == HRL_SUBJECT_LOGINCLASS) { - KASSERT(rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED, - ("rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED")); - sbuf_printf(sb, "%s:%s:%s:%s=%jd", - hrl_subject_name(rule->hr_subject), - ((struct loginclass *)(long)rule->hr_subject_id)->lc_name, - hrl_resource_name(rule->hr_resource), - hrl_action_name(rule->hr_action), - rule->hr_amount); - } else { - sbuf_printf(sb, "%s:%d:%s:%s=%jd", - hrl_subject_name(rule->hr_subject), - (int)rule->hr_subject_id, - hrl_resource_name(rule->hr_resource), - hrl_action_name(rule->hr_action), - rule->hr_amount); + + sbuf_printf(sb, "%s:", hrl_subject_type_name(rule->hr_subject_type)); + + switch (rule->hr_subject_type) { + case HRL_SUBJECT_TYPE_PROCESS: + if (rule->hr_subject.hs_proc == NULL) + sbuf_printf(sb, ":"); + else + sbuf_printf(sb, "%d:", rule->hr_subject.hs_proc->p_pid); + break; + case HRL_SUBJECT_TYPE_USER: + if (rule->hr_subject.hs_uip == NULL) + sbuf_printf(sb, ":"); + else + sbuf_printf(sb, "%d:", rule->hr_subject.hs_uip->ui_uid); + break; + case HRL_SUBJECT_TYPE_GROUP: + if (rule->hr_subject.hs_gip == NULL) + sbuf_printf(sb, ":"); + else + sbuf_printf(sb, "%d:", rule->hr_subject.hs_gip->gi_gid); + break; + case HRL_SUBJECT_TYPE_LOGINCLASS: + if (rule->hr_subject.hs_loginclass == NULL) + sbuf_printf(sb, ":"); + else + sbuf_printf(sb, "%s:", rule->hr_subject.hs_loginclass->lc_name); + break; + case HRL_SUBJECT_TYPE_JAIL: + if (rule->hr_subject.hs_prison == NULL) + sbuf_printf(sb, ":"); + else + sbuf_printf(sb, "%d:", rule->hr_subject.hs_prison->pr_id); + break; + default: + panic("hrl_rule_to_sbuf: unknown subject type %d", + rule->hr_subject_type); } - if (rule->hr_per != rule->hr_subject) - sbuf_printf(sb, "/%s", hrl_subject_name(rule->hr_per)); + + sbuf_printf(sb, "%s:%s=%jd", + hrl_resource_name(rule->hr_resource), + hrl_action_name(rule->hr_action), + rule->hr_amount); + + if (rule->hr_per != rule->hr_subject_type) + sbuf_printf(sb, "/%s", hrl_subject_type_name(rule->hr_per)); } /* @@ -1273,87 +1418,6 @@ return (sb); } -static int -hrl_get_usage_pid(struct thread *td, id_t pid, struct sbuf **outputsbuf) -{ - struct proc *p; - struct hrl_usage usage; - - if ((p = pfind(pid)) == NULL) { - if ((p = zpfind(pid)) == NULL) - return (ESRCH); - } - usage = p->p_usage; - PROC_UNLOCK(p); - - *outputsbuf = hrl_usage_to_sbuf(&usage); - - return (0); -} - -static int -hrl_get_usage_uid(struct thread *td, id_t uid, struct sbuf **outputsbuf) -{ - struct uidinfo *uip; - - uip = uifind_existing(uid); - if (uip == NULL) - return (ESRCH); - *outputsbuf = hrl_usage_to_sbuf(&uip->ui_usage); - uifree(uip); - - return (0); -} - -static int -hrl_get_usage_gid(struct thread *td, id_t gid, struct sbuf **outputsbuf) -{ - struct gidinfo *gip; - - if (!hrl_group_accounting) - return (EOPNOTSUPP); - - gip = gifind_existing(gid); - if (gip == NULL) - return (ESRCH); - *outputsbuf = hrl_usage_to_sbuf(&gip->gi_usage); - gifree(gip); - - return (0); -} - -static int -hrl_get_usage_lc(struct thread *td, int lcp, struct sbuf **outputsbuf) -{ - struct loginclass *lc; - - if (lcp == HRL_SUBJECT_ID_UNDEFINED) - return (EINVAL); - - lc = (struct loginclass *)lcp; - *outputsbuf = hrl_usage_to_sbuf(&lc->lc_usage); - - return (0); -} - -static int -hrl_get_usage_jid(struct thread *td, id_t jid, struct sbuf **outputsbuf) -{ - struct prison *pr; - - sx_xlock(&allprison_lock); - pr = prison_find(jid); - if (pr == NULL) { - sx_xunlock(&allprison_lock); - return (ENOENT); - } - *outputsbuf = hrl_usage_to_sbuf(&pr->pr_usage); - prison_free(pr); - sx_xunlock(&allprison_lock); - - return (0); -} - int hrl_get_usage(struct thread *td, struct hrl_get_usage_args *uap) { @@ -1361,6 +1425,11 @@ char *inputstr; struct hrl_rule *filter; struct sbuf *outputsbuf = NULL; + struct proc *p; + struct uidinfo *uip; + struct gidinfo *gip; + struct loginclass *lc; + struct prison *pr; error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); if (error) @@ -1371,30 +1440,51 @@ if (filter == NULL) return (EINVAL); - switch (filter->hr_subject) { - case HRL_SUBJECT_PROCESS: - error = hrl_get_usage_pid(td, filter->hr_subject_id, - &outputsbuf); + switch (filter->hr_subject_type) { + case HRL_SUBJECT_TYPE_PROCESS: + p = filter->hr_subject.hs_proc; + if (p == NULL) { + error = EINVAL; + goto out; + } + outputsbuf = hrl_usage_to_sbuf(&p->p_usage); break; - case HRL_SUBJECT_USER: - error = hrl_get_usage_uid(td, filter->hr_subject_id, - &outputsbuf); + case HRL_SUBJECT_TYPE_USER: + uip = filter->hr_subject.hs_uip; + if (uip == NULL) { + error = EINVAL; + goto out; + } + outputsbuf = hrl_usage_to_sbuf(&uip->ui_usage); break; - case HRL_SUBJECT_GROUP: - error = hrl_get_usage_gid(td, filter->hr_subject_id, - &outputsbuf); + case HRL_SUBJECT_TYPE_GROUP: + gip = filter->hr_subject.hs_gip; + if (gip == NULL) { + error = EINVAL; + goto out; + } + outputsbuf = hrl_usage_to_sbuf(&gip->gi_usage); break; - case HRL_SUBJECT_LOGINCLASS: - error = hrl_get_usage_lc(td, filter->hr_subject_id, - &outputsbuf); + case HRL_SUBJECT_TYPE_LOGINCLASS: + lc = filter->hr_subject.hs_loginclass; + if (lc == NULL) { + error = EINVAL; + goto out; + } + outputsbuf = hrl_usage_to_sbuf(&lc->lc_usage); break; - case HRL_SUBJECT_JAIL: - error = hrl_get_usage_jid(td, filter->hr_subject_id, - &outputsbuf); + case HRL_SUBJECT_TYPE_JAIL: + pr = filter->hr_subject.hs_prison; + if (pr == NULL) { + error = EINVAL; + goto out; + } + outputsbuf = hrl_usage_to_sbuf(&pr->pr_usage); break; default: error = EINVAL; } +out: hrl_rule_release(filter); if (error) return (error); @@ -1438,17 +1528,20 @@ if (error) return (error); + sx_slock(&allproc_lock); filter = hrl_rule_from_string(inputstr); free(inputstr, M_HRL); - if (filter == NULL) + if (filter == NULL) { + sx_sunlock(&allproc_lock); return (EINVAL); + } again: buf = malloc(bufsize, M_HRL, M_WAITOK); sb = sbuf_new(NULL, buf, bufsize, SBUF_FIXEDLEN); KASSERT(sb != NULL, ("sbuf_new failed")); - sx_slock(&proctree_lock); + sx_assert(&allproc_lock, SA_LOCKED); FOREACH_PROC_IN_SYSTEM(p) { mtx_lock(&hrl_lock); LIST_FOREACH(limit, &p->p_limits, hl_next) { @@ -1456,7 +1549,7 @@ * Non-process rules will be added to the buffer later. * Adding them here would result in duplicated output. */ - if (limit->hl_rule->hr_subject != HRL_SUBJECT_PROCESS) + if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_PROCESS) continue; if (!hrl_rule_matches(limit->hl_rule, filter)) continue; @@ -1465,7 +1558,6 @@ } mtx_unlock(&hrl_lock); } - sx_sunlock(&proctree_lock); mtx_lock(&hrl_lock); loginclass_limits_foreach(hrl_get_rules_callback, filter, sb); @@ -1488,6 +1580,7 @@ error = hrl_write_outbuf(sb, uap->outbufp, uap->outbuflen); hrl_rule_release(filter); + sx_sunlock(&allproc_lock); free(buf, M_HRL); return (error); } @@ -1501,30 +1594,33 @@ struct sbuf *sb; struct hrl_rule *filter; struct hrl_limit *limit; - struct proc *p; error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen); if (error) return (error); + sx_slock(&allproc_lock); filter = hrl_rule_from_string(inputstr); free(inputstr, M_HRL); - if (filter == NULL) + if (filter == NULL) { + sx_sunlock(&allproc_lock); return (EINVAL); + } - if (filter->hr_subject == HRL_SUBJECT_UNDEFINED) { + if (filter->hr_subject_type == HRL_SUBJECT_TYPE_UNDEFINED) { hrl_rule_release(filter); + sx_sunlock(&allproc_lock); >>> TRUNCATED FOR MAIL (1000 lines) <<< From trasz at FreeBSD.org Fri Oct 2 17:21:44 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 17:21:51 2009 Subject: PERFORCE change 169140 for review Message-ID: <200910021721.n92HLhi7054145@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169140 Change 169140 by trasz@trasz_victim on 2009/10/02 17:20:43 Partial IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/network.subr#7 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/faith#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/static_arp#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/stf#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/conf/files#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/flowtable.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/flowtable.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/route.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/pmc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/errors/backquote-error2.0#1 branch Differences ... ==== //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); #include #include @@ -82,7 +82,6 @@ STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -1043,7 +1042,7 @@ endword: if (syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); if (varnest != 0) { startlinno = plinno; @@ -1303,7 +1302,6 @@ parsebackq: { struct nodelist **nlpp; - int savepbq; union node *n; char *volatile str; struct jmploc jmploc; @@ -1311,11 +1309,9 @@ int savelen; int saveprompt; - savepbq = parsebackquote; if (setjmp(jmploc.loc)) { if (str) ckfree(str); - parsebackquote = 0; handler = savehandler; longjmp(handler->loc, 1); } @@ -1397,7 +1393,6 @@ nlpp = &(*nlpp)->next; *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); (*nlpp)->next = NULL; - parsebackquote = oldstyle; if (oldstyle) { saveprompt = doprompt; @@ -1433,7 +1428,6 @@ str = NULL; INTON; } - parsebackquote = savepbq; handler = savehandler; if (arinest || dblquote) USTPUTC(CTLBACKQ | CTLQUOTE, out); ==== //depot/projects/soc2009/trasz_limits/etc/network.subr#7 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $ +# $FreeBSD: src/etc/network.subr,v 1.203 2009/10/02 02:24:25 hrs Exp $ # # @@ -356,6 +356,16 @@ inet6) ${SYSCTL_N} net.inet6 > /dev/null 2>&1 ;; + ipx) + ${SYSCTL_N} net.ipx > /dev/null 2>&1 + ;; + atm) + if [ -x /sbin/atmconfig ]; then + /sbin/atmconfig diag list > /dev/null 2>&1 + else + return 1 + fi + ;; *) err 1 "afexists(): Unsupported address family: $_af" ;; ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#4 (text+ko) ==== @@ -2,7 +2,7 @@ # # Wait for the default route to be up # -# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $ +# $FreeBSD: src/etc/rc.d/defaultroute,v 1.9 2009/10/02 02:24:25 hrs Exp $ # # PROVIDE: defaultroute @@ -20,6 +20,8 @@ { local output carrier nocarrier nl + afexists inet || return 0 + # Return without waiting if we don't have dhcp interfaces or # if none of the dhcp interfaces is plugged in. dhcp_interfaces=`list_net_interfaces dhcp` ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/faith#2 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/etc/rc.d/faith,v 1.1 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/faith,v 1.3 2009/10/02 06:19:34 hrs Exp $ # # PROVIDE: faith ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.8 2009/10/02 02:24:25 hrs Exp $ # # PROVIDE: ip6addrctl @@ -9,6 +9,7 @@ # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="ip6addrctl" rcvar=`set_rcvar` @@ -23,6 +24,8 @@ ip6addrctl_prefer_ipv6() { + afexists inet6 || return 0 + ip6addrctl flush >/dev/null 2>&1 ip6addrctl add ::1/128 50 0 ip6addrctl add ::/0 40 1 @@ -34,6 +37,8 @@ ip6addrctl_prefer_ipv4() { + afexists inet6 || return 0 + ip6addrctl flush >/dev/null 2>&1 ip6addrctl add ::ffff:0:0/96 50 0 ip6addrctl add ::1/128 40 1 @@ -45,30 +50,27 @@ ip6addrctl_start() { - if ifconfig lo0 inet6 >/dev/null 2>&1; then - # We have IPv6 support in kernel. + afexists inet6 || return 0 - # install the policy of the address selection algorithm. - if [ -f /etc/ip6addrctl.conf ]; then - ip6addrctl flush >/dev/null 2>&1 - ip6addrctl install /etc/ip6addrctl.conf - checkyesno ip6addrctl_verbose && ip6addrctl + # install the policy of the address selection algorithm. + if [ -f /etc/ip6addrctl.conf ]; then + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl install /etc/ip6addrctl.conf + checkyesno ip6addrctl_verbose && ip6addrctl + else + if checkyesno ipv6_prefer; then + ip6addrctl_prefer_ipv6 else - if checkyesno ipv6_prefer; then - ip6addrctl_prefer_ipv6 - else - ip6addrctl_prefer_ipv4 - fi + ip6addrctl_prefer_ipv4 fi fi } ip6addrctl_stop() { - if ifconfig lo0 inet6 >/dev/null 2>&1; then - # We have IPv6 support in kernel. - ip6addrctl flush >/dev/null 2>&1 - fi + afexists inet6 || return 0 + + ip6addrctl flush >/dev/null 2>&1 } load_rc_config $name ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.148 2009/09/30 14:58:10 ume Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.150 2009/10/02 06:51:39 hrs Exp $ # # PROVIDE: netoptions @@ -26,29 +26,51 @@ netoptions_start() { - if checkyesno log_in_vain; then + local _af + + for _af in inet inet6; do + afexists ${_af} && eval netoptions_${_af} + done + [ -n "${_netoptions_initdone}" ] && echo '.' +} + +netoptions_inet() +{ + case ${log_in_vain} in + [12]) netoptions_init echo -n " log_in_vain=${log_in_vain}" - ${SYSCTL_W} net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - ${SYSCTL_W} net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - fi + ${SYSCTL_W} net.inet.tcp.log_in_vain=${log_in_vain} >/dev/null + ${SYSCTL_W} net.inet.udp.log_in_vain=${log_in_vain} >/dev/null + ;; + *) + ${SYSCTL_W} net.inet.tcp.log_in_vain=0 >/dev/null + ${SYSCTL_W} net.inet.udp.log_in_vain=0 >/dev/null + ;; + esac if checkyesno tcp_extensions; then + ${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null + else netoptions_init - echo -n ' rfc1323 extensions=NO' + echo -n ' rfc1323 extensions=${tcp_extensions}' ${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null fi - if ! checkyesno tcp_keepalive; then + if checkyesno tcp_keepalive; then + ${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null + else netoptions_init - echo -n ' TCP keepalive=NO' + echo -n ' TCP keepalive=${tcp_keepalive}' ${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null fi if checkyesno tcp_drop_synfin; then netoptions_init - echo -n ' drop SYN+FIN packets=YES' + echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}' ${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null + else + ${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null fi case ${ip_portrange_first} in @@ -66,17 +88,17 @@ ${SYSCTL_W} net.inet.ip.portrange.last=$ip_portrange_last >/dev/null ;; esac +} - if afexists inet6; then - if checkyesno ipv6_ipv4mapping; then - ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null - else - echo -n " no-ipv4-mapped-ipv6" - ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null - fi +netoptions_inet6() +{ + if checkyesno ipv6_ipv4mapping; then + netoptions_init + echo -n " ipv4-mapped-ipv6=${ipv6_ipv4mapping}" + ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null + else + ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null fi - - [ -n "${_netoptions_initdone}" ] && echo '.' } load_rc_config $name ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#4 (text+ko) ==== @@ -2,7 +2,7 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.150 2009/09/30 14:58:10 ume Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.151 2009/10/02 02:28:59 hrs Exp $ # # PROVIDE: routing @@ -27,8 +27,24 @@ routing_stop() { + local _af + static_stop "$@" - route -n flush + for _af in inet inet6; do + afexists ${_af} && eval routing_stop_${_af} + done +} + +routing_stop_inet() +{ + route -n flush -inet +} + +routing_stop_inet6() +{ + local i + + route -n flush -inet6 for i in ${ipv6_network_interfaces}; do ifconfig $i inet6 -defaultif done @@ -40,22 +56,12 @@ _af=$1 case ${_af} in - inet) - do_static inet add + inet|inet6|atm) + do_static add ${_af} ;; - inet6) - do_static inet6 add + "") + do_static add inet inet6 atm ;; - atm) - do_static atm add - ;; - *) - do_static inet add - if afexists inet6; then - do_static inet6 add - fi - do_static atm add - ;; esac } @@ -65,35 +71,27 @@ _af=$1 case ${_af} in - inet) - do_static inet delete + inet|inet6|atm) + do_static delete ${_af} ;; - inet6) - do_static inet6 delete + "") + do_static delete inet inet6 atm ;; - atm) - do_static atm delete - ;; - *) - do_static inet delete - if afexists inet6; then - do_static inet6 delete - fi - do_static atm delete - ;; esac } do_static() { local _af _action - _af=$1 - _action=$2 + _action=$1 - eval $1_static $2 + shift + for _af in "$@"; do + afexists ${_af} && eval static_${_af} ${_action} + done } -inet_static() +static_inet() { local _action _action=$1 @@ -115,7 +113,7 @@ fi } -inet6_static() +static_inet6() { local _action i _action=$1 @@ -222,9 +220,9 @@ esac } -atm_static() +static_atm() { - local _action i + local _action i route_args _action=$1 if [ -n "${natm_static_routes}" ]; then @@ -246,61 +244,93 @@ options_start() { + local _af + + for _af in inet inet6 ipx; do + afexists ${_af} && eval options_${_af} + done + [ -n "${_ropts_initdone}" ] && echo '.' +} + +options_inet() +{ if checkyesno icmp_bmcastecho; then ropts_init echo -n ' broadcast ping responses=YES' - sysctl net.inet.icmp.bmcastecho=1 >/dev/null + ${SYSCTL_W} net.inet.icmp.bmcastecho=1 > /dev/null + else + ${SYSCTL_W} net.inet.icmp.bmcastecho=0 > /dev/null fi if checkyesno icmp_drop_redirect; then ropts_init echo -n ' ignore ICMP redirect=YES' - sysctl net.inet.icmp.drop_redirect=1 >/dev/null + ${SYSCTL_W} net.inet.icmp.drop_redirect=1 > /dev/null + else + ${SYSCTL_W} net.inet.icmp.drop_redirect=0 > /dev/null fi if checkyesno icmp_log_redirect; then ropts_init echo -n ' log ICMP redirect=YES' - sysctl net.inet.icmp.log_redirect=1 >/dev/null + ${SYSCTL_W} net.inet.icmp.log_redirect=1 > /dev/null + else + ${SYSCTL_W} net.inet.icmp.log_redirect=0 > /dev/null fi if checkyesno gateway_enable; then ropts_init echo -n ' IPv4 gateway=YES' - sysctl net.inet.ip.forwarding=1 >/dev/null + ${SYSCTL_W} net.inet.ip.forwarding=1 > /dev/null + else + ${SYSCTL_W} net.inet.ip.forwarding=0 > /dev/null fi - if checkyesno ipv6_gateway_enable; then - ropts_init - echo -n ' IPv6 gateway=YES' - sysctl net.inet6.ip6.forwarding=1 >/dev/null - fi - if checkyesno forward_sourceroute; then ropts_init echo -n ' do source routing=YES' - sysctl net.inet.ip.sourceroute=1 >/dev/null + ${SYSCTL_W} net.inet.ip.sourceroute=1 > /dev/null + else + ${SYSCTL_W} net.inet.ip.sourceroute=0 > /dev/null fi if checkyesno accept_sourceroute; then ropts_init echo -n ' accept source routing=YES' - sysctl net.inet.ip.accept_sourceroute=1 >/dev/null + ${SYSCTL_W} net.inet.ip.accept_sourceroute=1 > /dev/null + else + ${SYSCTL_W} net.inet.ip.accept_sourceroute=0 > /dev/null fi - if checkyesno ipxgateway_enable; then + if checkyesno arpproxy_all; then ropts_init - echo -n ' IPX gateway=YES' - sysctl net.ipx.ipx.ipxforwarding=1 >/dev/null + echo -n ' ARP proxyall=YES' + ${SYSCTL_W} net.link.ether.inet.proxyall=1 > /dev/null + else + ${SYSCTL_W} net.link.ether.inet.proxyall=0 > /dev/null fi +} - if checkyesno arpproxy_all; then +options_inet6() +{ + if checkyesno ipv6_gateway_enable; then ropts_init - echo -n ' ARP proxyall=YES' - sysctl net.link.ether.inet.proxyall=1 >/dev/null + echo -n ' IPv6 gateway=YES' + ${SYSCTL_W} net.inet6.ip6.forwarding=1 > /dev/null + else + ${SYSCTL_W} net.inet6.ip6.forwarding=0 > /dev/null fi +} - [ -n "${_ropts_initdone}" ] && echo '.' +options_ipx() +{ + if checkyesno ipxgateway_enable; then + ropts_init + echo -n ' IPX gateway=YES' + ${SYSCTL_W} net.ipx.ipx.ipxforwarding=1 > /dev/null + else + ${SYSCTL_W} net.ipx.ipx.ipxforwarding=0 > /dev/null + fi } load_rc_config $name ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/static_arp#2 (text+ko) ==== @@ -26,7 +26,7 @@ # # Configure static ARP table # -# $FreeBSD: src/etc/rc.d/static_arp,v 1.2 2009/08/25 20:05:51 delphij Exp $ +# $FreeBSD: src/etc/rc.d/static_arp,v 1.4 2009/10/02 06:19:34 hrs Exp $ # # PROVIDE: static_arp @@ -34,6 +34,7 @@ # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="static_arp" start_cmd="static_arp_start" ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/stf#2 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/etc/rc.d/stf,v 1.1 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/stf,v 1.3 2009/10/02 06:19:34 hrs Exp $ # # PROVIDE: stf ==== //depot/projects/soc2009/trasz_limits/sys/arm/arm/cpufunc.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.27 2009/07/21 08:29:19 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.28 2009/10/02 11:10:05 rpaulo Exp $"); #include #include @@ -83,15 +83,6 @@ #include #endif -#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) -#include -#endif - -#if defined(PERFCTRS) -struct arm_pmc_funcs *arm_pmc; -#endif - /* PRIMARY CACHE VARIABLES */ int arm_picache_size; int arm_picache_line_size; @@ -1128,10 +1119,6 @@ : "r" (BCUCTL_E0|BCUCTL_E1|BCUCTL_EV)); cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - /* * i80200 errata: Step-A0 and A1 have a bug where * D$ dirty bits are not cleared on "invalidate by @@ -1165,10 +1152,6 @@ PMNC_CC_IF)); cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); @@ -1179,10 +1162,6 @@ #if defined(CPU_XSCALE_81342) if (cputype == CPU_ID_81342) { cpufuncs = xscalec3_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); @@ -1196,10 +1175,6 @@ (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) { cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); @@ -1215,10 +1190,6 @@ cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) { cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); ==== //depot/projects/soc2009/trasz_limits/sys/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1473 2009/09/28 07:32:11 thompsa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1474 2009/10/02 12:47:01 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2670,12 +2670,12 @@ vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard -xdr/xdr.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_array.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_mbuf.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_mem.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver +xdr/xdr.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_array.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_mbuf.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_mem.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd # gnu/fs/xfs/xfs_alloc.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \ ==== //depot/projects/soc2009/trasz_limits/sys/i386/i386/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.297 2009/07/29 08:49:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.298 2009/10/01 22:05:38 kmacy Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -270,11 +270,7 @@ /* * XXX XEN need to check on PSL_USER is handled */ -#ifdef XEN - td2->td_md.md_saved_flags = 0; -#else td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; -#endif /* * Now, cpu_switch() can schedule the new process. * pcb_esp is loaded pointing to the cpu_switch() stack frame @@ -446,11 +442,7 @@ /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; -#ifdef XEN - td->td_md.md_saved_flags = 0; -#else td->td_md.md_saved_flags = PSL_KERNEL | PSL_I; -#endif } /* ==== //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.156 2009/09/30 16:34:50 avg Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.157 2009/10/01 22:05:38 kmacy Exp $ */ /* @@ -49,8 +49,8 @@ extern void xen_load_cr3(u_int data); extern void xen_tlb_flush(void); extern void xen_invlpg(u_int addr); -extern int xen_save_and_cli(void); -extern void xen_restore_flags(u_int eflags); +extern void write_eflags(u_int eflags); +extern u_int read_eflags(void); #endif struct region_descriptor; @@ -293,7 +293,11 @@ } static __inline u_int +#ifdef XEN +_read_eflags(void) +#else read_eflags(void) +#endif { u_int ef; @@ -335,7 +339,11 @@ } static __inline void +#ifdef XEN +_write_eflags(u_int ef) +#else write_eflags(u_int ef) +#endif { __asm __volatile("pushl %0; popfl" : : "r" (ef)); } @@ -653,23 +661,15 @@ { register_t eflags; -#ifdef XEN - eflags = xen_save_and_cli(); -#else eflags = read_eflags(); disable_intr(); -#endif return (eflags); } static __inline void intr_restore(register_t eflags) { -#ifdef XEN - xen_restore_flags(eflags); -#else write_eflags(eflags); -#endif } #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ ==== //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_machdep.c#2 (text+ko) ==== @@ -31,11 +31,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.19 2009/04/01 17:06:28 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.20 2009/10/01 22:05:38 kmacy Exp $"); #include #include #include +#include #include #include #include @@ -101,6 +102,7 @@ void ni_cli(void) { + CTR0(KTR_SPARE2, "ni_cli disabling interrupts"); __asm__("pushl %edx;" "pushl %eax;" ); @@ -345,33 +347,53 @@ PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0); } -void -xen_restore_flags(u_int eflags) +#ifdef KTR +static __inline u_int +rebp(void) { - if (eflags > 1) - eflags = ((eflags & PSL_I) == 0); + u_int data; - __restore_flags(eflags); + __asm __volatile("movl 4(%%ebp),%0" : "=r" (data)); + return (data); } +#endif -int -xen_save_and_cli(void) +u_int +read_eflags(void) { - int eflags; - - __save_and_cli(eflags); + vcpu_info_t *_vcpu; + u_int eflags; + + eflags = _read_eflags(); + _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; + if (_vcpu->evtchn_upcall_mask) + eflags &= ~PSL_I; + return (eflags); } void +write_eflags(u_int eflags) +{ + u_int intr; + + CTR2(KTR_SPARE2, "%x xen_restore_flags eflags %x", rebp(), eflags); + intr = ((eflags & PSL_I) == 0); + __restore_flags(intr); + _write_eflags(eflags); +} + +void xen_cli(void) { + CTR1(KTR_SPARE2, "%x xen_cli disabling interrupts", rebp()); __cli(); } void xen_sti(void) { + CTR1(KTR_SPARE2, "%x xen_sti enabling interrupts", rebp()); __sti(); } ==== //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.24 2009/09/11 22:49:34 jkim Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.25 2009/10/01 20:56:15 jkim Exp $ .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" .error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms" @@ -27,6 +27,10 @@ KMOD= acpi # ACPI CA sources +SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c +SRCS+= dbutils.c dbxface.c +SRCS+= dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c +SRCS+= dmresrcs.c dmutils.c dmwalk.c SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c SRCS+= dsutils.c dswexec.c dswload.c dswscope.c dswstate.c SRCS+= evevent.c evgpe.c evgpeblk.c evmisc.c evregion.c evrgnini.c evsci.c @@ -69,12 +73,6 @@ # This obviously needs a better and more structural fix. SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h -# Debugging support -DBSRC= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c -DBSRC+= dbutils.c dbxface.c -DBSRC+= dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c -DBSRC+= dmresrcs.c dmutils.c dmwalk.c - .if !defined(KERNBUILDDIR) .if KTR CFLAGS+=-DKTR @@ -87,7 +85,6 @@ .endif .if ACPI_DEBUG CFLAGS+=-DACPI_DEBUG -SRCS+= ${DBSRC} opt_ddb.h: Makefile echo "#define DDB 1" > ${.TARGET} .else @@ -98,10 +95,12 @@ # Machine-specific code such as sleep/wakeup SRCS+= acpi_machdep.c acpi_wakecode.h acpi_wakeup.c -.if ${MACHINE} == "i386" -SRCS+= madt.c assym.s +SRCS+= assym.s madt.c +CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o +.if ${MACHINE_ARCH} == "amd64" +SRCS+= opt_global.h +CLEANFILES+= acpi_wakedata.h .endif -CLEANFILES+= acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin ${DBSRC:.c=.o} acpi_wakecode.h: acpi_wakecode.S assym.s ${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \ ==== //depot/projects/soc2009/trasz_limits/sys/net/flowtable.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/net/flowtable.c,v 1.20 2009/08/28 07:01:09 qingli Exp $"); +__FBSDID("$FreeBSD: src/sys/net/flowtable.c,v 1.21 2009/10/01 20:32:29 qingli Exp $"); #include #include @@ -830,7 +830,7 @@ } static void -flowtable_free_stale(struct flowtable *ft) +flowtable_free_stale(struct flowtable *ft, struct rtentry *rt) { int curbit = 0, count; struct flentry *fle, **flehead, *fleprev; @@ -866,8 +866,14 @@ curbit); } #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From trasz at FreeBSD.org Fri Oct 2 17:21:44 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 17:22:03 2009 Subject: PERFORCE change 169141 for review Message-ID: <200910021721.n92HLhF8054150@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169141 Change 169141 by trasz@trasz_victim on 2009/10/02 17:21:01 Style fix. Affected files ... .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#24 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#24 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include #include #include @@ -36,7 +38,6 @@ #include #include #include -#include #define HRL_DEFAULT_BUFSIZE 4096 From stas at FreeBSD.org Fri Oct 2 17:54:20 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Fri Oct 2 17:54:26 2009 Subject: PERFORCE change 169145 for review Message-ID: <200910021754.n92HsJXF056485@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169145 Change 169145 by stas@stas_yandex on 2009/10/02 17:54:11 - Other regression tests fixes. Affected files ... .. //depot/projects/valgrind/memcheck/tests/Makefile.am#7 edit .. //depot/projects/valgrind/memcheck/tests/pointer-trace.stderr.exp#5 edit .. //depot/projects/valgrind/memcheck/tests/sigkill.stderr.exp-freebsd#1 add .. //depot/projects/valgrind/memcheck/tests/x86/Makefile.am#6 edit Differences ... ==== //depot/projects/valgrind/memcheck/tests/Makefile.am#7 (text+ko) ==== @@ -143,7 +143,8 @@ sh-mem-random.stderr.exp sh-mem-random.stdout.exp64 \ sh-mem-random.stdout.exp sh-mem-random.vgtest \ sigaltstack.stderr.exp sigaltstack.vgtest \ - sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.vgtest \ + sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.stderr.exp-freebsd \ + sigkill.vgtest \ signal2.stderr.exp signal2.stdout.exp signal2.vgtest \ sigprocmask.stderr.exp sigprocmask.stderr.exp2 sigprocmask.vgtest \ strchr.stderr.exp strchr.stderr.exp2 strchr.stderr.exp-darwin \ ==== //depot/projects/valgrind/memcheck/tests/pointer-trace.stderr.exp#5 (text+ko) ==== @@ -1,4 +1,4 @@ 1,000 bytes in 1 blocks are definitely lost in loss record ... of ... at 0x........: malloc (vg_replace_malloc.c:...) - by 0x........: main (pointer-trace.c:86) + by 0x........: main (pointer-trace.c:90) ==== //depot/projects/valgrind/memcheck/tests/x86/Makefile.am#6 (text+ko) ==== @@ -34,6 +34,7 @@ pushfpopf \ pushfw_x86 \ pushpopmem \ + sse_memory \ tronical \ xor-undef-x86 From truncs at FreeBSD.org Fri Oct 2 20:23:08 2009 From: truncs at FreeBSD.org (Aditya Sarawgi) Date: Fri Oct 2 20:23:15 2009 Subject: PERFORCE change 169156 for review Message-ID: <200910022023.n92KN7PY070401@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169156 Change 169156 by truncs@aditya on 2009/10/02 20:22:14 IFC. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/NOTES#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.amd64#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.i386#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu_util.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/age/if_age.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_tpublic.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lindev/full.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twe.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/param.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/init_main.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/Makefile#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/lindev/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_var.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/route.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_proto.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/key.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/pci/intpm.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sun4v/include/param.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/ata.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/bus.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/event.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/kbio.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/mman.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/param.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/pmc.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/smp.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sx.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/syscall.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/systm.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/vnode.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/sequences#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_scs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_stress.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm_mmap.c#4 integrate Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,20 +25,42 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.21 2009/06/05 18:44:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.23 2009/09/27 14:00:16 jkim Exp $"); #include #include #include #include #include +#include +#include #include +#include +#include #include #include +/* + * APM driver emulation + */ + +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include + SYSCTL_DECL(_debug_acpi); int acpi_resume_beep; @@ -50,7 +72,432 @@ TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); static int intr_model = ACPI_INTR_PIC; -static struct apm_clone_data acpi_clone; +static int apm_active; +static struct clonedevs *apm_clones; + +MALLOC_DEFINE(M_APMDEV, "apmdev", "APM device emulation"); + +static d_open_t apmopen; +static d_close_t apmclose; +static d_write_t apmwrite; +static d_ioctl_t apmioctl; +static d_poll_t apmpoll; +static d_kqfilter_t apmkqfilter; +static void apmreadfiltdetach(struct knote *kn); +static int apmreadfilt(struct knote *kn, long hint); +static struct filterops apm_readfiltops = { + .f_isfd = 1, + .f_detach = apmreadfiltdetach, + .f_event = apmreadfilt, +}; + +static struct cdevsw apm_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_TRACKCLOSE | D_NEEDMINOR, + .d_open = apmopen, + .d_close = apmclose, + .d_write = apmwrite, + .d_ioctl = apmioctl, + .d_poll = apmpoll, + .d_name = "apm", + .d_kqfilter = apmkqfilter +}; + +static int +acpi_capm_convert_battstate(struct acpi_battinfo *battp) +{ + int state; + + state = APM_UNKNOWN; + + if (battp->state & ACPI_BATT_STAT_DISCHARG) { + if (battp->cap >= 50) + state = 0; /* high */ + else + state = 1; /* low */ + } + if (battp->state & ACPI_BATT_STAT_CRITICAL) + state = 2; /* critical */ + if (battp->state & ACPI_BATT_STAT_CHARGING) + state = 3; /* charging */ + + /* If still unknown, determine it based on the battery capacity. */ + if (state == APM_UNKNOWN) { + if (battp->cap >= 50) + state = 0; /* high */ + else + state = 1; /* low */ + } + + return (state); +} + +static int +acpi_capm_convert_battflags(struct acpi_battinfo *battp) +{ + int flags; + + flags = 0; + + if (battp->cap >= 50) + flags |= APM_BATT_HIGH; + else { + if (battp->state & ACPI_BATT_STAT_CRITICAL) + flags |= APM_BATT_CRITICAL; + else + flags |= APM_BATT_LOW; + } + if (battp->state & ACPI_BATT_STAT_CHARGING) + flags |= APM_BATT_CHARGING; + if (battp->state == ACPI_BATT_STAT_NOT_PRESENT) + flags = APM_BATT_NOT_PRESENT; + + return (flags); +} + +static int +acpi_capm_get_info(apm_info_t aip) +{ + int acline; + struct acpi_battinfo batt; + + aip->ai_infoversion = 1; + aip->ai_major = 1; + aip->ai_minor = 2; + aip->ai_status = apm_active; + aip->ai_capabilities= 0xff00; /* unknown */ + + if (acpi_acad_get_acline(&acline)) + aip->ai_acline = APM_UNKNOWN; /* unknown */ + else + aip->ai_acline = acline; /* on/off */ + + if (acpi_battery_get_battinfo(NULL, &batt) != 0) { + aip->ai_batt_stat = APM_UNKNOWN; + aip->ai_batt_life = APM_UNKNOWN; + aip->ai_batt_time = -1; /* unknown */ + aip->ai_batteries = ~0U; /* unknown */ + } else { + aip->ai_batt_stat = acpi_capm_convert_battstate(&batt); + aip->ai_batt_life = batt.cap; + aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60; + aip->ai_batteries = acpi_battery_get_units(); + } + + return (0); +} + +static int +acpi_capm_get_pwstatus(apm_pwstatus_t app) +{ + device_t dev; + int acline, unit, error; + struct acpi_battinfo batt; + + if (app->ap_device != PMDV_ALLDEV && + (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL)) + return (1); + + if (app->ap_device == PMDV_ALLDEV) + error = acpi_battery_get_battinfo(NULL, &batt); + else { + unit = app->ap_device - PMDV_BATT0; + dev = devclass_get_device(devclass_find("battery"), unit); + if (dev != NULL) + error = acpi_battery_get_battinfo(dev, &batt); + else + error = ENXIO; + } + if (error) + return (1); + + app->ap_batt_stat = acpi_capm_convert_battstate(&batt); + app->ap_batt_flag = acpi_capm_convert_battflags(&batt); + app->ap_batt_life = batt.cap; + app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60; + + if (acpi_acad_get_acline(&acline)) + app->ap_acline = APM_UNKNOWN; + else + app->ap_acline = acline; /* on/off */ + + return (0); +} + +/* Create single-use devices for /dev/apm and /dev/apmctl. */ +static void +apm_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) +{ + int ctl_dev, unit; + + if (*dev != NULL) + return; + if (strcmp(name, "apmctl") == 0) + ctl_dev = TRUE; + else if (strcmp(name, "apm") == 0) + ctl_dev = FALSE; + else + return; + + /* Always create a new device and unit number. */ + unit = -1; + if (clone_create(&apm_clones, &apm_cdevsw, &unit, dev, 0)) { + if (ctl_dev) { + *dev = make_dev(&apm_cdevsw, unit, + UID_ROOT, GID_OPERATOR, 0660, "apmctl%d", unit); + } else { + *dev = make_dev(&apm_cdevsw, unit, + UID_ROOT, GID_OPERATOR, 0664, "apm%d", unit); + } + if (*dev != NULL) { + dev_ref(*dev); + (*dev)->si_flags |= SI_CHEAPCLONE; + } + } +} + +/* Create a struct for tracking per-device suspend notification. */ +static struct apm_clone_data * +apm_create_clone(struct cdev *dev, struct acpi_softc *acpi_sc) +{ + struct apm_clone_data *clone; + + clone = malloc(sizeof(*clone), M_APMDEV, M_WAITOK); + clone->cdev = dev; + clone->acpi_sc = acpi_sc; + clone->notify_status = APM_EV_NONE; + bzero(&clone->sel_read, sizeof(clone->sel_read)); + knlist_init_mtx(&clone->sel_read.si_note, &acpi_mutex); + + /* + * The acpi device is always managed by devd(8) and is considered + * writable (i.e., ack is required to allow suspend to proceed.) + */ + if (strcmp("acpi", devtoname(dev)) == 0) + clone->flags = ACPI_EVF_DEVD | ACPI_EVF_WRITE; + else + clone->flags = ACPI_EVF_NONE; + + ACPI_LOCK(acpi); + STAILQ_INSERT_TAIL(&acpi_sc->apm_cdevs, clone, entries); + ACPI_UNLOCK(acpi); + return (clone); +} + +static int +apmopen(struct cdev *dev, int flag, int fmt, struct thread *td) +{ + struct acpi_softc *acpi_sc; + struct apm_clone_data *clone; + + acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); + clone = apm_create_clone(dev, acpi_sc); + dev->si_drv1 = clone; + + /* If the device is opened for write, record that. */ + if ((flag & FWRITE) != 0) + clone->flags |= ACPI_EVF_WRITE; + + return (0); +} + +static int +apmclose(struct cdev *dev, int flag, int fmt, struct thread *td) +{ + struct apm_clone_data *clone; + struct acpi_softc *acpi_sc; + + clone = dev->si_drv1; + acpi_sc = clone->acpi_sc; + + /* We are about to lose a reference so check if suspend should occur */ + if (acpi_sc->acpi_next_sstate != 0 && + clone->notify_status != APM_EV_ACKED) + acpi_AckSleepState(clone, 0); + + /* Remove this clone's data from the list and free it. */ + ACPI_LOCK(acpi); + STAILQ_REMOVE(&acpi_sc->apm_cdevs, clone, apm_clone_data, entries); + knlist_destroy(&clone->sel_read.si_note); + ACPI_UNLOCK(acpi); + free(clone, M_APMDEV); + destroy_dev_sched(dev); + return (0); +} + +static int +apmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) +{ + int error; + struct apm_clone_data *clone; + struct acpi_softc *acpi_sc; + struct apm_info info; + struct apm_event_info *ev_info; + apm_info_old_t aiop; + + error = 0; + clone = dev->si_drv1; + acpi_sc = clone->acpi_sc; + + switch (cmd) { + case APMIO_SUSPEND: + if ((flag & FWRITE) == 0) + return (EPERM); + if (acpi_sc->acpi_next_sstate == 0) { + if (acpi_sc->acpi_suspend_sx != ACPI_STATE_S5) { + error = acpi_ReqSleepState(acpi_sc, + acpi_sc->acpi_suspend_sx); + } else { + printf( + "power off via apm suspend not supported\n"); + error = ENXIO; + } + } else + error = acpi_AckSleepState(clone, 0); + break; + case APMIO_STANDBY: + if ((flag & FWRITE) == 0) + return (EPERM); + if (acpi_sc->acpi_next_sstate == 0) { + if (acpi_sc->acpi_standby_sx != ACPI_STATE_S5) { + error = acpi_ReqSleepState(acpi_sc, + acpi_sc->acpi_standby_sx); + } else { + printf( + "power off via apm standby not supported\n"); + error = ENXIO; + } + } else + error = acpi_AckSleepState(clone, 0); + break; + case APMIO_NEXTEVENT: + printf("apm nextevent start\n"); + ACPI_LOCK(acpi); + if (acpi_sc->acpi_next_sstate != 0 && clone->notify_status == + APM_EV_NONE) { + ev_info = (struct apm_event_info *)addr; + if (acpi_sc->acpi_next_sstate <= ACPI_STATE_S3) + ev_info->type = PMEV_STANDBYREQ; + else + ev_info->type = PMEV_SUSPENDREQ; + ev_info->index = 0; + clone->notify_status = APM_EV_NOTIFIED; + printf("apm event returning %d\n", ev_info->type); + } else + error = EAGAIN; + ACPI_UNLOCK(acpi); + break; + case APMIO_GETINFO_OLD: + if (acpi_capm_get_info(&info)) + error = ENXIO; + aiop = (apm_info_old_t)addr; + aiop->ai_major = info.ai_major; + aiop->ai_minor = info.ai_minor; + aiop->ai_acline = info.ai_acline; + aiop->ai_batt_stat = info.ai_batt_stat; + aiop->ai_batt_life = info.ai_batt_life; + aiop->ai_status = info.ai_status; + break; + case APMIO_GETINFO: + if (acpi_capm_get_info((apm_info_t)addr)) + error = ENXIO; + break; + case APMIO_GETPWSTATUS: + if (acpi_capm_get_pwstatus((apm_pwstatus_t)addr)) + error = ENXIO; + break; + case APMIO_ENABLE: + if ((flag & FWRITE) == 0) + return (EPERM); + apm_active = 1; + break; + case APMIO_DISABLE: + if ((flag & FWRITE) == 0) + return (EPERM); + apm_active = 0; + break; + case APMIO_HALTCPU: + break; + case APMIO_NOTHALTCPU: + break; + case APMIO_DISPLAY: + if ((flag & FWRITE) == 0) + return (EPERM); + break; + case APMIO_BIOS: + if ((flag & FWRITE) == 0) + return (EPERM); + bzero(addr, sizeof(struct apm_bios_arg)); + break; + default: + error = EINVAL; + break; + } + + return (error); +} + +static int +apmwrite(struct cdev *dev, struct uio *uio, int ioflag) +{ + return (uio->uio_resid); +} + +static int +apmpoll(struct cdev *dev, int events, struct thread *td) +{ + struct apm_clone_data *clone; + int revents; + + revents = 0; + ACPI_LOCK(acpi); + clone = dev->si_drv1; + if (clone->acpi_sc->acpi_next_sstate) + revents |= events & (POLLIN | POLLRDNORM); + else + selrecord(td, &clone->sel_read); + ACPI_UNLOCK(acpi); + return (revents); +} + +static int +apmkqfilter(struct cdev *dev, struct knote *kn) +{ + struct apm_clone_data *clone; + + ACPI_LOCK(acpi); + clone = dev->si_drv1; + kn->kn_hook = clone; + kn->kn_fop = &apm_readfiltops; + knlist_add(&clone->sel_read.si_note, kn, 0); + ACPI_UNLOCK(acpi); + return (0); +} + +static void +apmreadfiltdetach(struct knote *kn) +{ + struct apm_clone_data *clone; + + ACPI_LOCK(acpi); + clone = kn->kn_hook; + knlist_remove(&clone->sel_read.si_note, kn, 0); + ACPI_UNLOCK(acpi); +} + +static int +apmreadfilt(struct knote *kn, long hint) +{ + struct apm_clone_data *clone; + int sleeping; + + ACPI_LOCK(acpi); + clone = kn->kn_hook; + sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0; + ACPI_UNLOCK(acpi); + return (sleeping); +} int acpi_machdep_init(device_t dev) @@ -59,14 +506,11 @@ sc = devclass_get_softc(devclass_find("acpi"), 0); - /* Create a fake clone for /dev/acpi. */ + /* Create a clone for /dev/acpi also. */ STAILQ_INIT(&sc->apm_cdevs); - acpi_clone.cdev = sc->acpi_dev_t; - acpi_clone.acpi_sc = sc; - ACPI_LOCK(acpi); - STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries); - ACPI_UNLOCK(acpi); - sc->acpi_clone = &acpi_clone; + sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc); + clone_setup(&apm_clones); + EVENTHANDLER_REGISTER(dev_clone, apm_clone, 0, 1000); acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) @@ -100,6 +544,246 @@ } /* + * Support for mapping ACPI tables during early boot. Currently this + * uses the crashdump map to map each table. However, the crashdump + * map is created in pmap_bootstrap() right after the direct map, so + * we should be able to just use pmap_mapbios() here instead. + * + * This makes the following assumptions about how we use this KVA: + * pages 0 and 1 are used to map in the header of each table found via + * the RSDT or XSDT and pages 2 to n are used to map in the RSDT or + * XSDT. This has to use 2 pages for the table headers in case a + * header spans a page boundary. + * + * XXX: We don't ensure the table fits in the available address space + * in the crashdump map. + */ + +/* + * Map some memory using the crashdump map. 'offset' is an offset in + * pages into the crashdump map to use for the start of the mapping. + */ +static void * +table_map(vm_paddr_t pa, int offset, vm_offset_t length) +{ + vm_offset_t va, off; + void *data; + + off = pa & PAGE_MASK; + length = roundup(length + off, PAGE_SIZE); + pa = pa & PG_FRAME; + va = (vm_offset_t)pmap_kenter_temporary(pa, offset) + + (offset * PAGE_SIZE); + data = (void *)(va + off); + length -= PAGE_SIZE; + while (length > 0) { + va += PAGE_SIZE; + pa += PAGE_SIZE; + length -= PAGE_SIZE; + pmap_kenter(va, pa); + invlpg(va); + } + return (data); +} + +/* Unmap memory previously mapped with table_map(). */ +static void +table_unmap(void *data, vm_offset_t length) +{ + vm_offset_t va, off; + + va = (vm_offset_t)data; + off = va & PAGE_MASK; + length = roundup(length + off, PAGE_SIZE); + va &= ~PAGE_MASK; + while (length > 0) { + pmap_kremove(va); + invlpg(va); + va += PAGE_SIZE; + length -= PAGE_SIZE; + } +} + +/* + * Map a table at a given offset into the crashdump map. It first + * maps the header to determine the table length and then maps the + * entire table. + */ +static void * +map_table(vm_paddr_t pa, int offset, const char *sig) +{ + ACPI_TABLE_HEADER *header; + vm_offset_t length; + void *table; + + header = table_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); + if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) { + table_unmap(header, sizeof(ACPI_TABLE_HEADER)); + return (NULL); + } + length = header->Length; + table_unmap(header, sizeof(ACPI_TABLE_HEADER)); + table = table_map(pa, offset, length); + if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { + if (bootverbose) + printf("ACPI: Failed checksum for table %s\n", sig); + table_unmap(table, length); + return (NULL); + } + return (table); +} + +/* + * See if a given ACPI table is the requested table. Returns the + * length of the able if it matches or zero on failure. + */ +static int +probe_table(vm_paddr_t address, const char *sig) +{ + ACPI_TABLE_HEADER *table; + + table = table_map(address, 0, sizeof(ACPI_TABLE_HEADER)); + if (table == NULL) { + if (bootverbose) + printf("ACPI: Failed to map table at 0x%jx\n", + (uintmax_t)address); + return (0); + } + if (bootverbose) + printf("Table '%.4s' at 0x%jx\n", table->Signature, + (uintmax_t)address); + + if (strncmp(table->Signature, sig, ACPI_NAME_SIZE) != 0) { + table_unmap(table, sizeof(ACPI_TABLE_HEADER)); + return (0); + } + table_unmap(table, sizeof(ACPI_TABLE_HEADER)); + return (1); +} + +/* + * Try to map a table at a given physical address previously returned + * by acpi_find_table(). + */ +void * +acpi_map_table(vm_paddr_t pa, const char *sig) +{ + + return (map_table(pa, 0, sig)); +} + +/* Unmap a table previously mapped via acpi_map_table(). */ +void +acpi_unmap_table(void *table) +{ + ACPI_TABLE_HEADER *header; + + header = (ACPI_TABLE_HEADER *)table; + table_unmap(table, header->Length); +} + +/* + * Return the physical address of the requested table or zero if one + * is not found. + */ +vm_paddr_t +acpi_find_table(const char *sig) +{ + ACPI_PHYSICAL_ADDRESS rsdp_ptr; + ACPI_TABLE_RSDP *rsdp; + ACPI_TABLE_RSDT *rsdt; + ACPI_TABLE_XSDT *xsdt; + ACPI_TABLE_HEADER *table; + vm_paddr_t addr; + int i, count; + + if (resource_disabled("acpi", 0)) + return (0); + + /* + * Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn + * calls pmap_mapbios() to find the RSDP, we assume that we can use + * pmap_mapbios() to map the RSDP. + */ + if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0) + return (0); + rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); + if (rsdp == NULL) { + if (bootverbose) + printf("ACPI: Failed to map RSDP\n"); + return (0); + } + + /* + * For ACPI >= 2.0, use the XSDT if it is available. + * Otherwise, use the RSDT. We map the XSDT or RSDT at page 2 + * in the crashdump area. Pages 0 and 1 are used to map in the + * headers of candidate ACPI tables. + */ + addr = 0; + if (rsdp->Revision >= 2 && rsdp->XsdtPhysicalAddress != 0) { + /* + * AcpiOsGetRootPointer only verifies the checksum for + * the version 1.0 portion of the RSDP. Version 2.0 has + * an additional checksum that we verify first. + */ + if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (bootverbose) + printf("ACPI: RSDP failed extended checksum\n"); + return (0); + } + xsdt = map_table(rsdp->XsdtPhysicalAddress, 2, ACPI_SIG_XSDT); + if (xsdt == NULL) { + if (bootverbose) + printf("ACPI: Failed to map XSDT\n"); + return (0); + } + count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + sizeof(UINT64); >>> TRUNCATED FOR MAIL (1000 lines) <<< From truncs at FreeBSD.org Fri Oct 2 20:37:24 2009 From: truncs at FreeBSD.org (Aditya Sarawgi) Date: Fri Oct 2 20:37:31 2009 Subject: PERFORCE change 169158 for review Message-ID: <200910022037.n92KbNFI071430@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169158 Change 169158 by truncs@aditya on 2009/10/02 20:37:20 Remove EXT2FS_DEBUG, it is hardly used. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#4 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#4 (text+ko) ==== @@ -166,12 +166,6 @@ count -= (uio->uio_offset + count) & (DIRBLKSIZ -1); if (count <= 0) count += DIRBLKSIZ; - -#ifdef EXT2FS_DEBUG - printf("ext2_readdir: uio_offset = %lld, uio_resid = %d, count = %d\n", - uio->uio_offset, uio->uio_resid, count); -#endif - auio = *uio; auio.uio_iov = &aiov; auio.uio_iovcnt = 1; ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#4 (text+ko) ==== @@ -40,24 +40,6 @@ #include /* - * Define EXT2FS_DEBUG to produce debug messages - */ -#undef EXT2FS_DEBUG - -/* - * Debug code - */ -#ifdef EXT2FS_DEBUG -# define ext2_debug(f, a...) { \ - printf ("EXT2-fs DEBUG (%s, %d): %s:", \ - __FILE__, __LINE__, __func__); \ - printf (f, ## a); \ - } -#else -# define ext2_debug(f, a...) /**/ -#endif - -/* * Special inode numbers */ #define EXT2_BAD_INO 1 /* Bad blocks inode */ From scottl at FreeBSD.org Fri Oct 2 20:55:44 2009 From: scottl at FreeBSD.org (Scott Long) Date: Fri Oct 2 20:55:50 2009 Subject: PERFORCE change 169159 for review Message-ID: <200910022055.n92KthGa082897@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169159 Change 169159 by scottl@scottl-y1 on 2009/10/02 20:54:52 Quick and dirty hack to use the config_intrhook mechanism to synchronizing bus scan. Not sure if it's sufficient as it doesn't refcount the scans. USB is resistant to reliable refcounting, unfortunately. Affected files ... .. //depot/projects/firewire/sys/dev/usb/controller/usb_controller.c#2 edit .. //depot/projects/firewire/sys/dev/usb/usb_bus.h#2 edit Differences ... ==== //depot/projects/firewire/sys/dev/usb/controller/usb_controller.c#2 (text+ko) ==== @@ -67,6 +67,7 @@ static device_detach_t usb_detach; static void usb_attach_sub(device_t, struct usb_bus *); +static void usb_bus_config_hook(void *arg); /* static variables */ @@ -78,11 +79,6 @@ "Debug level"); #endif -static int usb_no_boot_wait = 0; -TUNABLE_INT("hw.usb.no_boot_wait", &usb_no_boot_wait); -SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RDTUN, &usb_no_boot_wait, 0, - "No device enumerate waiting at boot."); - static devclass_t usb_devclass; static device_method_t usb_methods[] = { @@ -134,11 +130,6 @@ return (ENXIO); } - if (usb_no_boot_wait == 0) { - /* delay vfs_mountroot until the bus is explored */ - bus->bus_roothold = root_mount_hold(device_get_nameunit(dev)); - } - usb_attach_sub(dev, bus); return (0); /* return success */ @@ -161,12 +152,6 @@ /* Stop power watchdog */ usb_callout_drain(&bus->power_wdog); - /* Let the USB explore process detach all devices. */ - if (bus->bus_roothold != NULL) { - root_mount_rel(bus->bus_roothold); - bus->bus_roothold = NULL; - } - USB_BUS_LOCK(bus); if (usb_proc_msignal(&bus->explore_proc, &bus->detach_msg[0], &bus->detach_msg[1])) { @@ -239,9 +224,11 @@ (udev->hub->explore) (udev); USB_BUS_LOCK(bus); } - if (bus->bus_roothold != NULL) { - root_mount_rel(bus->bus_roothold); - bus->bus_roothold = NULL; + + if (bus->usb_config_hook != NULL) { + config_intrhook_disestablish(bus->usb_config_hook); + free(bus->usb_config_hook, M_TEMP); + bus->usb_config_hook = NULL; } } @@ -447,16 +434,31 @@ "process failed.\n"); } else { /* Get final attach going */ - USB_BUS_LOCK(bus); - if (usb_proc_msignal(&bus->explore_proc, - &bus->attach_msg[0], &bus->attach_msg[1])) { - /* ignore */ - } - USB_BUS_UNLOCK(bus); + bus->usb_config_hook = malloc(sizeof(struct intr_config_hook), + M_TEMP, M_ZERO); + bus->usb_config_hook->ich_func = usb_bus_config_hook; + bus->usb_config_hook->ich_arg = bus; + config_intrhook_establish(bus->usb_config_hook); + } +} + +static void +usb_bus_config_hook(void *arg) +{ + struct usb_bus *bus; + + bus = (struct usb_bus *)arg; - /* Do initial explore */ - usb_needs_explore(bus, 1); + USB_BUS_LOCK(bus); + bus->buses_to_explore = 0; + if (usb_proc_msignal(&bus->explore_proc, + &bus->attach_msg[0], &bus->attach_msg[1])) { + /* ignore */ } + USB_BUS_UNLOCK(bus); + + /* Do initial explore */ + usb_needs_explore(bus, 1); } SYSUNINIT(usb_bus_unload, SI_SUB_KLD, SI_ORDER_ANY, usb_bus_unload, NULL); ==== //depot/projects/firewire/sys/dev/usb/usb_bus.h#2 (text+ko) ==== @@ -51,7 +51,7 @@ struct usb_bus { struct usb_bus_stat stats_err; struct usb_bus_stat stats_ok; - struct root_hold_token *bus_roothold; + struct intr_config_hook *usb_config_hook; /* * There are two callback processes. One for Giant locked * callbacks. One for non-Giant locked callbacks. This should From scottl at FreeBSD.org Fri Oct 2 21:07:59 2009 From: scottl at FreeBSD.org (Scott Long) Date: Fri Oct 2 21:08:12 2009 Subject: PERFORCE change 169160 for review Message-ID: <200910022107.n92L7vQZ084689@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169160 Change 169160 by scottl@scottl-y1 on 2009/10/02 21:07:21 IFC Affected files ... .. //depot/projects/firewire/UPDATING#2 integrate .. //depot/projects/firewire/bin/sh/parser.c#2 integrate .. //depot/projects/firewire/bin/sh/sh.1#2 integrate .. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/firewire/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/firewire/crypto/openssh/README#2 integrate .. //depot/projects/firewire/crypto/openssh/README.platform#2 integrate .. //depot/projects/firewire/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth1.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/firewire/crypto/openssh/auth2.c#2 integrate .. //depot/projects/firewire/crypto/openssh/canohost.c#2 integrate .. //depot/projects/firewire/crypto/openssh/canohost.h#2 integrate .. //depot/projects/firewire/crypto/openssh/channels.c#2 integrate .. //depot/projects/firewire/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/firewire/crypto/openssh/config.h#2 integrate .. //depot/projects/firewire/crypto/openssh/config.h.in#2 integrate .. //depot/projects/firewire/crypto/openssh/defines.h#2 integrate .. //depot/projects/firewire/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/firewire/crypto/openssh/includes.h#2 integrate .. //depot/projects/firewire/crypto/openssh/jpake.c#2 integrate .. //depot/projects/firewire/crypto/openssh/jpake.h#2 integrate .. //depot/projects/firewire/crypto/openssh/kex.c#2 integrate .. //depot/projects/firewire/crypto/openssh/kex.h#2 integrate .. //depot/projects/firewire/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/firewire/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/firewire/crypto/openssh/monitor.c#2 integrate .. //depot/projects/firewire/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/firewire/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/firewire/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/firewire/crypto/openssh/packet.c#2 integrate .. //depot/projects/firewire/crypto/openssh/packet.h#2 integrate .. //depot/projects/firewire/crypto/openssh/readconf.c#2 integrate .. //depot/projects/firewire/crypto/openssh/readconf.h#2 integrate .. //depot/projects/firewire/crypto/openssh/roaming.h#1 branch .. //depot/projects/firewire/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/firewire/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/firewire/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/firewire/crypto/openssh/schnorr.h#1 branch .. //depot/projects/firewire/crypto/openssh/servconf.c#2 integrate .. //depot/projects/firewire/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/firewire/crypto/openssh/session.c#2 integrate .. //depot/projects/firewire/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/firewire/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/firewire/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh.1#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh.c#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh_config#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/firewire/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/firewire/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/firewire/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/firewire/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/firewire/crypto/openssh/sshd.8#2 integrate .. //depot/projects/firewire/crypto/openssh/sshd.c#2 integrate .. //depot/projects/firewire/crypto/openssh/sshd_config#2 integrate .. //depot/projects/firewire/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/firewire/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/firewire/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/firewire/crypto/openssh/version.h#2 integrate .. //depot/projects/firewire/etc/defaults/rc.conf#2 integrate .. //depot/projects/firewire/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/firewire/etc/network.subr#2 integrate .. //depot/projects/firewire/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/firewire/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/firewire/etc/rc.d/defaultroute#2 integrate .. //depot/projects/firewire/etc/rc.d/faith#2 integrate .. //depot/projects/firewire/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/firewire/etc/rc.d/netif#2 integrate .. //depot/projects/firewire/etc/rc.d/netoptions#2 integrate .. //depot/projects/firewire/etc/rc.d/routing#2 integrate .. //depot/projects/firewire/etc/rc.d/rtadvd#2 integrate .. //depot/projects/firewire/etc/rc.d/static_arp#2 integrate .. //depot/projects/firewire/etc/rc.d/stf#2 integrate .. //depot/projects/firewire/etc/rc.subr#2 integrate .. //depot/projects/firewire/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/firewire/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/firewire/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/firewire/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/firewire/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/firewire/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/firewire/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/firewire/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/firewire/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/firewire/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/firewire/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/firewire/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/firewire/lib/libc/sys/stack_protector.c#2 integrate .. //depot/projects/firewire/lib/libdisk/change.c#2 integrate .. //depot/projects/firewire/lib/libjail/jail.3#2 integrate .. //depot/projects/firewire/lib/libradius/radlib.c#2 integrate .. //depot/projects/firewire/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/firewire/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/firewire/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/firewire/release/Makefile#2 integrate .. //depot/projects/firewire/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/firewire/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/firewire/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/firewire/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/firewire/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/firewire/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/firewire/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/firewire/sbin/savecore/savecore.8#2 integrate .. //depot/projects/firewire/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/firewire/secure/libexec/sftp-server/Makefile#2 integrate .. //depot/projects/firewire/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/firewire/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/firewire/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/firewire/share/man/man4/Makefile#2 integrate .. //depot/projects/firewire/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/firewire/share/man/man4/lindev.4#1 branch .. //depot/projects/firewire/share/man/man4/msk.4#2 integrate .. //depot/projects/firewire/share/man/man5/procfs.5#2 integrate .. //depot/projects/firewire/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/firewire/share/man/man7/tuning.7#2 integrate .. //depot/projects/firewire/share/man/man9/Makefile#2 integrate .. //depot/projects/firewire/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/firewire/share/man/man9/acl.9#2 integrate .. //depot/projects/firewire/share/man/man9/fail.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_crypto.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_input.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_node.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_output.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_proto.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_radiotap.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/firewire/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/firewire/share/man/man9/vaccess.9#2 integrate .. //depot/projects/firewire/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/firewire/share/misc/bsd-family-tree#2 integrate .. //depot/projects/firewire/share/misc/iso3166#2 integrate .. //depot/projects/firewire/share/zoneinfo/asia#2 integrate .. //depot/projects/firewire/share/zoneinfo/southamerica#2 integrate .. //depot/projects/firewire/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/firewire/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/firewire/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/firewire/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/firewire/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/firewire/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/firewire/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/firewire/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/firewire/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/firewire/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/firewire/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/firewire/sys/amd64/include/param.h#2 integrate .. //depot/projects/firewire/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/firewire/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/firewire/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/firewire/sys/arm/include/md_var.h#2 integrate .. //depot/projects/firewire/sys/arm/include/param.h#2 integrate .. //depot/projects/firewire/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/firewire/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/firewire/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/firewire/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/firewire/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/firewire/sys/cam/cam_periph.c#2 integrate .. //depot/projects/firewire/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/firewire/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/firewire/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/firewire/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/firewire/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/firewire/sys/conf/NOTES#2 integrate .. //depot/projects/firewire/sys/conf/files#2 integrate .. //depot/projects/firewire/sys/conf/files.amd64#2 integrate .. //depot/projects/firewire/sys/conf/files.i386#2 integrate .. //depot/projects/firewire/sys/conf/files.pc98#2 integrate .. //depot/projects/firewire/sys/conf/newvers.sh#2 integrate .. //depot/projects/firewire/sys/conf/options#2 integrate .. //depot/projects/firewire/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/firewire/sys/contrib/x86emu/x86emu_util.c#2 integrate .. //depot/projects/firewire/sys/ddb/db_ps.c#2 integrate .. //depot/projects/firewire/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/firewire/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/firewire/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/firewire/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/firewire/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/firewire/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/firewire/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/firewire/sys/dev/age/if_age.c#2 integrate .. //depot/projects/firewire/sys/dev/alc/if_alc.c#2 integrate .. //depot/projects/firewire/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/firewire/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/firewire/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/firewire/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/firewire/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/firewire/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/firewire/sys/dev/de/if_de.c#2 integrate .. //depot/projects/firewire/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/firewire/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/firewire/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/firewire/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/firewire/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/firewire/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/firewire/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/firewire/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/firewire/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/firewire/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/firewire/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/firewire/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/firewire/sys/dev/isp/isp.c#2 integrate .. //depot/projects/firewire/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/firewire/sys/dev/isp/isp_tpublic.h#2 delete .. //depot/projects/firewire/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/firewire/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/firewire/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/firewire/sys/dev/lindev/full.c#1 branch .. //depot/projects/firewire/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/firewire/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/firewire/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/firewire/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/firewire/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/firewire/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/firewire/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/firewire/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/firewire/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/firewire/sys/dev/pci/pci.c#2 integrate .. //depot/projects/firewire/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/firewire/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/firewire/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/firewire/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/firewire/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/firewire/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/firewire/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/firewire/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/firewire/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/firewire/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/firewire/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/firewire/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/firewire/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/firewire/sys/dev/twe/twe.c#2 integrate .. //depot/projects/firewire/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/firewire/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/firewire/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/firewire/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/firewire/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/usb.h#2 integrate .. //depot/projects/firewire/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/firewire/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/firewire/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/firewire/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/firewire/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/firewire/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/firewire/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/firewire/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/firewire/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/firewire/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/firewire/sys/geom/part/g_part.c#2 integrate .. //depot/projects/firewire/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/firewire/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/firewire/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/firewire/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/firewire/sys/i386/conf/NOTES#2 integrate .. //depot/projects/firewire/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/firewire/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/firewire/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/firewire/sys/i386/i386/trap.c#2 integrate .. //depot/projects/firewire/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/firewire/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/firewire/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/firewire/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/firewire/sys/i386/include/param.h#2 integrate .. //depot/projects/firewire/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/firewire/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/firewire/sys/ia64/include/param.h#2 integrate .. //depot/projects/firewire/sys/kern/init_main.c#2 integrate .. //depot/projects/firewire/sys/kern/init_sysent.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_event.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_exec.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_mib.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_proc.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_sig.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_sx.c#2 integrate .. //depot/projects/firewire/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/firewire/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/firewire/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/firewire/sys/kern/subr_bus.c#2 integrate .. //depot/projects/firewire/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/firewire/sys/kern/subr_smp.c#2 integrate .. //depot/projects/firewire/sys/kern/syscalls.c#2 integrate .. //depot/projects/firewire/sys/kern/syscalls.master#2 integrate .. //depot/projects/firewire/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/firewire/sys/kern/vfs_default.c#2 integrate .. //depot/projects/firewire/sys/kern/vfs_export.c#2 integrate .. //depot/projects/firewire/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/firewire/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/firewire/sys/mips/include/param.h#2 integrate .. //depot/projects/firewire/sys/modules/Makefile#2 integrate .. //depot/projects/firewire/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/firewire/sys/modules/lindev/Makefile#1 branch .. //depot/projects/firewire/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/firewire/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/firewire/sys/modules/usb/Makefile#2 integrate .. //depot/projects/firewire/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/firewire/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/firewire/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/firewire/sys/net/flowtable.c#2 integrate .. //depot/projects/firewire/sys/net/flowtable.h#2 integrate .. //depot/projects/firewire/sys/net/if.c#2 integrate .. //depot/projects/firewire/sys/net/if_llatbl.c#2 integrate .. //depot/projects/firewire/sys/net/route.c#2 integrate .. //depot/projects/firewire/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/firewire/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/firewire/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/firewire/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/firewire/sys/netinet/in.c#2 integrate .. //depot/projects/firewire/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/firewire/sys/netinet/in_proto.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/firewire/sys/netinet/sctputil.c#2 integrate .. //depot/projects/firewire/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/firewire/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/firewire/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/firewire/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/firewire/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/firewire/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/firewire/sys/pci/intpm.c#2 integrate .. //depot/projects/firewire/sys/powerpc/include/param.h#2 integrate .. //depot/projects/firewire/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/firewire/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/firewire/sys/sparc64/include/param.h#2 integrate .. //depot/projects/firewire/sys/sun4v/include/param.h#2 integrate .. //depot/projects/firewire/sys/sys/ata.h#2 integrate .. //depot/projects/firewire/sys/sys/event.h#2 integrate .. //depot/projects/firewire/sys/sys/fcntl.h#2 integrate .. //depot/projects/firewire/sys/sys/kbio.h#2 integrate .. //depot/projects/firewire/sys/sys/mman.h#2 integrate .. //depot/projects/firewire/sys/sys/param.h#2 integrate .. //depot/projects/firewire/sys/sys/pmc.h#2 integrate .. //depot/projects/firewire/sys/sys/rwlock.h#2 integrate .. //depot/projects/firewire/sys/sys/smp.h#2 integrate .. //depot/projects/firewire/sys/sys/sx.h#2 integrate .. //depot/projects/firewire/sys/sys/syscall.h#2 integrate .. //depot/projects/firewire/sys/sys/syscall.mk#2 integrate .. //depot/projects/firewire/sys/sys/sysproto.h#2 integrate .. //depot/projects/firewire/sys/sys/systm.h#2 integrate .. //depot/projects/firewire/sys/sys/vnode.h#2 integrate .. //depot/projects/firewire/sys/teken/sequences#2 integrate .. //depot/projects/firewire/sys/teken/teken.c#2 integrate .. //depot/projects/firewire/sys/teken/teken.h#2 integrate .. //depot/projects/firewire/sys/teken/teken_demo.c#2 integrate .. //depot/projects/firewire/sys/teken/teken_scs.h#2 integrate .. //depot/projects/firewire/sys/teken/teken_stress.c#2 integrate .. //depot/projects/firewire/sys/teken/teken_subr.h#2 integrate .. //depot/projects/firewire/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/firewire/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/firewire/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/firewire/sys/vm/vm_map.c#2 integrate .. //depot/projects/firewire/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/firewire/tools/regression/acltools/00.t#2 integrate .. //depot/projects/firewire/tools/regression/acltools/03.t#1 branch .. //depot/projects/firewire/tools/regression/acltools/aclfuzzer.sh#1 branch .. //depot/projects/firewire/tools/regression/acltools/tools-crossfs.test#1 branch .. //depot/projects/firewire/tools/regression/bin/sh/errors/backquote-error2.0#1 branch .. //depot/projects/firewire/tools/regression/mmap/Makefile#1 branch .. //depot/projects/firewire/tools/regression/mmap/mmap.c#1 branch .. //depot/projects/firewire/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/firewire/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.10#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.11#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.12#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.13#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.14#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.15#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.16#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.17#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.18#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.9#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.10#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.11#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.12#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.13#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.14#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.15#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.16#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.17#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.18#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.19#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.20#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.21#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.22#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.9#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.10#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.11#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.12#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.13#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.14#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.15#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.16#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.17#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.18#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.19#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.20#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.21#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.22#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.23#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.9#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.1#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.10#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.11#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.12#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.13#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.14#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.15#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.16#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.17#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.18#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.19#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.2#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.20#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.21#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.22#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.23#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.24#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.25#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.26#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.27#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.28#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.29#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.3#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.30#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.31#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.4#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.5#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.6#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.7#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.8#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.9#1 branch .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9#2 delete .. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8#2 delete .. //depot/projects/firewire/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate .. //depot/projects/firewire/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/firewire/usr.bin/find/find.1#2 integrate .. //depot/projects/firewire/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/firewire/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/firewire/usr.bin/sed/compile.c#2 integrate .. //depot/projects/firewire/usr.sbin/Makefile#2 integrate .. //depot/projects/firewire/usr.sbin/apm/Makefile#2 integrate .. //depot/projects/firewire/usr.sbin/crashinfo/crashinfo.8#2 integrate .. //depot/projects/firewire/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/firewire/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/firewire/usr.sbin/kbdcontrol/kbdmap.5#2 integrate .. //depot/projects/firewire/usr.sbin/lpr/lp/lp.sh#2 integrate .. //depot/projects/firewire/usr.sbin/sysinstall/menus.c#2 integrate Differences ... ==== //depot/projects/firewire/UPDATING#2 (text+ko) ==== @@ -22,6 +22,61 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090926: + The rc.d/network_ipv6, IPv6 configuration script has been integrated + into rc.d/netif. The changes are the following: + + 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF + for IPv4. For aliases, $ifconfig_IF_aliasN should be used. + Note that both variables need the "inet6" keyword at the head. + + Do not set $ipv6_network_interfaces manually if you do not + understand what you are doing. It is not needed in most cases. + + $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but + they are obsolete. + + 2. $ipv6_enable is obsolete. Use $ipv6_prefer and + "inet6 accept_rtadv" keyword in ifconfig(8) instead. + + If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and + all configured interfaces have "inet6 accept_rtadv" in the + $ifconfig_IF_ipv6. These are for backward compatibility. + + 3. A new variable $ipv6_prefer has been added. If NO, IPv6 + functionality of interfaces with no corresponding + $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag, + and the default address selection policy of ip6addrctl(8) + is the IPv4-preferred one (see rc.d/ip6addrctl for more details). + Note that if you want to configure IPv6 functionality on the + disabled interfaces after boot, first you need to clear the flag by + using ifconfig(8) like: + + ifconfig em0 inet6 -ifdisabled + + If YES, the default address selection policy is set as + IPv6-preferred. + + The default value of $ipv6_prefer is NO. + + 4. If your system need to receive Router Advertisement messages, + define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8) + scripts automatically invoke rtsol(8) when the interface becomes + UP. The Router Advertisement messages are used for SLAAC + (State-Less Address AutoConfiguration). + +20090922: + 802.11s D3.03 support was committed. This is incompatible with the + previous code, which was based on D3.0. + +20090912: + A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value + of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to + control whether accepting Router Advertisement messages or not. + Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and + a sysctl variable net.inet6.ip6.auto_linklocal is its default value. + The ifconfig(8) utility now supports these flags. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -975,4 +1030,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ +$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $ ==== //depot/projects/firewire/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); #include #include @@ -82,7 +82,6 @@ STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -1043,7 +1042,7 @@ endword: if (syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); if (varnest != 0) { startlinno = plinno; @@ -1303,7 +1302,6 @@ parsebackq: { struct nodelist **nlpp; - int savepbq; union node *n; char *volatile str; struct jmploc jmploc; @@ -1311,11 +1309,9 @@ int savelen; int saveprompt; - savepbq = parsebackquote; if (setjmp(jmploc.loc)) { if (str) ckfree(str); - parsebackquote = 0; handler = savehandler; longjmp(handler->loc, 1); } @@ -1397,7 +1393,6 @@ nlpp = &(*nlpp)->next; *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); (*nlpp)->next = NULL; - parsebackquote = oldstyle; if (oldstyle) { saveprompt = doprompt; @@ -1433,7 +1428,6 @@ str = NULL; INTON; } - parsebackquote = savepbq; handler = savehandler; if (arinest || dblquote) USTPUTC(CTLBACKQ | CTLQUOTE, out); ==== //depot/projects/firewire/bin/sh/sh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.130 2009/06/24 22:04:04 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ .\" .Dd May 31, 2009 .Dt SH 1 @@ -375,6 +375,10 @@ The word starting with .Ql # and the rest of the line are ignored. +.Pp +.Tn ASCII +.Dv NUL +characters (character code 0) are not allowed in shell input. .Ss Quoting Quoting is used to remove the special meaning of certain characters or words to the shell, such as operators, whitespace, keywords, ==== //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -535,7 +535,7 @@ .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE ==== //depot/projects/firewire/crypto/openssh/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From trasz at FreeBSD.org Fri Oct 2 22:30:29 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 22:30:36 2009 Subject: PERFORCE change 169163 for review Message-ID: <200910022230.n92MUSw7091449@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169163 Change 169163 by trasz@trasz_victim on 2009/10/02 22:29:27 Move loginclass pointer from process to ucred, where it should be in the first place. Affected files ... .. //depot/projects/soc2009/trasz_limits/TODO#12 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#62 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#23 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#35 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#12 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#9 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/TODO#12 (text+ko) ==== @@ -1,6 +1,4 @@ - - Why did I put the loginclass pointer into the proc and not into the cred? - - Make the limits lists protected by the subjects lock (e.g. process lock) instead of hrl_lock. ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#14 (text+ko) ==== @@ -470,6 +470,7 @@ p->p_ucred->cr_uidinfo = uifind(0); p->p_ucred->cr_ruidinfo = uifind(0); p->p_ucred->cr_prison = &prison0; + p->p_ucred->cr_loginclass = loginclass_find("default"); #ifdef AUDIT audit_cred_kproc0(p->p_ucred); #endif @@ -478,9 +479,6 @@ #endif td->td_ucred = crhold(p->p_ucred); - /* Set default login class. */ - p->p_loginclass = loginclass_find("default"); - /* Create sigacts. */ p->p_sigacts = sigacts_alloc(); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#14 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -771,7 +770,7 @@ hrl_proc_exiting(p); /* - * Free credentials, arguments, sigacts and loginclass. + * Free credentials, arguments and sigacts. */ crfree(p->p_ucred); p->p_ucred = NULL; @@ -779,8 +778,6 @@ p->p_args = NULL; sigacts_free(p->p_sigacts); p->p_sigacts = NULL; - loginclass_release(p->p_loginclass); - p->p_loginclass = NULL; /* * Do any thread-system specific cleanups. ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#13 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -484,9 +483,6 @@ /* Tell the prison that we exist. */ prison_proc_hold(p2->p_ucred->cr_prison); - /* Loginclass might want to know too. */ - loginclass_acquire(p2->p_loginclass); - PROC_UNLOCK(p2); /* ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#62 (text+ko) ==== @@ -290,7 +290,7 @@ break; case HRL_SUBJECT_TYPE_LOGINCLASS: available = rule->hr_amount - - p->p_loginclass->lc_usage.hu_resources[resource]; + cred->cr_loginclass->lc_usage.hu_resources[resource]; available = INT64_MAX; /* XXX */ break; case HRL_SUBJECT_TYPE_JAIL: @@ -493,11 +493,11 @@ return (error); } p->p_usage.hu_resources[resource] += amount; - p->p_loginclass->lc_usage.hu_resources[resource] += amount; cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] += amount; for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) pr->pr_usage.hu_resources[resource] += amount; + cred->cr_loginclass->lc_usage.hu_resources[resource] += amount; /* * XXX: Slow. */ @@ -557,11 +557,11 @@ } } p->p_usage.hu_resources[resource] = amount; - p->p_loginclass->lc_usage.hu_resources[resource] += diff; cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] += diff; for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) pr->pr_usage.hu_resources[resource] += diff; + cred->cr_loginclass->lc_usage.hu_resources[resource] += diff; /* * XXX: Slow. */ @@ -612,11 +612,11 @@ "%ld for %s (pid %d)", amount, hrl_resource_name(resource), p->p_usage.hu_resources[resource], p->p_comm, p->p_pid)); p->p_usage.hu_resources[resource] -= amount; - p->p_loginclass->lc_usage.hu_resources[resource] -= amount; cred = p->p_ucred; cred->cr_ruidinfo->ui_usage.hu_resources[resource] -= amount; for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) pr->pr_usage.hu_resources[resource] -= amount; + cred->cr_loginclass->lc_usage.hu_resources[resource] -= amount; /* * XXX: Slow. */ @@ -1235,7 +1235,7 @@ break; continue; case HRL_SUBJECT_TYPE_LOGINCLASS: - if (p->p_loginclass == rule->hr_subject.hs_loginclass) + if (cred->cr_loginclass == rule->hr_subject.hs_loginclass) break; continue; case HRL_SUBJECT_TYPE_JAIL: @@ -1727,54 +1727,8 @@ } /* - * Called just before loginclass change, to adjust p_limits and lc_usage. - */ -void -hrl_proc_loginclass_changing(struct proc *p, struct loginclass *newlc) -{ - int error; - struct hrl_limit *limit; - struct loginclass *lc = p->p_loginclass; - - PROC_LOCK_ASSERT(p, MA_OWNED); - - mtx_lock(&hrl_lock); - - /* - * Remove rules for the old loginclass. - */ - LIST_FOREACH(limit, &p->p_limits, hl_next) { - if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS) - continue; - - LIST_REMOVE(limit, hl_next); - hrl_rule_release(limit->hl_rule); - uma_zfree(hrl_limit_zone, limit); - } - - /* - * Now add rules for the current loginclass. - */ - LIST_FOREACH(limit, &newlc->lc_limits, hl_next) { - error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule); - KASSERT(error == 0, ("XXX: better error handling needed")); - } - - mtx_unlock(&hrl_lock); - - /* - * Adjust loginclass resource usage information. - */ - hrl_usage_subtract(&lc->lc_usage, &p->p_usage); - hrl_usage_add(&newlc->lc_usage, &p->p_usage); -} - -/* * Called after credentials change, to adjust p_limits. * - * XXX: This should be merged with the routine above, after moving - * the loginclass pointer from 'struct proc' to 'struct ucred'. - * * XXX: What about jails? */ void @@ -1783,17 +1737,20 @@ int error, i; struct hrl_limit *limit; struct uidinfo *olduip, *newuip; + struct loginclass *oldlc, *newlc; PROC_LOCK_ASSERT(p, MA_OWNED); mtx_lock(&hrl_lock); /* - * Remove rules for the old user credentials. + * Remove rules for the old user credentials - per-user, per-group + * and per-loginclass. */ LIST_FOREACH(limit, &p->p_limits, hl_next) { if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_USER && - limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_GROUP) + limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_GROUP && + limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS) continue; LIST_REMOVE(limit, hl_next); @@ -1820,6 +1777,14 @@ } } + /* + * Add rules for the current loginclass. + */ + LIST_FOREACH(limit, &newcred->cr_loginclass->lc_limits, hl_next) { + error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule); + KASSERT(error == 0, ("XXX: better error handling needed")); + } + mtx_unlock(&hrl_lock); /* @@ -1843,6 +1808,16 @@ hrl_usage_add( &newcred->cr_gidinfos[i]->gi_usage, &p->p_usage); } + + /* + * Adjust loginclass resource usage information. + */ + newlc = newcred->cr_loginclass; + oldlc = p->p_ucred->cr_loginclass; + if (newlc != oldlc) { + hrl_usage_subtract(&oldlc->lc_usage, &p->p_usage); + hrl_usage_add(&newlc->lc_usage, &p->p_usage); + } } /* ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#13 (text+ko) ==== @@ -159,7 +159,7 @@ struct loginclass *lc; PROC_LOCK(p); - lc = p->p_loginclass; + lc = p->p_ucred->cr_loginclass; loginclass_acquire(lc); PROC_UNLOCK(p); @@ -187,7 +187,8 @@ struct proc *p = td->td_proc; int error; char lcname[MAXLOGNAME]; - struct loginclass *newlc, *oldlc; + struct loginclass *newlc; + struct ucred *newcred, *oldcred; error = priv_check(td, PRIV_PROC_SETLOGINCLASS); if (error) @@ -196,15 +197,18 @@ if (error == ENAMETOOLONG) return (EINVAL); + newcred = crget(); newlc = loginclass_find(lcname); PROC_LOCK(p); - hrl_proc_loginclass_changing(p, newlc); - oldlc = p->p_loginclass; - p->p_loginclass = newlc; + oldcred = crcopysafe(p, newcred); + newcred->cr_loginclass = newlc; + hrl_proc_ucred_changing(p, newcred); + p->p_ucred = newcred; PROC_UNLOCK(p); - loginclass_release(oldlc); + loginclass_release(oldcred->cr_loginclass); + crfree(oldcred); return (0); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#23 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -1897,6 +1898,7 @@ */ if (cr->cr_prison != NULL) prison_free(cr->cr_prison); + loginclass_release(cr->cr_loginclass); #ifdef AUDIT audit_cred_destroy(cr); #endif @@ -1938,6 +1940,7 @@ gihold(dest->cr_gidinfos[i]); } prison_hold(dest->cr_prison); + loginclass_acquire(dest->cr_loginclass); #ifdef AUDIT audit_cred_copy(src, dest); #endif ==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#35 (text+ko) ==== @@ -154,7 +154,6 @@ void hrl_proc_exiting(struct proc *p); -void hrl_proc_loginclass_changing(struct proc *p, struct loginclass *newlc); void hrl_proc_ucred_changing(struct proc *p, struct ucred *newcred); struct hrl_rule *hrl_rule_alloc(int flags); ==== //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#12 (text+ko) ==== @@ -171,7 +171,6 @@ struct kdtrace_proc; struct kdtrace_thread; struct cpuset; -struct loginclass; /* * Kernel runnable context (thread). @@ -529,7 +528,6 @@ rlim_t p_cpulimit; /* (c) Current CPU limit in seconds. */ signed char p_nice; /* (c) Process "nice" value. */ int p_fibnum; /* in this routing domain XXX MRT */ - struct loginclass *p_loginclass; /* (c) login class */ /* End area that is copied on creation. */ #define p_endcopy p_xstat ==== //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#9 (text+ko) ==== @@ -35,6 +35,8 @@ #include +struct loginclass; + /* * Credentials. * @@ -54,7 +56,7 @@ struct uidinfo *cr_uidinfo; /* per euid resource consumption */ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(2) */ - void *cr_pspare; /* general use */ + struct loginclass *cr_loginclass; /* login class */ u_int cr_flags; /* credential flags */ void *cr_pspare2[2]; /* general use 2 */ #define cr_endcopy cr_label From trasz at FreeBSD.org Fri Oct 2 22:34:34 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 22:34:47 2009 Subject: PERFORCE change 169164 for review Message-ID: <200910022234.n92MYXBQ091744@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169164 Change 169164 by trasz@trasz_victim on 2009/10/02 22:33:58 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/static_arp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#55 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmc.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/errors/backquote-error2.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/mmap/mmap.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); #include #include @@ -82,7 +82,6 @@ STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -1043,7 +1042,7 @@ endword: if (syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); if (varnest != 0) { startlinno = plinno; @@ -1303,7 +1302,6 @@ parsebackq: { struct nodelist **nlpp; - int savepbq; union node *n; char *volatile str; struct jmploc jmploc; @@ -1311,11 +1309,9 @@ int savelen; int saveprompt; - savepbq = parsebackquote; if (setjmp(jmploc.loc)) { if (str) ckfree(str); - parsebackquote = 0; handler = savehandler; longjmp(handler->loc, 1); } @@ -1397,7 +1393,6 @@ nlpp = &(*nlpp)->next; *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); (*nlpp)->next = NULL; - parsebackquote = oldstyle; if (oldstyle) { saveprompt = doprompt; @@ -1433,7 +1428,6 @@ str = NULL; INTON; } - parsebackquote = savepbq; handler = savehandler; if (arinest || dblquote) USTPUTC(CTLBACKQ | CTLQUOTE, out); ==== //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#11 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $ +# $FreeBSD: src/etc/network.subr,v 1.203 2009/10/02 02:24:25 hrs Exp $ # # @@ -356,6 +356,16 @@ inet6) ${SYSCTL_N} net.inet6 > /dev/null 2>&1 ;; + ipx) + ${SYSCTL_N} net.ipx > /dev/null 2>&1 + ;; + atm) + if [ -x /sbin/atmconfig ]; then + /sbin/atmconfig diag list > /dev/null 2>&1 + else + return 1 + fi + ;; *) err 1 "afexists(): Unsupported address family: $_af" ;; ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#7 (text+ko) ==== @@ -2,7 +2,7 @@ # # Wait for the default route to be up # -# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $ +# $FreeBSD: src/etc/rc.d/defaultroute,v 1.9 2009/10/02 02:24:25 hrs Exp $ # # PROVIDE: defaultroute @@ -20,6 +20,8 @@ { local output carrier nocarrier nl + afexists inet || return 0 + # Return without waiting if we don't have dhcp interfaces or # if none of the dhcp interfaces is plugged in. dhcp_interfaces=`list_net_interfaces dhcp` ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#2 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/etc/rc.d/faith,v 1.1 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/faith,v 1.3 2009/10/02 06:19:34 hrs Exp $ # # PROVIDE: faith ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.8 2009/10/02 02:24:25 hrs Exp $ # # PROVIDE: ip6addrctl @@ -9,6 +9,7 @@ # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="ip6addrctl" rcvar=`set_rcvar` @@ -23,6 +24,8 @@ ip6addrctl_prefer_ipv6() { + afexists inet6 || return 0 + ip6addrctl flush >/dev/null 2>&1 ip6addrctl add ::1/128 50 0 ip6addrctl add ::/0 40 1 @@ -34,6 +37,8 @@ ip6addrctl_prefer_ipv4() { + afexists inet6 || return 0 + ip6addrctl flush >/dev/null 2>&1 ip6addrctl add ::ffff:0:0/96 50 0 ip6addrctl add ::1/128 40 1 @@ -45,30 +50,27 @@ ip6addrctl_start() { - if ifconfig lo0 inet6 >/dev/null 2>&1; then - # We have IPv6 support in kernel. + afexists inet6 || return 0 - # install the policy of the address selection algorithm. - if [ -f /etc/ip6addrctl.conf ]; then - ip6addrctl flush >/dev/null 2>&1 - ip6addrctl install /etc/ip6addrctl.conf - checkyesno ip6addrctl_verbose && ip6addrctl + # install the policy of the address selection algorithm. + if [ -f /etc/ip6addrctl.conf ]; then + ip6addrctl flush >/dev/null 2>&1 + ip6addrctl install /etc/ip6addrctl.conf + checkyesno ip6addrctl_verbose && ip6addrctl + else + if checkyesno ipv6_prefer; then + ip6addrctl_prefer_ipv6 else - if checkyesno ipv6_prefer; then - ip6addrctl_prefer_ipv6 - else - ip6addrctl_prefer_ipv4 - fi + ip6addrctl_prefer_ipv4 fi fi } ip6addrctl_stop() { - if ifconfig lo0 inet6 >/dev/null 2>&1; then - # We have IPv6 support in kernel. - ip6addrctl flush >/dev/null 2>&1 - fi + afexists inet6 || return 0 + + ip6addrctl flush >/dev/null 2>&1 } load_rc_config $name ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/netoptions,v 1.148 2009/09/30 14:58:10 ume Exp $ +# $FreeBSD: src/etc/rc.d/netoptions,v 1.150 2009/10/02 06:51:39 hrs Exp $ # # PROVIDE: netoptions @@ -26,29 +26,51 @@ netoptions_start() { - if checkyesno log_in_vain; then + local _af + + for _af in inet inet6; do + afexists ${_af} && eval netoptions_${_af} + done + [ -n "${_netoptions_initdone}" ] && echo '.' +} + +netoptions_inet() +{ + case ${log_in_vain} in + [12]) netoptions_init echo -n " log_in_vain=${log_in_vain}" - ${SYSCTL_W} net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - ${SYSCTL_W} net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - fi + ${SYSCTL_W} net.inet.tcp.log_in_vain=${log_in_vain} >/dev/null + ${SYSCTL_W} net.inet.udp.log_in_vain=${log_in_vain} >/dev/null + ;; + *) + ${SYSCTL_W} net.inet.tcp.log_in_vain=0 >/dev/null + ${SYSCTL_W} net.inet.udp.log_in_vain=0 >/dev/null + ;; + esac if checkyesno tcp_extensions; then + ${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null + else netoptions_init - echo -n ' rfc1323 extensions=NO' + echo -n ' rfc1323 extensions=${tcp_extensions}' ${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null fi - if ! checkyesno tcp_keepalive; then + if checkyesno tcp_keepalive; then + ${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null + else netoptions_init - echo -n ' TCP keepalive=NO' + echo -n ' TCP keepalive=${tcp_keepalive}' ${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null fi if checkyesno tcp_drop_synfin; then netoptions_init - echo -n ' drop SYN+FIN packets=YES' + echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}' ${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null + else + ${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null fi case ${ip_portrange_first} in @@ -66,17 +88,17 @@ ${SYSCTL_W} net.inet.ip.portrange.last=$ip_portrange_last >/dev/null ;; esac +} - if afexists inet6; then - if checkyesno ipv6_ipv4mapping; then - ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null - else - echo -n " no-ipv4-mapped-ipv6" - ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null - fi +netoptions_inet6() +{ + if checkyesno ipv6_ipv4mapping; then + netoptions_init + echo -n " ipv4-mapped-ipv6=${ipv6_ipv4mapping}" + ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null + else + ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null fi - - [ -n "${_netoptions_initdone}" ] && echo '.' } load_rc_config $name ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#6 (text+ko) ==== @@ -2,7 +2,7 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.150 2009/09/30 14:58:10 ume Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.152 2009/10/02 20:19:53 hrs Exp $ # # PROVIDE: routing @@ -13,87 +13,108 @@ . /etc/network.subr name="routing" -start_cmd="routing_start" +start_cmd="routing_start doall" stop_cmd="routing_stop" extra_commands="options static" -static_cmd="static_start" -options_cmd="options_start" +static_cmd="routing_start static" +options_cmd="routing_start options" -routing_start() +afcheck() { - static_start "$@" - options_start "$@" + case $_af in + ""|inet|inet6|ipx|atm) + ;; + *) + err 1 "Unsupported address family: $_af." + ;; + esac } -routing_stop() +routing_start() { - static_stop "$@" - route -n flush - for i in ${ipv6_network_interfaces}; do - ifconfig $i inet6 -defaultif - done + local _cmd _af _a + _cmd=$1 + _af=$2 + + afcheck + + case $_af in + inet|inet6|ipx|atm) + setroutes $_cmd $_af + ;; + "") + for _a in inet inet6 ipx atm; do + afexists $_a && setroutes $_cmd $_a + done + ;; + esac + [ -n "${_ropts_initdone}" ] && echo '.' } -static_start() +routing_stop() { - local _af + local _af _a _af=$1 - case ${_af} in - inet) - do_static inet add + afcheck + + case $_af in + inet|inet6|ipx|atm) + eval static_${_af} delete + eval routing_stop_${_af} ;; - inet6) - do_static inet6 add - ;; - atm) - do_static atm add + "") + for _a in inet inet6 ipx atm; do + afexists $_a || continue + eval static_${_a} delete + eval routing_stop_${_a} + done ;; - *) - do_static inet add - if afexists inet6; then - do_static inet6 add - fi - do_static atm add - ;; esac } -static_stop() +setroutes() { - local _af - _af=$1 - - case ${_af} in - inet) - do_static inet delete + case $1 in + static) + static_$2 add ;; - inet6) - do_static inet6 delete + options) + options_$2 ;; - atm) - do_static atm delete - ;; - *) - do_static inet delete - if afexists inet6; then - do_static inet6 delete - fi - do_static atm delete + doall) + static_$2 add + options_$2 ;; esac } -do_static() +routing_stop_inet() +{ + route -n flush -inet +} + +routing_stop_inet6() +{ + local i + + route -n flush -inet6 + for i in ${ipv6_network_interfaces}; do + ifconfig $i inet6 -defaultif + done +} + +routing_stop_atm() { - local _af _action - _af=$1 - _action=$2 + return 0 +} - eval $1_static $2 +routing_stop_ipx() +{ + return 0 } -inet_static() +static_inet() { local _action _action=$1 @@ -115,7 +136,7 @@ fi } -inet6_static() +static_inet6() { local _action i _action=$1 @@ -222,9 +243,9 @@ esac } -atm_static() +static_atm() { - local _action i + local _action i route_args _action=$1 if [ -n "${natm_static_routes}" ]; then @@ -235,6 +256,10 @@ fi } +static_ipx() +{ +} + _ropts_initdone= ropts_init() { @@ -244,63 +269,89 @@ fi } -options_start() +options_inet() { if checkyesno icmp_bmcastecho; then ropts_init echo -n ' broadcast ping responses=YES' - sysctl net.inet.icmp.bmcastecho=1 >/dev/null + ${SYSCTL_W} net.inet.icmp.bmcastecho=1 > /dev/null + else + ${SYSCTL_W} net.inet.icmp.bmcastecho=0 > /dev/null fi if checkyesno icmp_drop_redirect; then ropts_init echo -n ' ignore ICMP redirect=YES' - sysctl net.inet.icmp.drop_redirect=1 >/dev/null + ${SYSCTL_W} net.inet.icmp.drop_redirect=1 > /dev/null + else + ${SYSCTL_W} net.inet.icmp.drop_redirect=0 > /dev/null fi if checkyesno icmp_log_redirect; then ropts_init echo -n ' log ICMP redirect=YES' - sysctl net.inet.icmp.log_redirect=1 >/dev/null + ${SYSCTL_W} net.inet.icmp.log_redirect=1 > /dev/null + else + ${SYSCTL_W} net.inet.icmp.log_redirect=0 > /dev/null fi if checkyesno gateway_enable; then ropts_init echo -n ' IPv4 gateway=YES' - sysctl net.inet.ip.forwarding=1 >/dev/null + ${SYSCTL_W} net.inet.ip.forwarding=1 > /dev/null + else + ${SYSCTL_W} net.inet.ip.forwarding=0 > /dev/null fi - if checkyesno ipv6_gateway_enable; then - ropts_init - echo -n ' IPv6 gateway=YES' - sysctl net.inet6.ip6.forwarding=1 >/dev/null - fi - if checkyesno forward_sourceroute; then ropts_init echo -n ' do source routing=YES' - sysctl net.inet.ip.sourceroute=1 >/dev/null + ${SYSCTL_W} net.inet.ip.sourceroute=1 > /dev/null + else + ${SYSCTL_W} net.inet.ip.sourceroute=0 > /dev/null fi if checkyesno accept_sourceroute; then ropts_init echo -n ' accept source routing=YES' - sysctl net.inet.ip.accept_sourceroute=1 >/dev/null + ${SYSCTL_W} net.inet.ip.accept_sourceroute=1 > /dev/null + else + ${SYSCTL_W} net.inet.ip.accept_sourceroute=0 > /dev/null fi - if checkyesno ipxgateway_enable; then + if checkyesno arpproxy_all; then ropts_init - echo -n ' IPX gateway=YES' - sysctl net.ipx.ipx.ipxforwarding=1 >/dev/null + echo -n ' ARP proxyall=YES' + ${SYSCTL_W} net.link.ether.inet.proxyall=1 > /dev/null + else + ${SYSCTL_W} net.link.ether.inet.proxyall=0 > /dev/null fi +} - if checkyesno arpproxy_all; then +options_inet6() +{ + if checkyesno ipv6_gateway_enable; then ropts_init - echo -n ' ARP proxyall=YES' - sysctl net.link.ether.inet.proxyall=1 >/dev/null + echo -n ' IPv6 gateway=YES' + ${SYSCTL_W} net.inet6.ip6.forwarding=1 > /dev/null + else + ${SYSCTL_W} net.inet6.ip6.forwarding=0 > /dev/null fi +} - [ -n "${_ropts_initdone}" ] && echo '.' +options_atm() +{ +} + +options_ipx() +{ + if checkyesno ipxgateway_enable; then + ropts_init + echo -n ' IPX gateway=YES' + ${SYSCTL_W} net.ipx.ipx.ipxforwarding=1 > /dev/null + else + ${SYSCTL_W} net.ipx.ipx.ipxforwarding=0 > /dev/null + fi } load_rc_config $name ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/static_arp#2 (text+ko) ==== @@ -26,7 +26,7 @@ # # Configure static ARP table # -# $FreeBSD: src/etc/rc.d/static_arp,v 1.2 2009/08/25 20:05:51 delphij Exp $ +# $FreeBSD: src/etc/rc.d/static_arp,v 1.4 2009/10/02 06:19:34 hrs Exp $ # # PROVIDE: static_arp @@ -34,6 +34,7 @@ # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="static_arp" start_cmd="static_arp_start" ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#2 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/etc/rc.d/stf,v 1.1 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/stf,v 1.3 2009/10/02 06:19:34 hrs Exp $ # # PROVIDE: stf ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#7 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.27 2009/07/21 08:29:19 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.28 2009/10/02 11:10:05 rpaulo Exp $"); #include #include @@ -83,15 +83,6 @@ #include #endif -#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) -#include -#endif - -#if defined(PERFCTRS) -struct arm_pmc_funcs *arm_pmc; -#endif - /* PRIMARY CACHE VARIABLES */ int arm_picache_size; int arm_picache_line_size; @@ -1128,10 +1119,6 @@ : "r" (BCUCTL_E0|BCUCTL_E1|BCUCTL_EV)); cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - /* * i80200 errata: Step-A0 and A1 have a bug where * D$ dirty bits are not cleared on "invalidate by @@ -1165,10 +1152,6 @@ PMNC_CC_IF)); cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); @@ -1179,10 +1162,6 @@ #if defined(CPU_XSCALE_81342) if (cputype == CPU_ID_81342) { cpufuncs = xscalec3_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); @@ -1196,10 +1175,6 @@ (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) { cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); @@ -1215,10 +1190,6 @@ cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) { cpufuncs = xscale_cpufuncs; -#if defined(PERFCTRS) - xscale_pmu_init(); -#endif - cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1473 2009/09/28 07:32:11 thompsa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1474 2009/10/02 12:47:01 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2668,12 +2668,12 @@ vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard -xdr/xdr.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_array.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_mbuf.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_mem.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver -xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver +xdr/xdr.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_array.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_mbuf.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_mem.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd # gnu/fs/xfs/xfs_alloc.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.297 2009/07/29 08:49:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.298 2009/10/01 22:05:38 kmacy Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -270,11 +270,7 @@ /* * XXX XEN need to check on PSL_USER is handled */ -#ifdef XEN - td2->td_md.md_saved_flags = 0; -#else td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; -#endif /* * Now, cpu_switch() can schedule the new process. * pcb_esp is loaded pointing to the cpu_switch() stack frame @@ -446,11 +442,7 @@ /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; -#ifdef XEN - td->td_md.md_saved_flags = 0; -#else td->td_md.md_saved_flags = PSL_KERNEL | PSL_I; -#endif } /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.156 2009/09/30 16:34:50 avg Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.157 2009/10/01 22:05:38 kmacy Exp $ */ /* @@ -49,8 +49,8 @@ extern void xen_load_cr3(u_int data); extern void xen_tlb_flush(void); extern void xen_invlpg(u_int addr); -extern int xen_save_and_cli(void); -extern void xen_restore_flags(u_int eflags); +extern void write_eflags(u_int eflags); +extern u_int read_eflags(void); #endif struct region_descriptor; @@ -293,7 +293,11 @@ } static __inline u_int +#ifdef XEN +_read_eflags(void) +#else read_eflags(void) +#endif { u_int ef; @@ -335,7 +339,11 @@ } static __inline void +#ifdef XEN +_write_eflags(u_int ef) +#else write_eflags(u_int ef) +#endif { __asm __volatile("pushl %0; popfl" : : "r" (ef)); } @@ -653,23 +661,15 @@ { register_t eflags; -#ifdef XEN - eflags = xen_save_and_cli(); -#else eflags = read_eflags(); disable_intr(); -#endif return (eflags); } static __inline void intr_restore(register_t eflags) { -#ifdef XEN - xen_restore_flags(eflags); -#else write_eflags(eflags); -#endif } #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#11 (text+ko) ==== @@ -31,11 +31,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.19 2009/04/01 17:06:28 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.20 2009/10/01 22:05:38 kmacy Exp $"); #include #include #include +#include #include #include #include @@ -101,6 +102,7 @@ void ni_cli(void) { + CTR0(KTR_SPARE2, "ni_cli disabling interrupts"); __asm__("pushl %edx;" "pushl %eax;" ); @@ -345,33 +347,53 @@ PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0); } -void -xen_restore_flags(u_int eflags) +#ifdef KTR +static __inline u_int +rebp(void) { - if (eflags > 1) - eflags = ((eflags & PSL_I) == 0); + u_int data; - __restore_flags(eflags); + __asm __volatile("movl 4(%%ebp),%0" : "=r" (data)); + return (data); } +#endif -int -xen_save_and_cli(void) +u_int +read_eflags(void) { - int eflags; - - __save_and_cli(eflags); + vcpu_info_t *_vcpu; + u_int eflags; + + eflags = _read_eflags(); + _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; + if (_vcpu->evtchn_upcall_mask) + eflags &= ~PSL_I; + return (eflags); } void +write_eflags(u_int eflags) +{ + u_int intr; + + CTR2(KTR_SPARE2, "%x xen_restore_flags eflags %x", rebp(), eflags); + intr = ((eflags & PSL_I) == 0); + __restore_flags(intr); + _write_eflags(eflags); +} + +void xen_cli(void) { + CTR1(KTR_SPARE2, "%x xen_cli disabling interrupts", rebp()); __cli(); } void xen_sti(void) { + CTR1(KTR_SPARE2, "%x xen_sti enabling interrupts", rebp()); __sti(); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From trasz at FreeBSD.org Fri Oct 2 22:34:34 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 22:34:48 2009 Subject: PERFORCE change 169165 for review Message-ID: <200910022234.n92MYXeK091749@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169165 Change 169165 by trasz@trasz_victim on 2009/10/02 22:34:12 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/mmap/mmap.c#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#5 (text+ko) ==== @@ -2,7 +2,7 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.151 2009/10/02 02:28:59 hrs Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.152 2009/10/02 20:19:53 hrs Exp $ # # PROVIDE: routing @@ -13,26 +13,80 @@ . /etc/network.subr name="routing" -start_cmd="routing_start" +start_cmd="routing_start doall" stop_cmd="routing_stop" extra_commands="options static" -static_cmd="static_start" -options_cmd="options_start" +static_cmd="routing_start static" +options_cmd="routing_start options" + +afcheck() +{ + case $_af in + ""|inet|inet6|ipx|atm) + ;; + *) + err 1 "Unsupported address family: $_af." + ;; + esac +} routing_start() { - static_start "$@" - options_start "$@" + local _cmd _af _a + _cmd=$1 + _af=$2 + + afcheck + + case $_af in + inet|inet6|ipx|atm) + setroutes $_cmd $_af + ;; + "") + for _a in inet inet6 ipx atm; do + afexists $_a && setroutes $_cmd $_a + done + ;; + esac + [ -n "${_ropts_initdone}" ] && echo '.' } routing_stop() { - local _af + local _af _a + _af=$1 + + afcheck + + case $_af in + inet|inet6|ipx|atm) + eval static_${_af} delete + eval routing_stop_${_af} + ;; + "") + for _a in inet inet6 ipx atm; do + afexists $_a || continue + eval static_${_a} delete + eval routing_stop_${_a} + done + ;; + esac +} - static_stop "$@" - for _af in inet inet6; do - afexists ${_af} && eval routing_stop_${_af} - done +setroutes() +{ + case $1 in + static) + static_$2 add + ;; + options) + options_$2 + ;; + doall) + static_$2 add + options_$2 + ;; + esac } routing_stop_inet() @@ -50,47 +104,16 @@ done } -static_start() +routing_stop_atm() { - local _af - _af=$1 - - case ${_af} in - inet|inet6|atm) - do_static add ${_af} - ;; - "") - do_static add inet inet6 atm - ;; - esac + return 0 } -static_stop() +routing_stop_ipx() { - local _af - _af=$1 - - case ${_af} in - inet|inet6|atm) - do_static delete ${_af} - ;; - "") - do_static delete inet inet6 atm - ;; - esac + return 0 } -do_static() -{ - local _af _action - _action=$1 - - shift - for _af in "$@"; do - afexists ${_af} && eval static_${_af} ${_action} - done -} - static_inet() { local _action @@ -233,6 +256,10 @@ fi } +static_ipx() +{ +} + _ropts_initdone= ropts_init() { @@ -242,16 +269,6 @@ fi } -options_start() -{ - local _af - - for _af in inet inet6 ipx; do - afexists ${_af} && eval options_${_af} - done - [ -n "${_ropts_initdone}" ] && echo '.' -} - options_inet() { if checkyesno icmp_bmcastecho; then @@ -322,6 +339,10 @@ fi } +options_atm() +{ +} + options_ipx() { if checkyesno ipxgateway_enable; then ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#15 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.305 2009/10/01 10:53:12 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.306 2009/10/02 17:48:51 bz Exp $"); #include "opt_ddb.h" #include "opt_init_path.h" @@ -510,6 +510,11 @@ pmap_pinit0(vmspace_pmap(&vmspace0)); p->p_vmspace = &vmspace0; vmspace0.vm_refcnt = 1; + + /* + * proc0 is not expected to enter usermode, so there is no special + * handling for sv_minuser here, like is done for exec_new_vmspace(). + */ vm_map_init(&vmspace0.vm_map, p->p_sysent->sv_minuser, p->p_sysent->sv_maxuser); vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.338 2009/09/09 10:52:36 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.339 2009/10/02 17:48:51 bz Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -122,6 +122,11 @@ SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW, &ps_arg_cache_limit, 0, ""); +static int map_at_zero = 0; +TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero); +SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0, + "Permit processes to map an object at virtual address 0."); + static int sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS) { @@ -1002,7 +1007,7 @@ int error; struct proc *p = imgp->proc; struct vmspace *vmspace = p->p_vmspace; - vm_offset_t stack_addr; + vm_offset_t sv_minuser, stack_addr; vm_map_t map; u_long ssiz; @@ -1018,13 +1023,17 @@ * not disrupted */ map = &vmspace->vm_map; - if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser && + if (map_at_zero) + sv_minuser = sv->sv_minuser; + else + sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE); + if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser && vm_map_max(map) == sv->sv_maxuser) { shmexit(vmspace); pmap_remove_pages(vmspace_pmap(vmspace)); vm_map_remove(map, vm_map_min(map), vm_map_max(map)); } else { - error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser); + error = vmspace_exec(p, sv_minuser, sv->sv_maxuser); if (error) return (error); vmspace = p->p_vmspace; ==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#11 (text+ko) ==== @@ -95,7 +95,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.344 2009/09/15 22:23:45 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.345 2009/10/02 21:31:15 rwatson Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -970,9 +970,6 @@ * must use a signed comparison of space and resid. On the other * hand, a negative resid causes us to loop sending 0-length * segments to the protocol. - * - * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM - * type sockets since that's an error. */ if (resid < 0) { error = EINVAL; ==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.235 2009/09/27 14:49:51 simon Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.236 2009/10/02 17:51:46 bz Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -97,14 +97,6 @@ "Maximum number of memory-mapped files per process"); /* - * 'mmap_zero' determines whether or not MAP_FIXED mmap() requests for - * virtual address zero are permitted. - */ -static int mmap_zero; -SYSCTL_INT(_security_bsd, OID_AUTO, mmap_zero, CTLFLAG_RW, &mmap_zero, 0, - "Processes may map an object at virtual address zero"); - -/* * Set the maximum number of vm_map_entry structures per process. Roughly * speaking vm_map_entry structures are tiny, so allowing them to eat 1/100 * of our KVM malloc space still results in generous limits. We want a @@ -277,13 +269,6 @@ if (addr & PAGE_MASK) return (EINVAL); - /* - * Mapping to address zero is only permitted if - * mmap_zero is enabled. - */ - if (addr == 0 && !mmap_zero) - return (EINVAL); - /* Address range must be all in user VM space. */ if (addr < vm_map_min(&vms->vm_map) || addr + size > vm_map_max(&vms->vm_map)) ==== //depot/projects/soc2009/trasz_limits/tools/regression/mmap/mmap.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/tools/regression/mmap/mmap.c,v 1.1 2009/09/27 21:03:33 bz Exp $ + * $FreeBSD: src/tools/regression/mmap/mmap.c,v 1.2 2009/10/02 17:53:48 bz Exp $ */ #include @@ -36,7 +36,7 @@ const struct tests { void *addr; - int ok[2]; /* Depending on security.bsd.mmap_zero {0, !=0}. */ + int ok[2]; /* Depending on security.bsd.map_at_zero {0, !=0}. */ } tests[] = { { (void *)0, { 0, 1 } }, /* Test sysctl. */ { (void *)1, { 0, 0 } }, @@ -54,37 +54,37 @@ { void *p; size_t len; - int i, error, mib[3], mmap_zero; + int i, error, mib[3], map_at_zero; error = 0; - /* Get the current sysctl value of security.bsd.mmap_zero. */ + /* Get the current sysctl value of security.bsd.map_at_zero. */ len = sizeof(mib) / sizeof(*mib); - if (sysctlnametomib("security.bsd.mmap_zero", mib, &len) == -1) - err(1, "sysctlnametomib(security.bsd.mmap_zero)"); + if (sysctlnametomib("security.bsd.map_at_zero", mib, &len) == -1) + err(1, "sysctlnametomib(security.bsd.map_at_zero)"); - len = sizeof(mmap_zero); - if (sysctl(mib, 3, &mmap_zero, &len, NULL, 0) == -1) - err(1, "sysctl(security.bsd.mmap_zero)"); + len = sizeof(map_at_zero); + if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1) + err(1, "sysctl(security.bsd.map_at_zero)"); /* Normalize to 0 or 1 for array access. */ - mmap_zero = !!mmap_zero; + map_at_zero = !!map_at_zero; for (i=0; i < (sizeof(tests) / sizeof(*tests)); i++) { p = mmap((void *)tests[i].addr, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_FIXED, -1, 0); if (p == MAP_FAILED) { - if (tests[i].ok[mmap_zero] != 0) + if (tests[i].ok[map_at_zero] != 0) error++; warnx("%s: mmap(%p, ...) failed.", - (tests[i].ok[mmap_zero] == 0) ? "OK " : "ERR", + (tests[i].ok[map_at_zero] == 0) ? "OK " : "ERR", tests[i].addr); } else { - if (tests[i].ok[mmap_zero] != 1) + if (tests[i].ok[map_at_zero] != 1) error++; warnx("%s: mmap(%p, ...) succeeded: p=%p", - (tests[i].ok[mmap_zero] == 1) ? "OK " : "ERR", + (tests[i].ok[map_at_zero] == 1) ? "OK " : "ERR", tests[i].addr, p); } } From trasz at FreeBSD.org Fri Oct 2 22:40:41 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 22:40:47 2009 Subject: PERFORCE change 169167 for review Message-ID: <200910022240.n92MeeN7092271@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169167 Change 169167 by trasz@trasz_victim on 2009/10/02 22:39:44 Remove file that is no longer relevant. Affected files ... .. //depot/projects/soc2009/trasz_limits/MILESTONES#4 delete Differences ... From trasz at FreeBSD.org Fri Oct 2 22:44:45 2009 From: trasz at FreeBSD.org (Edward Tomasz Napierala) Date: Fri Oct 2 22:44:52 2009 Subject: PERFORCE change 169168 for review Message-ID: <200910022244.n92MiiFF092500@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169168 Change 169168 by trasz@trasz_victim on 2009/10/02 22:44:39 Fix mismerges. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/rpc/xdr.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/netipsec/key.h#3 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ==== @@ -1,112 +1,70 @@ /* - * CDDL HEADER START + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. * - * CDDL HEADER END + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $ + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -/* - * Portions of this source code were derived from Berkeley 4.3 BSD - * under license from the Regents of the University of California. - */ - #ifndef _OPENSOLARIS_RPC_XDR_H_ #define _OPENSOLARIS_RPC_XDR_H_ #include_next #ifndef _KERNEL -#include_next -/* - * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so - * we have to hack it in here (source taken from OpenSolaris). - * By the way, it is assumed the xdrmem implementation is used. - */ - -#undef xdr_control -#define xdr_control(a,b,c) xdrmem_control(a,b,c) +#include /* - * These are the request arguments to XDR_CONTROL. + * Taken from sys/xdr/xdr_mem.c. * - * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. - * XDR_SKIPBYTES - skips the next N bytes in the XDR stream. - * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from - * the XDR stream being moved over RDMA - * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in - * the XDR stream moving over RDMA. + * FreeBSD's userland XDR doesn't implement control method (only the kernel), + * but OpenSolaris nvpair still depend on it, so we have to implement it here. */ -#define XDR_PEEK 2 -#define XDR_SKIPBYTES 3 -#define XDR_RDMAGET 4 -#define XDR_RDMASET 5 - -/* FIXME: probably doesn't work */ static __inline bool_t xdrmem_control(XDR *xdrs, int request, void *info) { xdr_bytesrec *xptr; - int32_t *int32p; - int len; switch (request) { - case XDR_GET_BYTES_AVAIL: xptr = (xdr_bytesrec *)info; xptr->xc_is_last_record = TRUE; xptr->xc_num_avail = xdrs->x_handy; return (TRUE); - - case XDR_PEEK: - /* - * Return the next 4 byte unit in the XDR stream. - */ - if (xdrs->x_handy < sizeof (int32_t)) - return (FALSE); - int32p = (int32_t *)info; - *int32p = (int32_t)ntohl((uint32_t) - (*((int32_t *)(xdrs->x_private)))); - return (TRUE); - - case XDR_SKIPBYTES: - /* - * Skip the next N bytes in the XDR stream. - */ - int32p = (int32_t *)info; - len = RNDUP((int)(*int32p)); - if ((xdrs->x_handy -= len) < 0) - return (FALSE); - xdrs->x_private += len; - return (TRUE); - + default: + assert(!"unexpected request"); } return (FALSE); } + +#undef XDR_CONTROL +#define XDR_CONTROL(xdrs, req, op) \ + (((xdrs)->x_ops->x_control == NULL) ? \ + xdrmem_control((xdrs), (req), (op)) : \ + (*(xdrs)->x_ops->x_control)(xdrs, req, op)) + #endif /* !_KERNEL */ #endif /* !_OPENSOLARIS_RPC_XDR_H_ */ ==== //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#10 (text+ko) ==== @@ -32,9 +32,6 @@ # # env "GENERIC.env" -options IPSEC -device crypto - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler @@ -78,7 +75,6 @@ options MAC # TrustedBSD MAC Framework options FLOWTABLE # per-cpu routing cache #options KDTRACE_HOOKS # Kernel DTrace hooks -options ACPI_DEBUG # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#13 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/netipsec/key.h#3 (text+ko) ==== @@ -112,8 +112,6 @@ key_portfromsaddr((struct sockaddr *)(saddr)) #endif -extern in_addr_t key_find_src(const in_addr_t *dst); - #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_IPSEC_SA); MALLOC_DECLARE(M_IPSEC_SAH); From yohanes at FreeBSD.org Sat Oct 3 02:35:59 2009 From: yohanes at FreeBSD.org (Yohanes Nugroho) Date: Sat Oct 3 02:36:06 2009 Subject: PERFORCE change 169170 for review Message-ID: <200910030235.n932ZvIp026096@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169170 Change 169170 by yohanes@econa on 2009/10/03 02:35:46 not stopping DMA, using interrupt for cleanup Affected files ... .. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#4 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#4 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#5 edit .. //depot/projects/str91xx/src/sys/arm/econa/timer.c#4 edit Differences ... ==== //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#4 (text+ko) ==== @@ -52,7 +52,8 @@ #options COMPAT_FREEBSD7 -options SCHED_ULE #ULE scheduler +#options SCHED_ULE #ULE scheduler +options SCHED_4BSD #4BSD scheduler options GEOM_PART_GPT # GUID Partition Tables. #options GEOM_PART_EBR #options GEOM_PART_EBR_COMPAT @@ -106,7 +107,7 @@ #options ARM_USE_SMALL_ALLOC device usb -options USB_DEBUG +#options USB_DEBUG device ohci device ehci device umass ==== //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#4 (text+ko) ==== @@ -201,7 +201,7 @@ boot_arg1 = arg; boot_arg2 = arg2; boothowto = RB_VERBOSE; - //boothowto |= RB_SINGLE; + boothowto |= RB_SINGLE; set_cpufuncs(); lastaddr = fake_preload_metadata(); ==== //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#5 (text+ko) ==== @@ -79,6 +79,7 @@ struct mtx sc_mtx; /* global mutex */ struct mtx sc_mtx_tx; /* tx mutex */ struct mtx sc_mtx_rx; /* rx mutex */ + struct mtx sc_mtx_cleanup; /* rx mutex */ bus_dma_tag_t sc_parent_tag; /* parent bus DMA tag */ @@ -86,11 +87,13 @@ device_t miibus; /* My child miibus */ void *intrhand; /* Interrupt handle */ void *intrhand_qf; /* Interrupt handle: queue full */ + void *intrhand_tx; /* Interrupt handle: queue full */ void *intrhand_status; /* Interrupt handle */ - struct resource *irq_res_rec; /* IRQ resource */ - struct resource *irq_res_qf; /* IRQ resource */ - struct resource *irq_res_status; /* IRQ resource */ + struct resource *irq_res_tx; /* transmit */ + struct resource *irq_res_rec; /* receive */ + struct resource *irq_res_qf; /* queue full */ + struct resource *irq_res_status; /* status */ struct resource *mem_res; /* Memory resource */ @@ -131,6 +134,7 @@ struct taskqueue *sc_tq; struct task sc_intr_task; + struct task sc_cleanup_task; struct task sc_tx_task; }; @@ -212,6 +216,14 @@ mtx_init(&_sc->sc_mtx_tx, device_get_nameunit(_sc->dev), \ "ECE TX Lock", MTX_DEF) + +#define ECE_CLEANUPLOCK(_sc) mtx_lock(&(_sc)->sc_mtx_cleanup) +#define ECE_CLEANUPUNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx_cleanup) +#define ECE_CLEANUPLOCK_INIT(_sc) \ + mtx_init(&_sc->sc_mtx_cleanup, device_get_nameunit(_sc->dev), \ + "ECE cleanup Lock", MTX_DEF) + + #define ECE_RXLOCK(_sc) mtx_lock(&(_sc)->sc_mtx_rx) #define ECE_RXUNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx_rx) #define ECE_RXLOCK_INIT(_sc) \ @@ -221,6 +233,7 @@ #define ECE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define ECE_TXLOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx_tx); #define ECE_RXLOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx_rx); +#define ECE_CLEANUPLOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx_cleanup); #define ECE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define ECE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); @@ -271,9 +284,13 @@ static void ece_intr_task(void *arg, int pending __unused); static void ece_tx_task(void *arg, int pending __unused); +static void ece_cleanup_task(void *arg, int pending __unused); static int ece_allocate_dma(struct ece_softc *sc); +static void ece_intr_tx(void *xsc); + + static inline int phy_read(struct ece_softc *sc, int phy, int reg) { @@ -289,6 +306,7 @@ for (ii = 0; ii < 0x1000; ii++) { status = RD4(sc, PHY_CONTROL); + DELAY(1); if (status & (0x1 << 15)) { /* clear the rw_ok status, and clear other bits value */ WR4(sc, PHY_CONTROL, (0x1 << 15)); @@ -393,6 +411,13 @@ if (sc->irq_res_rec == NULL) goto out; + // + rid = 1; /*TSTC: Fm-Switch-Tx-Complete*/ + sc->irq_res_tx = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res_tx == NULL) + goto out; + rid = 0; sc->irq_res_status = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); @@ -488,6 +513,7 @@ TASK_INIT(&sc->sc_intr_task, 0, ece_intr_task, sc); TASK_INIT(&sc->sc_tx_task, 1, ece_tx_task, ifp); + TASK_INIT(&sc->sc_cleanup_task, 2, ece_cleanup_task, sc); sc->sc_tq = taskqueue_create_fast("ece_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->sc_tq); if (sc->sc_tq == NULL) { @@ -517,6 +543,7 @@ ECE_LOCK_DESTROY(sc); goto out; } + err = bus_setup_intr(dev, sc->irq_res_qf, INTR_TYPE_NET | INTR_MPSAFE, NULL,ece_intr_qf, sc, &sc->intrhand_qf); @@ -525,8 +552,21 @@ ECE_LOCK_DESTROY(sc); goto out; } + + + err = bus_setup_intr(dev, sc->irq_res_tx, INTR_TYPE_NET | INTR_MPSAFE, + NULL,ece_intr_tx, sc, &sc->intrhand_tx); + + if (err) { + ether_ifdetach(ifp); + ECE_LOCK_DESTROY(sc); + goto out; + } + + ECE_TXLOCK_INIT(sc); ECE_RXLOCK_INIT(sc); + ECE_CLEANUPLOCK_INIT(sc); DEBUG_TRACE; @@ -1652,9 +1692,69 @@ taskqueue_enqueue(sc->sc_tq, &sc->sc_intr_task); } +static void +ece_cleanup_locked(struct ece_softc *sc) +{ + //printf("cleaning up\n"); + int desc_idx; + eth_tx_desc_t *desc; + int start = sc->curr_tx_mbuf - 1; + if (start<0) start = ECE_MAX_TX_BUFFERS-1; + + desc_idx = sc->sent_position[start]; + while (desc_idx!=-1) { + //bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_idx], BUS_DMASYNC_PREREAD); + desc = (eth_tx_desc_t *)&(sc->desc_tx[desc_idx]); + if (desc->cown != 0) { + if (sc->buffer_tx[start]) { + //printf("freeing\n"); + m_freem(sc->buffer_tx[start]); + sc->buffer_tx[start] = 0; + } + sc->sent_position[start] = -1; + start--; + if (start<0) start = ECE_MAX_TX_BUFFERS-1; + desc_idx = sc->sent_position[start]; + } else { + break; + } + } + +} + +static void +ece_cleanup_task(void *arg, int pending __unused) +{ +// printf("ECE INTR TASK"); + struct ece_softc *sc = arg; + //struct ifnet *ifp = sc->ifp; + //printf("cleanup task called\n"); + ECE_CLEANUPLOCK(sc); + //printf("inside lock\n"); + ece_cleanup_locked(sc); + ECE_CLEANUPUNLOCK(sc); +} + static void +ece_intr_tx(void *xsc) +{ + struct ece_softc *sc = xsc; + struct ifnet *ifp = sc->ifp; + //printf("data sent"); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + printf("should not happen, stopping dma"); + /*this should not happen, stop DMA*/ + WR4(sc, FS_DMA_CONTROL, 0); + return; + } + taskqueue_enqueue(sc->sc_tq, &sc->sc_cleanup_task); +} + + + +static void ece_intr_qf(void *xsc) { struct ece_softc *sc = xsc; @@ -1706,7 +1806,7 @@ int seg; int nsegs; int desc_no; - int desc_idx; + //int desc_idx; int start; eth_tx_desc_t *desc = 0; @@ -1767,6 +1867,7 @@ desc->ico = 0; desc->tco = 0; desc->uco = 0; + desc->interrupt = 1; #if 0 if (csum_flags) { @@ -1783,7 +1884,7 @@ } //desc->cown = 0; - desc->interrupt = 0; + //sc->interrupt = 0; desc++; sc->desc_curr_tx = (sc->desc_curr_tx+1) % ECE_MAX_TX_BUFFERS; @@ -1796,7 +1897,7 @@ for (seg = 0; seg < nsegs; seg++) { desc->cown = 0; desc++; - bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_no], BUS_DMASYNC_PREWRITE); + //bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_no], BUS_DMASYNC_PREWRITE); desc_no = (desc_no+1) % ECE_MAX_TX_BUFFERS; if (desc_no==0) { desc = (eth_tx_desc_t *)&(sc->desc_tx[0]); @@ -1806,24 +1907,6 @@ bus_dmamap_sync(sc->dmatag_ring_tx, mapp, BUS_DMASYNC_PREWRITE); - if (start<0) start = ECE_MAX_TX_BUFFERS-1; - - desc_idx = sc->sent_position[start]; - while (desc_idx!=-1) { - //bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_idx], BUS_DMASYNC_PREREAD); - desc = (eth_tx_desc_t *)&(sc->desc_tx[desc_idx]); - if (desc->cown != 0) { - if (sc->buffer_tx[start]) { - m_freem(sc->buffer_tx[start]); - sc->buffer_tx[start] = 0; - - } - sc->sent_position[start] = -1; - start--; - if (start<0) start = ECE_MAX_TX_BUFFERS-1; - desc_idx = sc->sent_position[start]; - } - } return (0); } @@ -1845,7 +1928,7 @@ IFF_DRV_RUNNING) return; - WR4(sc, TS_DMA_CONTROL, 0); + //WR4(sc, TS_DMA_CONTROL, 0); for (;;) { /* Get packet from the queue */ IF_DEQUEUE(&ifp->if_snd, m0); @@ -2032,7 +2115,7 @@ if (phy>0) return 0; //printf("read reg %d phy %d\n", reg, phy); sc = device_get_softc(dev); - + return phy_read(sc, phy, reg); } ==== //depot/projects/str91xx/src/sys/arm/econa/timer.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ unsigned int AHB_clock; unsigned int APB_clock; -unsigned long gettimeoffset(void); + void timer_enable(void); unsigned int str9100_timer_disable(void); unsigned int read_timer_counter(void); @@ -358,50 +358,6 @@ -unsigned long -gettimeoffset(void) -{ - unsigned int ticks1, ticks2; - unsigned int interrupt_status; - u_int savedints; - savedints = disable_interrupts(I32_bit); - - - /* - * Get the current number of ticks. Note that there is a race - * condition between us reading the timer and checking for - * an interrupt. We get around this by ensuring that the - * counter has not reloaded between our two reads. - */ - ticks2 = read_timer_counter(); - do { - ticks1 = ticks2; - interrupt_status = read_timer_interrupt_status(); - ticks2 = read_timer_counter(); - } while (ticks2 > ticks1); - - /* - * Number of ticks since last interrupt. - */ - ticks1 = timer_counter - ticks2; - - /* - * Interrupt pending? If so, we've reloaded once already. - */ - if (interrupt_status & - ((1 << TIMER1_MATCH1_INTR_BIT_INDEX) || - (1 << TIMER1_MATCH2_INTR_BIT_INDEX) || - (1 << TIMER1_OVERFLOW_INTR_BIT_INDEX))) { - ticks1 += timer_counter; - } - restore_interrupts(savedints); - /* - * Convert the ticks to usecs - */ - return TICKS2USECS(ticks1); -} - - static unsigned ec_timer_get_timecount(struct timecounter *a) @@ -427,9 +383,9 @@ { sys_clock = 100000000; - printf("System clock %08x", (*(unsigned int *)(0x77000008))); + printf("System clock %08x\n", (*(unsigned int *)(0x77000008))); - printf("Reset conf %08x", (*(unsigned int *)(0x77000014))); + printf("Reset conf %08x\n", (*(unsigned int *)(0x77000014))); switch (((*(unsigned int *)(0x77000014)) >> 6) & 0x3) { From bz at FreeBSD.org Sat Oct 3 08:16:13 2009 From: bz at FreeBSD.org (Bjoern A. Zeeb) Date: Sat Oct 3 08:16:21 2009 Subject: PERFORCE change 169172 for review Message-ID: <200910030816.n938G9MG066309@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169172 Change 169172 by bz@bz_dumpster on 2009/10/03 08:15:14 IFC @169171 Affected files ... .. //depot/projects/s390/Makefile.inc1#30 integrate .. //depot/projects/s390/ObsoleteFiles.inc#10 integrate .. //depot/projects/s390/UPDATING#23 integrate .. //depot/projects/s390/bin/chmod/chmod.c#7 integrate .. //depot/projects/s390/bin/cp/utils.c#11 integrate .. //depot/projects/s390/bin/getfacl/getfacl.1#8 integrate .. //depot/projects/s390/bin/getfacl/getfacl.c#7 integrate .. //depot/projects/s390/bin/ls/print.c#10 integrate .. //depot/projects/s390/bin/mv/mv.c#6 integrate .. //depot/projects/s390/bin/setfacl/mask.c#3 integrate .. //depot/projects/s390/bin/setfacl/merge.c#3 integrate .. //depot/projects/s390/bin/setfacl/remove.c#3 integrate .. //depot/projects/s390/bin/setfacl/setfacl.1#7 integrate .. //depot/projects/s390/bin/setfacl/setfacl.c#6 integrate .. //depot/projects/s390/bin/setfacl/setfacl.h#4 integrate .. //depot/projects/s390/bin/sh/eval.c#11 integrate .. //depot/projects/s390/bin/sh/exec.c#10 integrate .. //depot/projects/s390/bin/sh/exec.h#6 integrate .. //depot/projects/s390/bin/sh/mknodes.c#5 integrate .. //depot/projects/s390/bin/sh/nodes.c.pat#7 integrate .. //depot/projects/s390/bin/sh/parser.c#8 integrate .. //depot/projects/s390/bin/sh/sh.1#13 integrate .. //depot/projects/s390/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/head/assert.h#3 delete .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate .. //depot/projects/s390/contrib/ee/ee.c#2 integrate .. //depot/projects/s390/contrib/gdtoa/gdtoaimp.h#7 integrate .. //depot/projects/s390/contrib/gdtoa/misc.c#3 integrate .. //depot/projects/s390/contrib/traceroute/as.c#2 integrate .. //depot/projects/s390/contrib/traceroute/as.h#2 integrate .. //depot/projects/s390/contrib/traceroute/traceroute.c#7 integrate .. //depot/projects/s390/crypto/openssh/ChangeLog#9 integrate .. //depot/projects/s390/crypto/openssh/README#8 integrate .. //depot/projects/s390/crypto/openssh/README.platform#4 integrate .. //depot/projects/s390/crypto/openssh/auth-pam.c#10 integrate .. //depot/projects/s390/crypto/openssh/auth-passwd.c#7 integrate .. //depot/projects/s390/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/s390/crypto/openssh/auth1.c#7 integrate .. //depot/projects/s390/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/s390/crypto/openssh/auth2-kbdint.c#6 integrate .. //depot/projects/s390/crypto/openssh/auth2-none.c#5 integrate .. //depot/projects/s390/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/s390/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/s390/crypto/openssh/auth2.c#10 integrate .. //depot/projects/s390/crypto/openssh/canohost.c#10 integrate .. //depot/projects/s390/crypto/openssh/canohost.h#5 integrate .. //depot/projects/s390/crypto/openssh/channels.c#11 integrate .. //depot/projects/s390/crypto/openssh/clientloop.c#9 integrate .. //depot/projects/s390/crypto/openssh/config.h#9 integrate .. //depot/projects/s390/crypto/openssh/config.h.in#3 integrate .. //depot/projects/s390/crypto/openssh/defines.h#9 integrate .. //depot/projects/s390/crypto/openssh/gss-genr.c#5 integrate .. //depot/projects/s390/crypto/openssh/includes.h#8 integrate .. //depot/projects/s390/crypto/openssh/jpake.c#2 integrate .. //depot/projects/s390/crypto/openssh/jpake.h#2 integrate .. //depot/projects/s390/crypto/openssh/kex.c#8 integrate .. //depot/projects/s390/crypto/openssh/kex.h#8 integrate .. //depot/projects/s390/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/s390/crypto/openssh/kexgexs.c#5 integrate .. //depot/projects/s390/crypto/openssh/monitor.c#11 integrate .. //depot/projects/s390/crypto/openssh/monitor_mm.c#5 integrate .. //depot/projects/s390/crypto/openssh/monitor_wrap.c#9 integrate .. //depot/projects/s390/crypto/openssh/monitor_wrap.h#7 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/daemon.c#5 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/getrrsetbyname.c#5 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/openssl-compat.h#4 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/port-aix.c#6 integrate .. //depot/projects/s390/crypto/openssh/openbsd-compat/port-aix.h#7 integrate .. //depot/projects/s390/crypto/openssh/packet.c#10 integrate .. //depot/projects/s390/crypto/openssh/packet.h#6 integrate .. //depot/projects/s390/crypto/openssh/readconf.c#9 integrate .. //depot/projects/s390/crypto/openssh/readconf.h#8 integrate .. //depot/projects/s390/crypto/openssh/roaming.h#1 branch .. //depot/projects/s390/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/s390/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/s390/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/s390/crypto/openssh/schnorr.h#1 branch .. //depot/projects/s390/crypto/openssh/servconf.c#9 integrate .. //depot/projects/s390/crypto/openssh/serverloop.c#10 integrate .. //depot/projects/s390/crypto/openssh/session.c#12 integrate .. //depot/projects/s390/crypto/openssh/sftp-client.c#8 integrate .. //depot/projects/s390/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/s390/crypto/openssh/sftp-server.c#8 integrate .. //depot/projects/s390/crypto/openssh/ssh-agent.1#7 integrate .. //depot/projects/s390/crypto/openssh/ssh-agent.c#10 integrate .. //depot/projects/s390/crypto/openssh/ssh-keygen.c#9 integrate .. //depot/projects/s390/crypto/openssh/ssh.1#9 integrate .. //depot/projects/s390/crypto/openssh/ssh.c#9 integrate .. //depot/projects/s390/crypto/openssh/ssh_config#11 integrate .. //depot/projects/s390/crypto/openssh/ssh_config.5#11 integrate .. //depot/projects/s390/crypto/openssh/ssh_namespace.h#4 integrate .. //depot/projects/s390/crypto/openssh/sshconnect.c#10 integrate .. //depot/projects/s390/crypto/openssh/sshconnect.h#4 integrate .. //depot/projects/s390/crypto/openssh/sshconnect2.c#10 integrate .. //depot/projects/s390/crypto/openssh/sshd.8#11 integrate .. //depot/projects/s390/crypto/openssh/sshd.c#12 integrate .. //depot/projects/s390/crypto/openssh/sshd_config#11 integrate .. //depot/projects/s390/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/s390/crypto/openssh/sshlogin.c#7 integrate .. //depot/projects/s390/crypto/openssh/uuencode.c#5 integrate .. //depot/projects/s390/crypto/openssh/version.h#11 integrate .. //depot/projects/s390/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate .. //depot/projects/s390/crypto/openssl/ssl/d1_both.c#3 integrate .. //depot/projects/s390/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/s390/etc/Makefile#20 integrate .. //depot/projects/s390/etc/defaults/periodic.conf#10 integrate .. //depot/projects/s390/etc/defaults/rc.conf#21 integrate .. //depot/projects/s390/etc/inetd.conf#8 integrate .. //depot/projects/s390/etc/mtree/BSD.local.dist#10 delete .. //depot/projects/s390/etc/mtree/BSD.usr.dist#14 integrate .. //depot/projects/s390/etc/mtree/BSD.x11-4.dist#9 delete .. //depot/projects/s390/etc/mtree/BSD.x11.dist#3 delete .. //depot/projects/s390/etc/mtree/Makefile#4 integrate .. //depot/projects/s390/etc/network.subr#11 integrate .. //depot/projects/s390/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/s390/etc/periodic/security/200.chkmounts#5 integrate .. //depot/projects/s390/etc/rc.d/Makefile#15 integrate .. //depot/projects/s390/etc/rc.d/NETWORKING#10 integrate .. //depot/projects/s390/etc/rc.d/addswap#6 integrate .. //depot/projects/s390/etc/rc.d/auto_linklocal#2 delete .. //depot/projects/s390/etc/rc.d/defaultroute#5 integrate .. //depot/projects/s390/etc/rc.d/devd#8 integrate .. //depot/projects/s390/etc/rc.d/faith#1 branch .. //depot/projects/s390/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/s390/etc/rc.d/ipsec#9 integrate .. //depot/projects/s390/etc/rc.d/mroute6d#4 integrate .. //depot/projects/s390/etc/rc.d/netif#9 integrate .. //depot/projects/s390/etc/rc.d/netoptions#4 integrate .. //depot/projects/s390/etc/rc.d/network_ipv6#8 delete .. //depot/projects/s390/etc/rc.d/ppp#4 integrate .. //depot/projects/s390/etc/rc.d/route6d#6 integrate .. //depot/projects/s390/etc/rc.d/routed#8 integrate .. //depot/projects/s390/etc/rc.d/routing#5 integrate .. //depot/projects/s390/etc/rc.d/rtadvd#7 integrate .. //depot/projects/s390/etc/rc.d/static_arp#1 branch .. //depot/projects/s390/etc/rc.d/stf#1 branch .. //depot/projects/s390/etc/rc.d/sysctl#8 integrate .. //depot/projects/s390/etc/rc.d/wpa_supplicant#4 integrate .. //depot/projects/s390/etc/rc.subr#13 integrate .. //depot/projects/s390/gnu/usr.bin/groff/tmac/mdoc.local#14 integrate .. //depot/projects/s390/gnu/usr.bin/patch/common.h#4 integrate .. //depot/projects/s390/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/s390/lib/Makefile#19 integrate .. //depot/projects/s390/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate .. //depot/projects/s390/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/s390/lib/libc/Versions.def#3 integrate .. //depot/projects/s390/lib/libc/db/hash/hash.c#5 integrate .. //depot/projects/s390/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/s390/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/s390/lib/libc/gen/_pthread_stubs.c#7 integrate .. //depot/projects/s390/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/s390/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/s390/lib/libc/locale/ctype.3#6 integrate .. //depot/projects/s390/lib/libc/locale/digittoint.3#4 integrate .. //depot/projects/s390/lib/libc/locale/isalnum.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isalpha.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isascii.3#4 integrate .. //depot/projects/s390/lib/libc/locale/isblank.3#7 integrate .. //depot/projects/s390/lib/libc/locale/iscntrl.3#7 integrate .. //depot/projects/s390/lib/libc/locale/isdigit.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isgraph.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isideogram.3#2 integrate .. //depot/projects/s390/lib/libc/locale/islower.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isphonogram.3#2 integrate .. //depot/projects/s390/lib/libc/locale/isprint.3#6 integrate .. //depot/projects/s390/lib/libc/locale/ispunct.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isrune.3#2 integrate .. //depot/projects/s390/lib/libc/locale/isspace.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isspecial.3#2 integrate .. //depot/projects/s390/lib/libc/locale/isupper.3#6 integrate .. //depot/projects/s390/lib/libc/locale/isxdigit.3#6 integrate .. //depot/projects/s390/lib/libc/locale/toascii.3#3 integrate .. //depot/projects/s390/lib/libc/locale/tolower.3#6 integrate .. //depot/projects/s390/lib/libc/locale/toupper.3#6 integrate .. //depot/projects/s390/lib/libc/net/getifaddrs.c#3 integrate .. //depot/projects/s390/lib/libc/nls/Makefile.inc#6 integrate .. //depot/projects/s390/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/s390/lib/libc/posix1e/acl_calc_mask.c#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_support.c#5 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_to_text.c#4 integrate .. //depot/projects/s390/lib/libc/regex/engine.c#5 integrate .. //depot/projects/s390/lib/libc/regex/grot/tests#3 integrate .. //depot/projects/s390/lib/libc/stdio/fopen.3#8 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.3#11 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.c#15 integrate .. //depot/projects/s390/lib/libc/stdlib/ptsname.3#3 integrate .. //depot/projects/s390/lib/libc/stdtime/localtime.c#8 integrate .. //depot/projects/s390/lib/libc/stdtime/strptime.c#9 integrate .. //depot/projects/s390/lib/libc/sys/fcntl.2#8 integrate .. //depot/projects/s390/lib/libc/sys/intro.2#10 integrate .. //depot/projects/s390/lib/libc/sys/kqueue.2#8 integrate .. //depot/projects/s390/lib/libc/sys/setfib.2#3 integrate .. //depot/projects/s390/lib/libc/sys/stack_protector.c#3 integrate .. //depot/projects/s390/lib/libdevinfo/devinfo.h#4 integrate .. //depot/projects/s390/lib/libdisk/change.c#6 integrate .. //depot/projects/s390/lib/libjail/jail.3#2 integrate .. //depot/projects/s390/lib/libkvm/kvm_proc.c#12 integrate .. //depot/projects/s390/lib/libpam/modules/pam_lastlog/pam_lastlog.c#6 integrate .. //depot/projects/s390/lib/libpmc/pmc.3#6 integrate .. //depot/projects/s390/lib/libpmc/pmc.atom.3#3 integrate .. //depot/projects/s390/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/s390/lib/libpmc/pmc.core2.3#4 integrate .. //depot/projects/s390/lib/libpmc/pmc.iaf.3#3 integrate .. //depot/projects/s390/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc_read.3#2 integrate .. //depot/projects/s390/lib/libradius/libradius.3#5 integrate .. //depot/projects/s390/lib/libradius/radlib.c#4 integrate .. //depot/projects/s390/lib/libradius/radlib.h#4 integrate .. //depot/projects/s390/lib/libradius/radlib_private.h#3 integrate .. //depot/projects/s390/lib/libstand/net.c#4 integrate .. //depot/projects/s390/lib/libstand/nfs.c#7 integrate .. //depot/projects/s390/lib/libstand/rpc.c#4 integrate .. //depot/projects/s390/lib/libthr/thread/thr_spec.c#5 integrate .. //depot/projects/s390/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/s390/libexec/Makefile#13 integrate .. //depot/projects/s390/libexec/rpc.rquotad/rquotad.c#6 integrate .. //depot/projects/s390/release/Makefile#26 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/s390/release/picobsd/bridge/crunch.conf#8 integrate .. //depot/projects/s390/release/scripts/lib32-make.sh#2 integrate .. //depot/projects/s390/release/scripts/mm-mtree.sh#1 branch .. //depot/projects/s390/release/scripts/package-split.py#6 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.8#7 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.c#10 integrate .. //depot/projects/s390/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/s390/sbin/geom/class/mirror/geom_mirror.c#5 integrate .. //depot/projects/s390/sbin/geom/class/mirror/gmirror.8#5 integrate .. //depot/projects/s390/sbin/geom/class/nop/gnop.8#4 integrate .. //depot/projects/s390/sbin/geom/core/geom.c#7 integrate .. //depot/projects/s390/sbin/ifconfig/Makefile#7 integrate .. //depot/projects/s390/sbin/ifconfig/af_inet6.c#4 integrate .. //depot/projects/s390/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/s390/sbin/ifconfig/ifconfig.8#14 integrate .. //depot/projects/s390/sbin/ifconfig/ifgif.c#2 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/s390/sbin/mksnap_ffs/mksnap_ffs.8#6 integrate .. //depot/projects/s390/sbin/mount/mount.8#13 integrate .. //depot/projects/s390/sbin/mount/mount.c#15 integrate .. //depot/projects/s390/sbin/mount_nfs/mount_nfs.c#12 integrate .. //depot/projects/s390/sbin/route/route.8#5 integrate .. //depot/projects/s390/sbin/route/route.c#11 integrate .. //depot/projects/s390/sbin/savecore/savecore.8#8 integrate .. //depot/projects/s390/sbin/savecore/savecore.c#7 integrate .. //depot/projects/s390/sbin/shutdown/shutdown.c#4 integrate .. //depot/projects/s390/secure/libexec/sftp-server/Makefile#7 integrate .. //depot/projects/s390/secure/libexec/ssh-keysign/Makefile#5 integrate .. //depot/projects/s390/secure/usr.bin/scp/Makefile#5 integrate .. //depot/projects/s390/secure/usr.bin/sftp/Makefile#6 integrate .. //depot/projects/s390/secure/usr.bin/ssh-add/Makefile#5 integrate .. //depot/projects/s390/secure/usr.bin/ssh-agent/Makefile#5 integrate .. //depot/projects/s390/secure/usr.bin/ssh-keygen/Makefile#5 integrate .. //depot/projects/s390/secure/usr.bin/ssh-keyscan/Makefile#4 integrate .. //depot/projects/s390/secure/usr.bin/ssh/Makefile#10 integrate .. //depot/projects/s390/secure/usr.sbin/sshd/Makefile#13 integrate .. //depot/projects/s390/share/colldef/Makefile#9 integrate .. //depot/projects/s390/share/colldef/la_LN.ISO8859-13.src#1 branch .. //depot/projects/s390/share/colldef/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/s390/share/examples/cvsup/stable-supfile#7 integrate .. //depot/projects/s390/share/examples/scsi_target/scsi_target.c#7 integrate .. //depot/projects/s390/share/examples/scsi_target/scsi_target.h#4 integrate .. //depot/projects/s390/share/man/man4/Makefile#24 integrate .. //depot/projects/s390/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/s390/share/man/man4/ahci.4#2 integrate .. //depot/projects/s390/share/man/man4/dpms.4#1 branch .. //depot/projects/s390/share/man/man4/ed.4#7 integrate .. //depot/projects/s390/share/man/man4/inet6.4#5 integrate .. //depot/projects/s390/share/man/man4/ip6.4#5 integrate .. //depot/projects/s390/share/man/man4/ips.4#3 integrate .. //depot/projects/s390/share/man/man4/lindev.4#1 branch .. //depot/projects/s390/share/man/man4/man4.i386/Makefile#11 integrate .. //depot/projects/s390/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/s390/share/man/man4/mfi.4#4 integrate .. //depot/projects/s390/share/man/man4/msk.4#3 integrate .. //depot/projects/s390/share/man/man4/pts.4#4 integrate .. //depot/projects/s390/share/man/man4/pty.4#7 integrate .. //depot/projects/s390/share/man/man4/syscons.4#10 integrate .. //depot/projects/s390/share/man/man4/textdump.4#4 integrate .. //depot/projects/s390/share/man/man4/urtw.4#3 integrate .. //depot/projects/s390/share/man/man4/zyd.4#3 integrate .. //depot/projects/s390/share/man/man5/device.hints.5#7 integrate .. //depot/projects/s390/share/man/man5/make.conf.5#17 integrate .. //depot/projects/s390/share/man/man5/procfs.5#8 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#23 integrate .. //depot/projects/s390/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/s390/share/man/man7/tuning.7#14 integrate .. //depot/projects/s390/share/man/man9/Makefile#17 integrate .. //depot/projects/s390/share/man/man9/VOP_ACCESS.9#9 integrate .. //depot/projects/s390/share/man/man9/acl.9#7 integrate .. //depot/projects/s390/share/man/man9/fail.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/s390/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/s390/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/s390/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/s390/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/s390/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/s390/share/man/man9/ieee80211_radiotap.9#4 integrate .. //depot/projects/s390/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/s390/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/s390/share/man/man9/kproc.9#2 integrate .. //depot/projects/s390/share/man/man9/kthread.9#7 integrate .. //depot/projects/s390/share/man/man9/sglist.9#2 integrate .. //depot/projects/s390/share/man/man9/vaccess.9#5 integrate .. //depot/projects/s390/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/s390/share/misc/bsd-family-tree#18 integrate .. //depot/projects/s390/share/misc/iso3166#9 integrate .. //depot/projects/s390/share/mklocale/Makefile#9 integrate .. //depot/projects/s390/share/mklocale/la_LN.ISO8859-13.src#1 branch .. //depot/projects/s390/share/mklocale/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/s390/share/monetdef/Makefile#9 integrate .. //depot/projects/s390/share/monetdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/s390/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/s390/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/s390/share/msgdef/Makefile#10 integrate .. //depot/projects/s390/share/msgdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/s390/share/msgdef/lv_LV.UTF-8.src#1 branch .. //depot/projects/s390/share/numericdef/Makefile#9 integrate .. //depot/projects/s390/share/timedef/Makefile#10 integrate .. //depot/projects/s390/share/timedef/hi_IN.ISCII-DEV.src#3 integrate .. //depot/projects/s390/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/s390/share/timedef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/s390/share/timedef/lv_LV.UTF-8.src#1 branch .. //depot/projects/s390/share/zoneinfo/africa#9 integrate .. //depot/projects/s390/share/zoneinfo/asia#12 integrate .. //depot/projects/s390/share/zoneinfo/australasia#9 integrate .. //depot/projects/s390/share/zoneinfo/europe#9 integrate .. //depot/projects/s390/share/zoneinfo/leapseconds#7 integrate .. //depot/projects/s390/share/zoneinfo/southamerica#12 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_machdep.c#8 integrate .. //depot/projects/s390/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/elf_machdep.c#8 integrate .. //depot/projects/s390/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/s390/sys/amd64/amd64/initcpu.c#10 integrate .. //depot/projects/s390/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/s390/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/s390/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/s390/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/s390/sys/amd64/amd64/trap.c#10 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/s390/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/s390/sys/amd64/include/_align.h#1 branch .. //depot/projects/s390/sys/amd64/include/acpica_machdep.h#4 integrate .. //depot/projects/s390/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/s390/sys/amd64/include/cpufunc.h#7 integrate .. //depot/projects/s390/sys/amd64/include/param.h#9 integrate .. //depot/projects/s390/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/s390/sys/amd64/pci/pci_cfgreg.c#8 integrate .. //depot/projects/s390/sys/arm/arm/cpufunc.c#8 integrate .. //depot/projects/s390/sys/arm/arm/identcpu.c#7 integrate .. //depot/projects/s390/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/s390/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/s390/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/s390/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/s390/sys/arm/include/_align.h#1 branch .. //depot/projects/s390/sys/arm/include/md_var.h#5 integrate .. //depot/projects/s390/sys/arm/include/param.h#9 integrate .. //depot/projects/s390/sys/arm/mv/common.c#6 integrate .. //depot/projects/s390/sys/arm/mv/discovery/db78xxx.c#5 integrate .. //depot/projects/s390/sys/arm/mv/kirkwood/db88f6xxx.c#5 integrate .. //depot/projects/s390/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/s390/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/s390/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/s390/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/s390/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/s390/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/s390/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/s390/sys/arm/mv/mv_machdep.c#6 integrate .. //depot/projects/s390/sys/arm/mv/mvreg.h#6 integrate .. //depot/projects/s390/sys/arm/mv/mvvar.h#4 integrate .. //depot/projects/s390/sys/arm/mv/orion/db88f5xxx.c#5 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/s390/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/s390/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/s390/sys/boot/i386/libi386/pxe.c#5 integrate .. //depot/projects/s390/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/s390/sys/bsm/audit_kevents.h#8 integrate .. //depot/projects/s390/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/s390/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/s390/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/s390/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#18 integrate .. //depot/projects/s390/sys/cam/cam_xpt.c#15 integrate .. //depot/projects/s390/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#21 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#26 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_target.c#15 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/s390/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/s390/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/s390/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/s390/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/s390/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/s390/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/s390/sys/conf/NOTES#28 integrate .. //depot/projects/s390/sys/conf/files#30 integrate .. //depot/projects/s390/sys/conf/files.amd64#13 integrate .. //depot/projects/s390/sys/conf/files.i386#19 integrate .. //depot/projects/s390/sys/conf/files.ia64#18 integrate .. //depot/projects/s390/sys/conf/files.pc98#20 integrate .. //depot/projects/s390/sys/conf/files.powerpc#17 integrate .. //depot/projects/s390/sys/conf/files.sparc64#18 integrate .. //depot/projects/s390/sys/conf/newvers.sh#11 integrate .. //depot/projects/s390/sys/conf/options#25 integrate .. //depot/projects/s390/sys/conf/options.amd64#9 integrate .. //depot/projects/s390/sys/conf/options.arm#8 integrate .. //depot/projects/s390/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/acpica_prep.sh#8 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslcompiler.h#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslglobal.h#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslload.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslmain.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslmap.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslstubs.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/s390/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/s390/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/s390/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/s390/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/s390/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/s390/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/s390/sys/ddb/db_ps.c#13 integrate .. //depot/projects/s390/sys/dev/aac/aac.c#21 integrate .. //depot/projects/s390/sys/dev/aac/aacvar.h#14 integrate .. //depot/projects/s390/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/s390/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/s390/sys/dev/acpica/acpi.c#22 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_acad.c#10 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_battery.c#10 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/s390/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/s390/sys/dev/adb/adb_bus.c#5 integrate .. //depot/projects/s390/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/s390/sys/dev/age/if_age.c#6 integrate .. //depot/projects/s390/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/s390/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/s390/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/s390/sys/dev/alc/if_alc.c#2 integrate .. //depot/projects/s390/sys/dev/ale/if_ale.c#4 integrate .. //depot/projects/s390/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/s390/sys/dev/amr/amr.c#19 integrate .. //depot/projects/s390/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/s390/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/s390/sys/dev/ata/ata-disk.c#20 integrate .. //depot/projects/s390/sys/dev/ata/ata-dma.c#15 integrate .. //depot/projects/s390/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/s390/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate .. //depot/projects/s390/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/s390/sys/dev/ath/ah_osdep.c#6 integrate .. //depot/projects/s390/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/s390/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/s390/sys/dev/ath/ath_hal/ah_regdomain.c#4 integrate .. //depot/projects/s390/sys/dev/ath/if_ath.c#15 integrate .. //depot/projects/s390/sys/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/s390/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/s390/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_os.c#13 integrate .. //depot/projects/s390/sys/dev/ciss/ciss.c#18 integrate .. //depot/projects/s390/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/s390/sys/dev/ciss/cissvar.h#7 integrate .. //depot/projects/s390/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/s390/sys/dev/de/if_de.c#5 integrate .. //depot/projects/s390/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/s390/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/s390/sys/dev/drm/drmP.h#15 integrate .. //depot/projects/s390/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/s390/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/s390/sys/dev/drm/drm_fops.c#5 integrate .. //depot/projects/s390/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/s390/sys/dev/drm/drm_sysctl.c#7 integrate .. //depot/projects/s390/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/s390/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/s390/sys/dev/drm/radeon_cp.c#14 integrate .. //depot/projects/s390/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/s390/sys/dev/drm/radeon_drm.h#11 integrate .. //depot/projects/s390/sys/dev/drm/radeon_drv.h#14 integrate .. //depot/projects/s390/sys/dev/drm/radeon_irq.c#10 integrate .. //depot/projects/s390/sys/dev/drm/radeon_state.c#11 integrate .. //depot/projects/s390/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/s390/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/s390/sys/dev/ep/if_ep.c#13 integrate .. //depot/projects/s390/sys/dev/ep/if_epreg.h#5 integrate .. //depot/projects/s390/sys/dev/fb/s3_pci.c#7 integrate .. //depot/projects/s390/sys/dev/fb/vesa.c#1 branch .. //depot/projects/s390/sys/dev/fb/vesa.h#1 branch .. //depot/projects/s390/sys/dev/fb/vga.c#13 integrate .. //depot/projects/s390/sys/dev/firewire/fwcrom.c#7 integrate .. //depot/projects/s390/sys/dev/firewire/fwdev.c#13 integrate .. //depot/projects/s390/sys/dev/fxp/if_fxp.c#20 integrate .. //depot/projects/s390/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/s390/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/s390/sys/dev/hwpmc/hwpmc_core.c#4 integrate .. //depot/projects/s390/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/s390/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/s390/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/s390/sys/dev/iir/iir.c#9 integrate .. //depot/projects/s390/sys/dev/ips/ips_pci.c#8 integrate .. //depot/projects/s390/sys/dev/isp/isp.c#15 integrate .. //depot/projects/s390/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/s390/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/s390/sys/dev/isp/isp_tpublic.h#8 delete .. //depot/projects/s390/sys/dev/isp/ispmbox.h#10 integrate .. //depot/projects/s390/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/s390/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/s390/sys/dev/kbd/kbd.c#10 integrate .. //depot/projects/s390/sys/dev/lindev/full.c#1 branch .. //depot/projects/s390/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/s390/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/s390/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/s390/sys/dev/mge/if_mge.c#5 integrate .. //depot/projects/s390/sys/dev/mii/e1000phy.c#11 integrate .. //depot/projects/s390/sys/dev/mii/e1000phyreg.h#6 integrate .. //depot/projects/s390/sys/dev/mlx/mlx.c#11 integrate .. //depot/projects/s390/sys/dev/mmc/mmc.c#8 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/s390/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/s390/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/s390/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/s390/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/s390/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/s390/sys/dev/null/null.c#10 integrate .. //depot/projects/s390/sys/dev/pccbb/pccbb.c#16 integrate .. //depot/projects/s390/sys/dev/pci/pci.c#21 integrate .. //depot/projects/s390/sys/dev/pci/pci_user.c#10 integrate .. //depot/projects/s390/sys/dev/pci/pcireg.h#13 integrate .. //depot/projects/s390/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/s390/sys/dev/ppbus/vpo.c#13 integrate .. //depot/projects/s390/sys/dev/pst/pst-iop.c#8 integrate .. //depot/projects/s390/sys/dev/pty/pty.c#1 branch .. //depot/projects/s390/sys/dev/re/if_re.c#11 integrate .. //depot/projects/s390/sys/dev/rp/rp.c#11 integrate .. //depot/projects/s390/sys/dev/rp/rp_pci.c#8 integrate .. //depot/projects/s390/sys/dev/siis/siis.c#2 integrate .. //depot/projects/s390/sys/dev/snp/snp.c#15 integrate .. //depot/projects/s390/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/s390/sys/dev/sound/pci/es137x.h#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/s390/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/s390/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/s390/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/s390/sys/dev/syscons/scmouse.c#10 integrate .. //depot/projects/s390/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/s390/sys/dev/syscons/scvesactl.c#7 integrate .. //depot/projects/s390/sys/dev/syscons/scvgarndr.c#7 integrate .. //depot/projects/s390/sys/dev/syscons/scvidctl.c#7 integrate .. //depot/projects/s390/sys/dev/syscons/syscons.c#20 integrate .. //depot/projects/s390/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/s390/sys/dev/syscons/teken/Makefile#2 delete .. //depot/projects/s390/sys/dev/syscons/teken/gensequences#2 delete .. //depot/projects/s390/sys/dev/syscons/teken/sequences#3 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken.c#4 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken.h#4 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken_demo.c#3 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken_scs.h#2 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken_stress.c#3 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken_subr.h#3 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken_subr_compat.h#3 delete .. //depot/projects/s390/sys/dev/syscons/teken/teken_wcwidth.h#2 delete .. //depot/projects/s390/sys/dev/twa/tw_cl_io.c#4 integrate .. //depot/projects/s390/sys/dev/twa/tw_cl_share.h#4 integrate .. //depot/projects/s390/sys/dev/twe/twe.c#9 integrate .. //depot/projects/s390/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/s390/sys/dev/txp/if_txp.c#13 integrate .. //depot/projects/s390/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/s390/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/s390/sys/dev/uart/uart_tty.c#10 integrate .. //depot/projects/s390/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/s390/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/s390/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/s390/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/s390/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/s390/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/s390/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/s390/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/s390/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/s390/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/s390/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/s390/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/s390/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb.h#10 integrate .. //depot/projects/s390/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/s390/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/s390/sys/dev/xen/blkback/blkback.c#4 integrate .. //depot/projects/s390/sys/dev/xen/blkfront/blkfront.c#6 integrate .. //depot/projects/s390/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/s390/sys/dev/xen/netback/netback.c#4 integrate .. //depot/projects/s390/sys/fs/fifofs/fifo_vnops.c#18 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_conv.c#8 integrate .. //depot/projects/s390/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/s390/sys/fs/procfs/procfs.c#10 integrate .. //depot/projects/s390/sys/fs/procfs/procfs.h#5 integrate .. //depot/projects/s390/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate .. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#21 integrate .. //depot/projects/s390/sys/geom/geom_disk.c#23 integrate .. //depot/projects/s390/sys/geom/geom_io.c#21 integrate .. //depot/projects/s390/sys/geom/geom_vfs.c#8 integrate .. //depot/projects/s390/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/s390/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/s390/sys/geom/part/g_part.c#6 integrate .. //depot/projects/s390/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/s390/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/s390/sys/i386/acpica/acpi_machdep.c#15 integrate .. //depot/projects/s390/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/s390/sys/i386/bios/smapi.c#6 integrate .. //depot/projects/s390/sys/i386/bios/smbios.c#6 integrate .. //depot/projects/s390/sys/i386/bios/vpd.c#6 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/s390/sys/i386/conf/NOTES#22 integrate .. //depot/projects/s390/sys/i386/cpufreq/hwpstate.c#3 integrate .. //depot/projects/s390/sys/i386/i386/elf_machdep.c#12 integrate .. //depot/projects/s390/sys/i386/i386/identcpu.c#18 integrate .. //depot/projects/s390/sys/i386/i386/initcpu.c#15 integrate .. //depot/projects/s390/sys/i386/i386/local_apic.c#11 integrate .. //depot/projects/s390/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/s390/sys/i386/i386/msi.c#5 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/s390/sys/i386/i386/trap.c#20 integrate .. //depot/projects/s390/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_proto.h#6 integrate .. //depot/projects/s390/sys/i386/include/_align.h#1 branch .. //depot/projects/s390/sys/i386/include/acpica_machdep.h#6 integrate .. //depot/projects/s390/sys/i386/include/apm_bios.h#3 integrate .. //depot/projects/s390/sys/i386/include/cpufunc.h#11 integrate .. //depot/projects/s390/sys/i386/include/param.h#12 integrate .. //depot/projects/s390/sys/i386/include/pc/vesa.h#4 delete .. //depot/projects/s390/sys/i386/include/pcpu.h#9 integrate .. //depot/projects/s390/sys/i386/include/pmap.h#12 integrate .. //depot/projects/s390/sys/i386/include/specialreg.h#13 integrate .. //depot/projects/s390/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/s390/sys/i386/isa/dpms.c#2 delete .. //depot/projects/s390/sys/i386/isa/vesa.c#13 delete .. //depot/projects/s390/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/s390/sys/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/s390/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/s390/sys/i386/xen/locore.s#3 integrate .. //depot/projects/s390/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/s390/sys/i386/xen/xen_machdep.c#6 integrate .. //depot/projects/s390/sys/ia64/include/_align.h#1 branch .. //depot/projects/s390/sys/ia64/include/param.h#12 integrate .. //depot/projects/s390/sys/isa/isahint.c#6 integrate .. //depot/projects/s390/sys/kern/imgact_elf.c#17 integrate .. //depot/projects/s390/sys/kern/init_main.c#19 integrate .. //depot/projects/s390/sys/kern/init_sysent.c#18 integrate .. //depot/projects/s390/sys/kern/kern_conf.c#19 integrate .. //depot/projects/s390/sys/kern/kern_cons.c#3 integrate .. //depot/projects/s390/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/s390/sys/kern/kern_event.c#16 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#22 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#25 integrate .. //depot/projects/s390/sys/kern/kern_fork.c#22 integrate .. //depot/projects/s390/sys/kern/kern_jail.c#17 integrate .. //depot/projects/s390/sys/kern/kern_kthread.c#9 integrate .. //depot/projects/s390/sys/kern/kern_linker.c#18 integrate .. //depot/projects/s390/sys/kern/kern_lock.c#16 integrate .. //depot/projects/s390/sys/kern/kern_mib.c#12 integrate .. //depot/projects/s390/sys/kern/kern_mutex.c#17 integrate .. //depot/projects/s390/sys/kern/kern_proc.c#25 integrate .. //depot/projects/s390/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/s390/sys/kern/kern_shutdown.c#15 integrate .. //depot/projects/s390/sys/kern/kern_sig.c#22 integrate .. //depot/projects/s390/sys/kern/kern_subr.c#16 integrate .. //depot/projects/s390/sys/kern/kern_sx.c#9 integrate .. //depot/projects/s390/sys/kern/kern_thr.c#13 integrate .. //depot/projects/s390/sys/kern/kern_thread.c#22 integrate .. //depot/projects/s390/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/s390/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/s390/sys/kern/kern_uuid.c#11 integrate .. //depot/projects/s390/sys/kern/sched_ule.c#19 integrate .. //depot/projects/s390/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/s390/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/s390/sys/kern/subr_bus.c#22 integrate .. //depot/projects/s390/sys/kern/subr_devstat.c#8 integrate .. //depot/projects/s390/sys/kern/subr_sglist.c#2 integrate .. //depot/projects/s390/sys/kern/subr_smp.c#14 integrate .. //depot/projects/s390/sys/kern/subr_witness.c#24 integrate .. //depot/projects/s390/sys/kern/sys_generic.c#14 integrate .. //depot/projects/s390/sys/kern/sys_pipe.c#20 integrate .. //depot/projects/s390/sys/kern/syscalls.c#18 integrate .. //depot/projects/s390/sys/kern/syscalls.master#20 integrate .. //depot/projects/s390/sys/kern/tty.c#21 integrate .. //depot/projects/s390/sys/kern/tty_pts.c#9 integrate .. //depot/projects/s390/sys/kern/tty_pty.c#17 delete .. //depot/projects/s390/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/s390/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/s390/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/s390/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/s390/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/s390/sys/kern/vfs_aio.c#20 integrate .. //depot/projects/s390/sys/kern/vfs_default.c#19 integrate .. //depot/projects/s390/sys/kern/vfs_export.c#14 integrate .. //depot/projects/s390/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/s390/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/s390/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/s390/sys/mips/include/_align.h#1 branch .. //depot/projects/s390/sys/mips/include/param.h#4 integrate .. //depot/projects/s390/sys/modules/Makefile#27 integrate .. //depot/projects/s390/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/s390/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/s390/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/s390/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/s390/sys/modules/lindev/Makefile#1 branch .. //depot/projects/s390/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/s390/sys/modules/procfs/Makefile#6 integrate .. //depot/projects/s390/sys/modules/pty/Makefile#1 branch .. //depot/projects/s390/sys/modules/usb/Makefile#8 integrate .. //depot/projects/s390/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/s390/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/s390/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/s390/sys/net/bpf.c#19 integrate .. //depot/projects/s390/sys/net/bridgestp.c#8 integrate .. //depot/projects/s390/sys/net/flowtable.c#3 integrate .. //depot/projects/s390/sys/net/flowtable.h#3 integrate .. //depot/projects/s390/sys/net/if.c#24 integrate .. //depot/projects/s390/sys/net/if_arp.h#5 integrate .. //depot/projects/s390/sys/net/if_bridge.c#9 integrate .. //depot/projects/s390/sys/net/if_ef.c#15 integrate .. //depot/projects/s390/sys/net/if_llatbl.c#5 integrate .. //depot/projects/s390/sys/net/if_llatbl.h#4 integrate .. //depot/projects/s390/sys/net/if_var.h#13 integrate .. //depot/projects/s390/sys/net/if_vlan.c#15 integrate .. //depot/projects/s390/sys/net/route.c#17 integrate .. //depot/projects/s390/sys/net/route.h#12 integrate .. //depot/projects/s390/sys/net/rtsock.c#17 integrate .. //depot/projects/s390/sys/net/vnet.c#2 integrate .. //depot/projects/s390/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/s390/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/s390/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/s390/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/s390/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/s390/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/s390/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/s390/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#6 integrate .. //depot/projects/s390/sys/netgraph/ng_gif.c#11 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#18 integrate .. //depot/projects/s390/sys/netinet/if_ether.h#7 integrate .. //depot/projects/s390/sys/netinet/in.c#15 integrate .. //depot/projects/s390/sys/netinet/in.h#16 integrate .. //depot/projects/s390/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/s390/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/s390/sys/netinet/in_proto.c#14 integrate .. //depot/projects/s390/sys/netinet/ip_divert.c#18 integrate .. //depot/projects/s390/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/s390/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/s390/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/s390/sys/netinet/ip_mroute.c#19 integrate .. //depot/projects/s390/sys/netinet/ip_output.c#20 integrate .. //depot/projects/s390/sys/netinet/ipfw/ip_fw2.c#2 integrate .. //depot/projects/s390/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate .. //depot/projects/s390/sys/netinet/raw_ip.c#19 integrate .. //depot/projects/s390/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/s390/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/s390/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/s390/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/s390/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/s390/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/s390/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/s390/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/s390/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/s390/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/s390/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/s390/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/s390/sys/netinet/sctputil.c#7 integrate .. //depot/projects/s390/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/s390/sys/netinet/tcp_timer.c#15 integrate .. //depot/projects/s390/sys/netinet/tcp_timer.h#8 integrate .. //depot/projects/s390/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/s390/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/s390/sys/netinet/tcp_var.h#17 integrate .. //depot/projects/s390/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/s390/sys/netinet6/in6.c#15 integrate .. //depot/projects/s390/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/s390/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/s390/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/s390/sys/netinet6/ip6_input.c#17 integrate .. //depot/projects/s390/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/s390/sys/netinet6/nd6.c#17 integrate .. //depot/projects/s390/sys/netinet6/nd6.h#9 integrate .. //depot/projects/s390/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/s390/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/s390/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/s390/sys/netipsec/ipsec.h#11 integrate .. //depot/projects/s390/sys/netipsec/key.c#13 integrate .. //depot/projects/s390/sys/netipsec/xform_esp.c#12 integrate .. //depot/projects/s390/sys/netipsec/xform_ipip.c#13 integrate .. //depot/projects/s390/sys/netsmb/smb_dev.c#13 integrate .. //depot/projects/s390/sys/nfsclient/bootp_subr.c#13 integrate .. //depot/projects/s390/sys/nfsclient/nfs_node.c#14 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#24 integrate .. //depot/projects/s390/sys/nfsserver/nfs_serv.c#22 integrate .. //depot/projects/s390/sys/opencrypto/cryptodev.c#15 integrate .. //depot/projects/s390/sys/pc98/cbus/fdc.c#6 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#21 integrate .. //depot/projects/s390/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/s390/sys/pc98/include/_align.h#1 branch .. //depot/projects/s390/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/s390/sys/pci/if_rlreg.h#19 integrate .. //depot/projects/s390/sys/pci/intpm.c#8 integrate .. //depot/projects/s390/sys/pci/intpmreg.h#3 integrate .. //depot/projects/s390/sys/powerpc/conf/GENERIC#21 integrate .. //depot/projects/s390/sys/powerpc/include/_align.h#1 branch .. //depot/projects/s390/sys/powerpc/include/param.h#10 integrate .. //depot/projects/s390/sys/rpc/clnt_dg.c#4 integrate .. //depot/projects/s390/sys/rpc/clnt_rc.c#5 integrate .. //depot/projects/s390/sys/rpc/clnt_vc.c#5 integrate .. //depot/projects/s390/sys/rpc/rpc_generic.c#3 integrate .. //depot/projects/s390/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/s390/sys/rpc/svc_dg.c#4 integrate .. //depot/projects/s390/sys/rpc/svc_generic.c#4 integrate .. //depot/projects/s390/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/s390/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/s390/sys/sparc64/conf/GENERIC#22 integrate .. //depot/projects/s390/sys/sparc64/include/_align.h#1 branch .. //depot/projects/s390/sys/sparc64/include/param.h#9 integrate .. //depot/projects/s390/sys/sparc64/pci/ofw_pci.h#9 integrate .. //depot/projects/s390/sys/sparc64/pci/psycho.c#19 integrate .. //depot/projects/s390/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/s390/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/s390/sys/sun4v/include/_align.h#1 branch .. //depot/projects/s390/sys/sun4v/include/param.h#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From hselasky at FreeBSD.org Sat Oct 3 21:01:08 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sat Oct 3 21:01:15 2009 Subject: PERFORCE change 169183 for review Message-ID: <200910032101.n93L17Ih072891@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169183 Change 169183 by hselasky@hselasky_laptop001 on 2009/10/03 21:00:51 Mount Root Patch - This patch allows for late root device discovery. Instead of giving up at the first try, the system keeps trying for 3 minutes to mount root. If CTRL+C is pressed during this time a mount-root menu will be shown. Else after 3 minutes the mount-root menu will be shown and then a panic will happen like before. - Clean up old mount root hold mechanism which did not work like expected. Affected files ... .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 edit .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#15 edit .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#12 edit .. //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#16 edit .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#13 edit .. //depot/projects/usb/src/sys/geom/journal/g_journal.h#3 edit .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#8 edit .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.h#3 edit .. //depot/projects/usb/src/sys/geom/part/g_part.c#20 edit .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#8 edit .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.h#3 edit .. //depot/projects/usb/src/sys/kern/kern_cons.c#4 edit .. //depot/projects/usb/src/sys/kern/vfs_mount.c#30 edit .. //depot/projects/usb/src/sys/sys/systm.h#20 edit Differences ... ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 (text+ko) ==== @@ -3058,7 +3058,6 @@ destroy_dev(zfsdev); } -static struct root_hold_token *zfs_root_token; struct proc *zfsproc; uint_t zfs_fsyncer_key; @@ -3071,8 +3070,6 @@ switch (type) { case MOD_LOAD: - zfs_root_token = root_mount_hold("ZFS"); - mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL); spa_init(FREAD | FWRITE); @@ -3083,7 +3080,6 @@ tsd_create(&rrw_tsd_key, NULL); printf("ZFS storage pool version " SPA_VERSION_STRING "\n"); - root_mount_rel(zfs_root_token); zfsdev_init(); break; ==== //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#15 (text+ko) ==== @@ -500,15 +500,6 @@ mtx_unlock(&Giant); /* - * First time through we need to tell mountroot that we're - * done. - */ - if (sc->sc_root_token) { - root_mount_rel(sc->sc_root_token); - sc->sc_root_token = NULL; - } - - /* * Wait until it has been 250ms since the last time we * get an interrupt. We handle the rest of the interrupt * at the top of the loop. Although we clear the bit in the ==== //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#12 (text+ko) ==== @@ -439,7 +439,6 @@ device_printf(brdev, "unable to create event thread.\n"); panic("cbb_create_event_thread"); } - sc->sc_root_token = root_mount_hold(device_get_nameunit(sc->dev)); return (0); err: if (sc->irq_res) ==== //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#9 (text+ko) ==== @@ -88,7 +88,6 @@ struct proc *event_thread; void (*chipinit)(struct cbb_softc *); int powerintr; - struct root_hold_token *sc_root_token; }; /* result of detect_card */ ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#33 (text+ko) ==== @@ -78,11 +78,6 @@ "Debug level"); #endif -static int usb_no_boot_wait = 0; -TUNABLE_INT("hw.usb.no_boot_wait", &usb_no_boot_wait); -SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RDTUN, &usb_no_boot_wait, 0, - "No device enumerate waiting at boot."); - static devclass_t usb_devclass; static device_method_t usb_methods[] = { @@ -134,11 +129,6 @@ return (ENXIO); } - if (usb_no_boot_wait == 0) { - /* delay vfs_mountroot until the bus is explored */ - bus->bus_roothold = root_mount_hold(device_get_nameunit(dev)); - } - usb_attach_sub(dev, bus); return (0); /* return success */ @@ -161,12 +151,6 @@ /* Stop power watchdog */ usb_callout_drain(&bus->power_wdog); - /* Let the USB explore process detach all devices. */ - if (bus->bus_roothold != NULL) { - root_mount_rel(bus->bus_roothold); - bus->bus_roothold = NULL; - } - USB_BUS_LOCK(bus); if (usb_proc_msignal(&bus->explore_proc, &bus->detach_msg[0], &bus->detach_msg[1])) { @@ -239,10 +223,6 @@ (udev->hub->explore) (udev); USB_BUS_LOCK(bus); } - if (bus->bus_roothold != NULL) { - root_mount_rel(bus->bus_roothold); - bus->bus_roothold = NULL; - } } /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#33 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include #include +#include #include #include @@ -328,6 +329,9 @@ { DPRINTFN(2, "polling\n"); + if (kdb_active == 0) + return; /* Only poll if KDB is active */ + while (sc->sc_inputs == 0) { usbd_transfer_poll(sc->sc_xfer, UKBD_N_TRANSFER); ==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#13 (text+ko) ==== @@ -1300,7 +1300,10 @@ static void ucom_cnprobe(struct consdev *cp) { - cp->cn_pri = CN_NORMAL; + if (ucom_cons_unit != -1) + cp->cn_pri = CN_NORMAL; + else + cp->cn_pri = CN_DEAD; } static void ==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#16 (text+ko) ==== @@ -51,7 +51,6 @@ struct usb_bus { struct usb_bus_stat stats_err; struct usb_bus_stat stats_ok; - struct root_hold_token *bus_roothold; /* * There are two callback processes. One for Giant locked * callbacks. One for non-Giant locked callbacks. This should ==== //depot/projects/usb/src/sys/geom/journal/g_journal.c#13 (text+ko) ==== @@ -2108,12 +2108,6 @@ g_topology_unlock(); last_write = time_second; - if (sc->sc_rootmount != NULL) { - GJ_DEBUG(1, "root_mount_rel %p", sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } - for (;;) { /* Get first request from the queue. */ mtx_lock(&sc->sc_mtx); @@ -2311,9 +2305,6 @@ sc->sc_inactive.jj_queue = NULL; sc->sc_active.jj_queue = NULL; - sc->sc_rootmount = root_mount_hold("GJOURNAL"); - GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); - callout_init(&sc->sc_callout, CALLOUT_MPSAFE); if (md->md_type != GJ_TYPE_COMPLETE) { /* @@ -2445,12 +2436,6 @@ g_topology_unlock(); - if (sc->sc_rootmount != NULL) { - GJ_DEBUG(1, "root_mount_rel %p", sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } - callout_drain(&sc->sc_callout); mtx_lock(&sc->sc_mtx); wakeup(sc); ==== //depot/projects/usb/src/sys/geom/journal/g_journal.h#3 (text+ko) ==== @@ -163,8 +163,6 @@ struct callout sc_callout; struct proc *sc_worker; - - struct root_hold_token *sc_rootmount; }; #define sc_dprovider sc_dconsumer->provider #define sc_jprovider sc_jconsumer->provider ==== //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#8 (text+ko) ==== @@ -1726,13 +1726,6 @@ static int g_mirror_try_destroy(struct g_mirror_softc *sc) { - - if (sc->sc_rootmount != NULL) { - G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, - sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } g_topology_lock(); if (!g_mirror_can_destroy(sc)) { g_topology_unlock(); @@ -2190,10 +2183,6 @@ */ callout_drain(&sc->sc_callout); sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY; - G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, - sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; return; } else { return; @@ -2217,10 +2206,6 @@ if (ndisks == 0) { /* No valid disks found, destroy device. */ sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY; - G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p", - __LINE__, sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; return; } } else { @@ -2374,12 +2359,6 @@ */ if (sc->sc_provider == NULL) g_mirror_launch_provider(sc); - if (sc->sc_rootmount != NULL) { - G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p", - __LINE__, sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } } /* * Genid should be bumped immediately, so do it here. @@ -2907,8 +2886,6 @@ G_MIRROR_DEBUG(1, "Device %s created (%u components, id=%u).", sc->sc_name, sc->sc_ndisks, sc->sc_id); - sc->sc_rootmount = root_mount_hold("GMIRROR"); - G_MIRROR_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); /* * Run timeout. */ ==== //depot/projects/usb/src/sys/geom/mirror/g_mirror.h#3 (text+ko) ==== @@ -207,8 +207,6 @@ struct mtx sc_events_mtx; struct callout sc_callout; - - struct root_hold_token *sc_rootmount; }; #define sc_name sc_geom->name ==== //depot/projects/usb/src/sys/geom/part/g_part.c#20 (text+ko) ==== @@ -1448,7 +1448,6 @@ struct g_geom *gp; struct g_part_entry *entry; struct g_part_table *table; - struct root_hold_token *rht; int attr, depth; int error; @@ -1470,7 +1469,6 @@ return (NULL); } - rht = root_mount_hold(mp->name); g_topology_unlock(); /* @@ -1515,13 +1513,11 @@ g_part_new_provider(gp, table, entry); } - root_mount_rel(rht); g_access(cp, -1, 0, 0); return (gp); fail: g_topology_lock(); - root_mount_rel(rht); g_access(cp, -1, 0, 0); g_part_wither(gp, error); return (NULL); ==== //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#8 (text+ko) ==== @@ -1974,13 +1974,6 @@ g_topology_assert_not(); sx_assert(&sc->sc_lock, SX_XLOCKED); - if (sc->sc_rootmount != NULL) { - G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, - sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } - g_topology_lock(); if (!g_raid3_can_destroy(sc)) { g_topology_unlock(); @@ -2464,10 +2457,6 @@ * Timeout expired, so destroy device. */ sc->sc_flags |= G_RAID3_DEVICE_FLAG_DESTROY; - G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", - __LINE__, sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; } return; } @@ -2610,12 +2599,6 @@ } if (sc->sc_provider == NULL) g_raid3_launch_provider(sc); - if (sc->sc_rootmount != NULL) { - G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, - sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } break; case G_RAID3_DEVICE_STATE_COMPLETE: /* @@ -2643,12 +2626,6 @@ } if (sc->sc_provider == NULL) g_raid3_launch_provider(sc); - if (sc->sc_rootmount != NULL) { - G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, - sc->sc_rootmount); - root_mount_rel(sc->sc_rootmount); - sc->sc_rootmount = NULL; - } break; default: KASSERT(1 == 0, ("Wrong device state (%s, %s).", sc->sc_name, @@ -3193,9 +3170,6 @@ G_RAID3_DEBUG(1, "Device %s created (%u components, id=%u).", sc->sc_name, sc->sc_ndisks, sc->sc_id); - sc->sc_rootmount = root_mount_hold("GRAID3"); - G_RAID3_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); - /* * Run timeout. */ ==== //depot/projects/usb/src/sys/geom/raid3/g_raid3.h#3 (text+ko) ==== @@ -240,8 +240,6 @@ struct mtx sc_events_mtx; struct callout sc_callout; - - struct root_hold_token *sc_rootmount; }; #define sc_name sc_geom->name ==== //depot/projects/usb/src/sys/kern/kern_cons.c#4 (text+ko) ==== @@ -353,8 +353,10 @@ if (cn_mute) return (-1); - while ((c = cncheckc()) == -1) - ; + while ((c = cncheckc()) == -1) { + if (!kdb_active) + pause("WKEY", hz / 100); /* give USB a chance */ + } if (c == '\r') c = '\n'; /* console input is always ICRNL */ return (c); @@ -369,6 +371,7 @@ if (cn_mute) return (-1); + STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) { cn = cnd->cnd_cn; if (!kdb_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) { ==== //depot/projects/usb/src/sys/kern/vfs_mount.c#30 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -76,7 +77,7 @@ static int vfs_domount(struct thread *td, const char *fstype, char *fspath, int fsflags, void *fsdata); static int vfs_mountroot_ask(void); -static int vfs_mountroot_try(const char *mountfrom, const char *options); +static int vfs_mountroot_try(const char *mountfrom, const char *options, int asked); static void free_mntarg(struct mntarg *ma); static int usermount = 0; @@ -1344,82 +1345,9 @@ * */ -struct root_hold_token { - const char *who; - LIST_ENTRY(root_hold_token) list; -}; - -static LIST_HEAD(, root_hold_token) root_holds = - LIST_HEAD_INITIALIZER(&root_holds); - static int root_mount_complete; /* - * Hold root mount. - */ -struct root_hold_token * -root_mount_hold(const char *identifier) -{ - struct root_hold_token *h; - - if (root_mounted()) - return (NULL); - - h = malloc(sizeof *h, M_DEVBUF, M_ZERO | M_WAITOK); - h->who = identifier; - mtx_lock(&mountlist_mtx); - LIST_INSERT_HEAD(&root_holds, h, list); - mtx_unlock(&mountlist_mtx); - return (h); -} - -/* - * Release root mount. - */ -void -root_mount_rel(struct root_hold_token *h) -{ - - if (h == NULL) - return; - mtx_lock(&mountlist_mtx); - LIST_REMOVE(h, list); - wakeup(&root_holds); - mtx_unlock(&mountlist_mtx); - free(h, M_DEVBUF); -} - -/* - * Wait for all subsystems to release root mount. - */ -static void -root_mount_prepare(void) -{ - struct root_hold_token *h; - struct timeval lastfail; - int curfail = 0; - - for (;;) { - DROP_GIANT(); - g_waitidle(); - PICKUP_GIANT(); - mtx_lock(&mountlist_mtx); - if (LIST_EMPTY(&root_holds)) { - mtx_unlock(&mountlist_mtx); - break; - } - if (ppsratecheck(&lastfail, &curfail, 1)) { - printf("Root mount waiting for:"); - LIST_FOREACH(h, &root_holds, list) - printf(" %s", h->who); - printf("\n"); - } - msleep(&root_holds, &mountlist_mtx, PZERO | PDROP, "roothold", - hz); - } -} - -/* * Root was mounted, share the good news. */ static void @@ -1452,27 +1380,6 @@ return (root_mount_complete); } -/* - * Wait until root is mounted. - */ -void -root_mount_wait(void) -{ - - /* - * Panic on an obvious deadlock - the function can't be called from - * a thread which is doing the whole SYSINIT stuff. - */ - KASSERT(curthread->td_proc->p_pid != 0, - ("root_mount_wait: cannot be called from the swapper thread")); - mtx_lock(&mountlist_mtx); - while (!root_mount_complete) { - msleep(&root_mount_complete, &mountlist_mtx, PZERO, "rootwait", - hz); - } - mtx_unlock(&mountlist_mtx); -} - static void set_rootvnode() { @@ -1644,24 +1551,23 @@ vfs_mountroot(void) { char *cp, *options; - int error, i, asked = 0; + int error, i, t, asked = 0; options = NULL; - root_mount_prepare(); - mount_zone = uma_zcreate("Mountpoints", sizeof(struct mount), NULL, NULL, mount_init, mount_fini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); devfs_first(); +repeat: /* * We are booted with instructions to prompt for the root filesystem. */ if (boothowto & RB_ASKNAME) { if (!vfs_mountroot_ask()) goto mounted; - asked = 1; + asked++; } options = getenv("vfs.root.mountfrom.options"); @@ -1671,7 +1577,7 @@ * booted with instructions to use it. */ if (ctrootdevname != NULL && (boothowto & RB_DFLTROOT)) { - if (!vfs_mountroot_try(ctrootdevname, options)) + if (!vfs_mountroot_try(ctrootdevname, options, asked)) goto mounted; ctrootdevname = NULL; } @@ -1683,7 +1589,7 @@ */ if (boothowto & RB_CDROM) { for (i = 0; cdrom_rootdevnames[i] != NULL; i++) { - if (!vfs_mountroot_try(cdrom_rootdevnames[i], options)) + if (!vfs_mountroot_try(cdrom_rootdevnames[i], options, asked)) goto mounted; } } @@ -1695,7 +1601,7 @@ */ cp = getenv("vfs.root.mountfrom"); if (cp != NULL) { - error = vfs_mountroot_try(cp, options); + error = vfs_mountroot_try(cp, options, asked); freeenv(cp); if (!error) goto mounted; @@ -1704,22 +1610,39 @@ /* * Try values that may have been computed by code during boot */ - if (!vfs_mountroot_try(rootdevnames[0], options)) + if (!vfs_mountroot_try(rootdevnames[0], options, asked)) goto mounted; - if (!vfs_mountroot_try(rootdevnames[1], options)) + if (!vfs_mountroot_try(rootdevnames[1], options, asked)) goto mounted; /* * If we (still) have a compiled-in default, try it. */ if (ctrootdevname != NULL) - if (!vfs_mountroot_try(ctrootdevname, options)) + if (!vfs_mountroot_try(ctrootdevname, options, asked)) goto mounted; + + asked ++; + + t = 16; + i = -1; + while (t-- && (i == -1)) { + pause("WKEY", hz / 16); /* give USB a chance */ + i = cncheckc(); + } + /* * Everything so far has failed, prompt on the console if we haven't * already tried that. */ - if (!asked) + if (i == 'C') /* XXX also check for CTRL pressed */ + if (!vfs_mountroot_ask()) + goto mounted; + + if (asked < (3 * 60)) /* Wait a maximum of 3 minutes */ + goto repeat; + + if (i != 'C') if (!vfs_mountroot_ask()) goto mounted; @@ -1780,7 +1703,7 @@ * Mount (mountfrom) as the root filesystem. */ static int -vfs_mountroot_try(const char *mountfrom, const char *options) +vfs_mountroot_try(const char *mountfrom, const char *options, int asked) { struct mount *mp; struct mntarg *ma; @@ -1799,7 +1722,7 @@ if (mountfrom == NULL) return (error); /* don't complain */ - printf("Trying to mount root from %s\n", mountfrom); + printf("Trying to mount root from %s. Press CTRL+C to abort.\n", mountfrom); /* parse vfs name and path */ vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK); @@ -1847,7 +1770,7 @@ devfs_fixup(curthread); } - if (error != 0 ) { + if ((error != 0) && (asked == 0)) { printf("ROOT MOUNT ERROR: %s\n", errmsg); printf("If you have invalid mount options, reboot, and "); printf("first try the following from\n"); @@ -1875,6 +1798,7 @@ char *options; for(;;) { + printf("\n"); printf("Loader variables:\n"); printf("vfs.root.mountfrom="); mountfrom = getenv("vfs.root.mountfrom"); @@ -1908,7 +1832,7 @@ g_dev_print(); continue; } - if (!vfs_mountroot_try(name, NULL)) + if (!vfs_mountroot_try(name, NULL, 0)) return (0); } } ==== //depot/projects/usb/src/sys/sys/systm.h#20 (text+ko) ==== @@ -333,15 +333,8 @@ /* XXX: Should be void nanodelay(u_int nsec); */ void DELAY(int usec); -/* Root mount holdback API */ -struct root_hold_token; - -struct root_hold_token *root_mount_hold(const char *identifier); -void root_mount_rel(struct root_hold_token *h); -void root_mount_wait(void); int root_mounted(void); - /* * Unit number allocation API. (kern/subr_unit.c) */ From rene at FreeBSD.org Sat Oct 3 23:31:53 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sat Oct 3 23:31:59 2009 Subject: PERFORCE change 169185 for review Message-ID: <200910032331.n93NVqtX086202@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169185 Change 169185 by rene@rene_self on 2009/10/03 23:31:21 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#13 integrate .. //depot/projects/docproj_nl/www/share/sgml/notices.xml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -678,8 +678,8 @@ When &man.portsnap.8; successfully completes a fetch operation, the Ports Collection and subsequent patches exist on the local system that have passed - verification. The updated files may be installed by - typing: + verification. The first time portsnap is executed, + use extract to install the updated files: &prompt.root; portsnap extract /usr/ports/.cvsignore @@ -695,11 +695,17 @@ /usr/ports/Mk/bsd.cmake.mk ... + For subsequent runs of portsnap fetch, + update should be used instead: + + &prompt.root; portsnap update + The process is now complete, and applications may be installed or upgraded using the updated Ports Collection. - To run both processes consecutively, issue the following - command: + The fetch and extract or + update operations may be run consecutively, as + shown in the following example: &prompt.root; portsnap fetch update ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#13 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.231 2009/07/29 00:50:20 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.233 2009/10/02 20:27:31 simon Exp $ @@ -10,6 +10,22 @@ 2009 + 10 + + + 2 + + + FreeBSD-SA-09:14.devfs + + + + FreeBSD-SA-09:13.pipe + + + + + 7 ==== //depot/projects/docproj_nl/www/share/sgml/notices.xml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/notices.xml,v 1.14 2009/06/24 05:45:57 cperciva Exp $ + $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $ @@ -10,6 +10,18 @@ 2009 + 10 + + + 2 + + + FreeBSD-EN-09:05.null + + + + + 6 From rene at FreeBSD.org Sun Oct 4 00:03:27 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Oct 4 00:03:33 2009 Subject: PERFORCE change 169186 for review Message-ID: <200910040003.n9403RSC089490@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169186 Change 169186 by rene@rene_self on 2009/10/04 00:02:30 MFen handbook/cutting-edge 1.244 -> 1.245 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.18 2009/08/26 06:04:09 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.244 + %SRCID% 1.245 --> @@ -740,9 +740,9 @@ Wanneer &man.portsnap.8; succesvol een fetch-operatie afrondt, bestaan de Portscollectie en de vervolgpatches die de verificatie doorstaan - hebben op het plaatselijke systeem. De bijgewerkte bestanden - kunnen geïnstalleerd worden door het volgende te - typen: + hebben op het plaatselijke systeem. Gebruik de eerste keer dat + portsnap wordt uitgevoerd extract + om de bijgewerkte bestanden te installeren: &prompt.root; portsnap extract /usr/ports/.cvsignore @@ -758,12 +758,18 @@ /usr/ports/Mk/bsd.cmake.mk ... + Bij verder gebruik van portsnap fetch dient + update gebruikt te worden: + + &prompt.root; portsnap update + Het proces is nu compleet, en applicaties kunnen met de bijgewerkte Portscollectie worden geïnstalleerd of worden bijgewerkt. - Geef het volgende commando om de twee processen achter elkaar - te draaien: + De bewerkingen fetch en extract + of update kunnen achter elkaar uitgevoerd worden, zoals + het volgende voorbeeld laat zien: &prompt.root; portsnap fetch update From pgj at FreeBSD.org Sun Oct 4 08:57:11 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 4 08:57:18 2009 Subject: PERFORCE change 169189 for review Message-ID: <200910040857.n948v9Yk066218@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169189 Change 169189 by pgj@beehive on 2009/10/04 08:56:27 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/csjp.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/gahr.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#32 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#30 integrate .. //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#3 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#22 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#14 integrate .. //depot/projects/docproj_hu/www/share/sgml/notices.xml#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#9 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -21,30 +21,30 @@ 4eDMA/4najs55j1kz8khhLiAX0SUJj92XpjmpSFLvFB8D4JpeNtWKGx/wt9uwYBr GqnFpP7JHUFowTgg4LjgM3r+W+s1TyUZ5cBlgTgp1Qh6y0h98X6Pbppu1GEhTvWP 9FlvKNK1+bYNKKvUFHc5nLRK+0M7e0IP6yws2O9RN6rkb6UU8rQdUGlldHJvIENl -cnV0dGkgPGdhaHJAZ2Foci5jaD6IeAQTEQIAOAIbIwYLCQgHAwIEFQIIAwQWAgMB -Ah4BAheAAhkBFBhodHRwOi8vcGdwLm1pdC5lZHV0BQJFzyOoAAoJEMDCapiVcfeO -U+oAoIPxcczSTL9IAJnRBUaRvjL8dJNgAJ9wh1Gh1+HpbxqtXsTcEr68ZXKfUYhp -BBMRAgApAhsjBQkJZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEA -CgkQwMJqmJVx944wAQCggfm9PIqoj6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn -6d7b+IhfvKh7iH4EExECAD4CGyMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX -gAIZAQUCRc3QKxQYaHR0cDovL3BncC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9K -qPCEaiTKejBDeI+ZjLemDPYFogCgvC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRy -byBDZXJ1dHRpIChUaGUgRnJlZUJTRCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9y -Zz6IYAQTEQIAIAUCR7xw2AIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDC -apiVcfeOw5AAoMjUQZiqAGONGzJtT3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9 -kUXqubkCDQREauOLEAgAv+OK9YPB4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM -8jLtBLqPY5qWlGRrAbh3ZHkOvrrfY/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2 -gm35aluNcHbFutYGrkAThuFst1qJbPowBBmQgR7RH5/lWbn3Qnisthsm6J5Jldjg -cfXth9usyXsGXCP1zZ10Sj2Q090SuSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn -/HhT3ed4kkZXkQJvvI/t3Glyp7RY5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtnc -F/7MTUpib3MvgBpmPRq9yV4LHbhiDbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527F -enxU4hf0fWG3orqKAI/p3AhPj7l/T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/l -tzZdhFS67k+Ya/CLy0G3we8KQSqoUTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro -73vvaFXPwHTxSmRRHg/UgE0B5+tJkuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0Q -SnhzUcxv+YrV8TX11/NC0FlmhxTzncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9B -ntWbBPjB1TYa80jYNbLA/KdKEZlK1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4f -YLrdxYhPBBgRAgAPBQJEauOLAhsMBQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q -7p39kg5LmO/zsDXCD8wOAKCDV7iQR8Dblj7cX+WKPwwhnrNq0Q== -=fVQ7 +cnV0dGkgPGdhaHJAZ2Foci5jaD6IYwQTEQIAIwIbIwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheAAhkBBQJKwl4hAAoJEMDCapiVcfeOp+oAnR9QXvf5u9vyeU3vnAo7CiyW +LE6GAJ9Pip8AO5c9BvjTjsRhVH9O+447qohpBBMRAgApAhsjBQkJZgGABgsJCAcD +AgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEACgkQwMJqmJVx944wAQCggfm9PIqo +j6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn6d7b+IhfvKh7iH4EExECAD4CGyMF +CQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCRc3QKxQYaHR0cDovL3Bn +cC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9KqPCEaiTKejBDeI+ZjLemDPYFogCg +vC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRybyBDZXJ1dHRpIChUaGUgRnJlZUJT +RCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9yZz6IYAQTEQIAIAUCR7xw2AIbIwYL +CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDCapiVcfeOw5AAoMjUQZiqAGONGzJt +T3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9kUXqubkCDQREauOLEAgAv+OK9YPB +4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM8jLtBLqPY5qWlGRrAbh3ZHkOvrrf +Y/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2gm35aluNcHbFutYGrkAThuFst1qJ +bPowBBmQgR7RH5/lWbn3Qnisthsm6J5JldjgcfXth9usyXsGXCP1zZ10Sj2Q090S +uSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn/HhT3ed4kkZXkQJvvI/t3Glyp7RY +5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtncF/7MTUpib3MvgBpmPRq9yV4LHbhi +DbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527FenxU4hf0fWG3orqKAI/p3AhPj7l/ +T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/ltzZdhFS67k+Ya/CLy0G3we8KQSqo +UTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro73vvaFXPwHTxSmRRHg/UgE0B5+tJ +kuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0QSnhzUcxv+YrV8TX11/NC0FlmhxTz +ncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9BntWbBPjB1TYa80jYNbLA/KdKEZlK +1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4fYLrdxYhPBBgRAgAPBQJEauOLAhsM +BQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q7p39kg5LmO/zsDXCD8wOAKCDV7iQ +R8Dblj7cX+WKPwwhnrNq0Q== +=UXRy -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#32 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1011,6 +1011,11 @@ &pgpkey.cperciva; + + &a.csjp; + &pgpkey.csjp; + + &a.gerald; &pgpkey.gerald; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#30 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -60,6 +60,7 @@ + ==== //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#3 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.65 2008/09/22 19:13:42 wosch Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $ # # @@ -302,6 +302,8 @@ $PR = int $PR; $PR = quotemeta $PR; +# Note: query-pr.web is just a anti DoS wrapper around query-pr which +# make sure we do not run too many query-pr instances at once. if ($category) { $category = quotemeta $category; @query = split /\n/, qx(query-pr.web --full --category=${category} ${PR} 2>&1); ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#22 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2635,6 +2635,21 @@ lstewart Received + + + gavin + 3 Zip 100 drives
+ 3 3ware cards + mav + Received + + + + Gareth Randall + HP C1636-00100 SCSI tape drive + cracauer + Received + &footer; ==== //depot/projects/docproj_hu/www/share/sgml/advisories.xml#14 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.231 2009/07/29 00:50:20 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.233 2009/10/02 20:27:31 simon Exp $ @@ -10,6 +10,22 @@ 2009 + 10 + + + 2 + + + FreeBSD-SA-09:14.devfs + + + + FreeBSD-SA-09:13.pipe + + + + + 7 ==== //depot/projects/docproj_hu/www/share/sgml/notices.xml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/notices.xml,v 1.14 2009/06/24 05:45:57 cperciva Exp $ + $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $ @@ -10,6 +10,18 @@ 2009 + 10 + + + 2 + + + FreeBSD-EN-09:05.null + + + + + 6 ==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#9 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.80 2009/06/09 20:45:27 marius Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $ @@ -325,7 +325,7 @@ The Serbian BSD User Group - http://www.bsd-srbija.org/ + http://www.bsdserbia.org/ The Serbian BSD Users Group provides an open forum for all things BSD-related in the Serbian language. Located From pgj at FreeBSD.org Sun Oct 4 09:36:54 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Oct 4 09:37:01 2009 Subject: PERFORCE change 169190 for review Message-ID: <200910040936.n949arku069981@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169190 Change 169190 by pgj@beehive on 2009/10/04 09:36:01 MFen (doc): 1.244 -> 1.245 hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml 1.74 -> 1.75 hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml 1.134 -> 1.135 hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml 1.194 -> 1.195 hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#25 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#16 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#25 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -956,11 +956,13 @@ Ahogy a &man.portsnap.8; sikeresen befejezi az imént kiadott fetch mûvelet végrehajtását, a helyi rendszeren már - telepítésre készen fog várakozni a + telepítésre készen fognak várakozni a Portgyûjtemény és az hozzátartozó ellenõrzött módosítások. A - tényleges telepítésüket a - következõképpen kérhetjük: + portsnap elsõ használatakor az + extract parancs + segítségével telepíthetjük a + frissített állományokat: &prompt.root; portsnap extract /usr/ports/.cvsignore @@ -976,14 +978,22 @@ /usr/ports/Mk/bsd.cmake.mk ... + A portsnap fetch késõbbi + futtatásakor viszont már az update + parancsot kell használnunk: + + &prompt.root; portsnap update + Ezzel lezárult a portok frissítése, innentõl már az aktualizált Portgyûjtemény felhasználásával tetszõlegesen telepíthetõek vagy frissíthetõek az alkalmazások. - Az elõbb említett mûveleteket így - tudjuk egyetlen parancsba foglalni: + A fetch, extract vagy + update mûveletek egyetlen parancsba is + összefûzhetõek, ahogy ezt az alábbi + példában is láthatjuk: &prompt.root; portsnap fetch update ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#12 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -2676,7 +2676,7 @@ kibõvítjük a következõ módon: - mac_seeotheruids_enabled="YES" + mac_seeotheruids_load="YES" A &man.mac.bsdextended.4; biztonsági modul az alábbi ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#12 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2258,8 +2258,9 @@ Ezt a kimenetet egy &os; 8.X rendszeren kaptuk, ahol a - epson2:libusb:/dev/usb:/dev/ugen0.2 az - eszközhöz tartozó backendet és + 'epson2:libusb:/dev/usb:/dev/ugen0.2' az + eszközhöz tartozó backendet + (epson2) és eszközleírót (/dev/ugen0.2) adja meg. @@ -2318,7 +2319,7 @@ azonosítani, át kell írnunk a /usr/local/etc/sane.d/epson2.conf állományt. A használt lapolvasó - típusa &epson.perfection; 1650, ezért + típusa &epson.perfection; 1650, ezért hozzá az epson2 backendet fogjuk használni. Ehhez feltétlenül olvassuk el a konfigurációs állományban @@ -2463,10 +2464,10 @@ add path usb/0.2.0 mode 0660 group usb A &os; 7.X változatok - esetén a következõ sorokra lesz - szükségünk (legtöbb esetben a + esetén valószínûleg a + következõ sorokra lesz szükségünk a /dev/uscanner0 - eszközleíróhoz): + eszközleíróhoz: [system=5] add path uscanner0 mode 0660 group usb ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#16 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1655,13 +1655,19 @@ Az XDM használata - Az XDM-hez tartozó - démon a /usr/local/bin/xdm - állomány. Ezt programot root - felhasználóként bármikor tudjuk - futtatni, és ez veszi kezelésbe a helyi - gépen futó X szervert. Amennyiben az - XDM-et a + A XDM használatához + elõször telepítenünk kell rendszerünkre + a x11/xdm portot (mivel az + &xorg; újabb változatai + ezt alapértelmezés szerint már nem + telepítik). Ezt követõen az + XDM démon a + /usr/local/bin/xdm helyen + található meg. A programot + root felhasználóként + bármikor tudjuk futtatni, és ez veszi + kezelésbe a helyi gépen futó X szervert. + Amennyiben az XDM-et a számítógép minden egyes indulása során el akarjuk indítani, egyszerûen csak adjuk hozzá a megfelelõ From rene at FreeBSD.org Sun Oct 4 20:21:39 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Oct 4 20:21:45 2009 Subject: PERFORCE change 169203 for review Message-ID: <200910042021.n94KLcDA048590@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169203 Change 169203 by rene@rene_self on 2009/10/04 20:20:59 [website] * Rebreak build (!) * Add to-be-translated versions of share/sgml/templates.*.xsl * Use generic versions of some xsl definitions Affected files ... .. //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#7 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#9 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#11 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.entries.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.events.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.events2ics.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.news-rdf.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.news-rss.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.newsflash.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldnewsflash.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldpress.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.pastevents.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.press-rss.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.press.xsl#1 add .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.usergroups.xsl#1 add Differences ... ==== //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#7 (text+ko) ==== @@ -8,23 +8,3 @@ - - - - - - - - - - - - - - - - - - - - ==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#9 (text+ko) ==== @@ -410,29 +410,4 @@ - - - - - - - - - - - - - - - - - - - - - - ==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#11 (text+ko) ==== @@ -42,7 +42,7 @@
  • IRC
  • Newsgroepen
  • Gebruikersgroepen
    • -
  • Evenementen
    • +
  • Evenementen
  • Bronnen op het web
  • Sociale netwerken
    • From rene at FreeBSD.org Sun Oct 4 21:02:24 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Sun Oct 4 21:02:31 2009 Subject: PERFORCE change 169205 for review Message-ID: <200910042102.n94L2Nna061688@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169205 Change 169205 by rene@rene_self on 2009/10/04 21:02:14 [website] Localize some templates Affected files ... .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.events.xsl#2 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldpress.xsl#2 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.pastevents.xsl#2 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/templates.press.xsl#2 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.events.xsl#2 (text+ko) ==== @@ -48,7 +48,6 @@ exclude-result-prefixes="cvs"> - @@ -84,7 +83,7 @@ generate-id() = generate-id(key('event-by-country', location/country)[1])]"> - + @@ -93,9 +92,9 @@ generate-id() = generate-id(key('event-by-country', location/country)[1])]"> - 100.0 - .0 - , + 100.0 + .0 + , &chd=t:&chld= @@ -110,27 +109,27 @@ &header2;
    -
    - &nav; - -
    +
    + &nav; + +
    &header3; - - Generated on: + Gegenereerd op: @@ -145,7 +144,7 @@ - month: + maand: @@ -187,7 +186,7 @@ generate-id(key('event-by-month', concat(startdate/year, format-number(startdate/month, '00')))[1]) and ((number(enddate/year) >= $startyear)) and - ((number(enddate/year) < number($curdate.year)) or + ((number(enddate/year) < number($curdate.year)) or (number(enddate/year) = number($curdate.year) and number(enddate/month) < number($curdate.month)) or (number(enddate/year) = number($curdate.year) and @@ -200,13 +199,13 @@

    - month: + maand: - +

    @@ -221,23 +220,23 @@     -

    Events from past years:

    +

    Evenementen van voorgaande jaren:

    -
      +
        - - - -
      + + + +

    - + @@ -293,14 +292,14 @@
  • -

    Social links: +

    Sociale koppelingen: - + - http://upcoming.yahoo.com/search?type=Events&q=&Search=GO + http://upcoming.yahoo.com/search?type=Events&q=&Search=GO - upcoming

    + aanstaand

    •  @@ -321,12 +320,12 @@
  • -

    Social links: - http://www.flickr.com/search/?w=all&q=&m=text +

    Sociale koppelingen: + http://www.flickr.com/search/?w=all&q=&m=text Flickr, - http://blogsearch.google.com/blogsearch?q=Blog Search, - - http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    + http://blogsearch.google.com/blogsearch?q=Blog zoeken, + + http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    • @@ -343,7 +342,7 @@ &base; - + @@ -355,22 +354,22 @@ - -
  • + +
  • events.html - -
    • -     - - - - + + + + + + +     -
  • +
  • events.html - -
    • + +     ==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.oldpress.xsl#2 (text+ko) ==== @@ -1,12 +1,16 @@ + ]> - + @@ -20,12 +24,12 @@ - + - + &header1; @@ -45,8 +49,8 @@ &header3; - -

    Other press publications: + +

    Andere perspublicaties: 2008, 2007, 2006, @@ -59,16 +63,16 @@ 1999, 1998-1996

    - News Home + Beginpagina Nieuws
    - + @@ -78,7 +82,7 @@     - +

    @@ -109,7 +113,7 @@


    - + ,
    ==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.pastevents.xsl#2 (text+ko) ==== @@ -1,15 +1,19 @@ + - + ]> - + - +

    + &nav; + +
    &header3; - - Generated on: + Gegenereerd op: @@ -150,13 +154,13 @@

    - month: + maand: - +

    @@ -171,26 +175,26 @@ -

    Current Events

    +

    Huidige evenementen

    -

    Events from past years:

    +

    Evenementen van voorgaande jaren:

    -
      +
        - - - -
      + + + +

    - + @@ -246,8 +250,8 @@
  • -

    Social links: - http://upcoming.yahoo.com/search?type=Events&q=&Search=GO +

    Sociale koppelingen: + http://upcoming.yahoo.com/search?type=Events&q=&Search=GO upcoming

    •  @@ -261,12 +265,12 @@
  • -

    Social links: - http://www.flickr.com/search/?w=all&q=&m=text +

    Sociale koppelingen: + http://www.flickr.com/search/?w=all&q=&m=text Flickr, - http://blogsearch.google.com/blogsearch?q=Blog Search, - - http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    + http://blogsearch.google.com/blogsearch?q=Blog zoeken, + + http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    • @@ -283,7 +287,7 @@ &base; - + @@ -295,22 +299,22 @@ - -
  • + +
  • events.html - -
    • -     - - - - + + + + + + +     -
  • +
  • events.html - -
    • + +     ==== //depot/projects/docproj_nl/www/nl/share/sgml/templates.press.xsl#2 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -9,7 +9,11 @@ ]> - + @@ -36,18 +40,18 @@ &header2;
    -
    - &nav; - -
    +
    + &nav; + +
    @@ -56,25 +60,25 @@ - - + + -
    +

    - + - + From gk at FreeBSD.org Sun Oct 4 21:47:12 2009 From: gk at FreeBSD.org (Gleb Kurtsou) Date: Sun Oct 4 21:47:19 2009 Subject: PERFORCE change 169206 for review Message-ID: <200910042147.n94LlBfc065871@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169206 Change 169206 by gk@gk_h1 on 2009/10/04 21:46:36 remove unused sysctl remove vobject->root != NULL it's not needed add MODULE_DEPEND(crypto) Affected files ... .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#12 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#20 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#12 (text+ko) ==== @@ -321,4 +321,6 @@ }; VFS_SET(pefs_vfsops, pefs, VFCF_LOOPBACK); +MODULE_DEPEND(pefs, crypto, 1, 1, 1); MODULE_DEPEND(pefs, salsa20, 1, 1, 1); + ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#20 (text+ko) ==== @@ -90,10 +90,6 @@ #define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN + 1)) #define DIRENT_MAXSIZE (sizeof(struct dirent)) -static int pefs_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ -SYSCTL_INT(_debug, OID_AUTO, pefs_bug_bypass, CTLFLAG_RW, - &pefs_bug_bypass, 0, ""); - struct pefs_enccn { struct componentname pec_cn; void *pec_buf; @@ -1563,8 +1559,7 @@ if (object == NULL) return (0); - if (object->resident_page_count > 0 || object->cache != NULL || - object->root != NULL) + if (object->resident_page_count > 0 || object->cache != NULL) return (1); return (0); } From pgj at FreeBSD.org Mon Oct 5 11:36:19 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Oct 5 11:36:25 2009 Subject: PERFORCE change 169217 for review Message-ID: <200910051136.n95BaIN1069639@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169217 Change 169217 by pgj@beehive on 2009/10/05 11:35:41 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#38 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#26 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/jh.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#33 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#31 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#32 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#70 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#38 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.489 2009/09/16 14:58:25 wen Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.490 2009/10/04 14:47:10 jh Exp $ --> aaron@FreeBSD.org"> @@ -500,6 +500,8 @@ jgreco@FreeBSD.org"> +jh@FreeBSD.org"> + jhay@FreeBSD.org"> jhb@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -481,6 +481,11 @@ &pgpkey.niels; + + &a.jh; + &pgpkey.jh; + + &a.ghelmer; &pgpkey.ghelmer; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#31 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -127,6 +127,7 @@ + ==== //depot/projects/docproj_hu/src/release/doc/share/misc/man2hwnotes.pl#3 (text+ko) ==== @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.15 2008/10/05 09:45:45 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.16 2009/10/04 16:30:33 simon Exp $ # # Parse the list of supported hardware out of section 4 manual pages @@ -252,6 +252,10 @@ $txt =~ s/ Ta /\t/g; $txt =~ s/([^\t]+)\t.*/$1/; } + + # Remove Li commands + $txt =~ s/^Li //g; + parabuf_addline(\%mdocvars, normalize($txt)); } elsif (/^Bl/) { $mdocvars{isin_list} = 1; ==== //depot/projects/docproj_hu/www/en/developers.sgml#32 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.230 2009/09/16 15:05:12 wen Exp $ +$FreeBSD: www/en/developers.sgml,v 1.231 2009/10/04 15:00:07 jh Exp $ --> @@ -248,6 +248,7 @@ + ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#70 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.271 2009/09/21 20:05:13 blackend Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.272 2009/10/04 15:00:07 jh Exp $ @@ -33,6 +33,18 @@ 2009 + 10 + + 4 + + +

    New committer: Jaakko + Heinonen (src)

    +     +     +     + + 9 From pgj at FreeBSD.org Mon Oct 5 11:51:35 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Oct 5 11:51:42 2009 Subject: PERFORCE change 169218 for review Message-ID: <200910051151.n95BpZ4N070705@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169218 Change 169218 by pgj@beehive on 2009/10/05 11:50:46 MFen (www): 1.271 -> 1.272 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#54 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#54 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,6 +19,19 @@ 2009 + 10 + + + 4 + + +

    Új tag: Jaakko + Heinonen (src)

    +     +     +     + + 9 From stas at FreeBSD.org Mon Oct 5 12:01:47 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Mon Oct 5 12:02:00 2009 Subject: PERFORCE change 169219 for review Message-ID: <200910051201.n95C1kTT071434@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169219 Change 169219 by stas@stas_yandex on 2009/10/05 12:00:51 - Check if SSSE3 tests have been actually built before trying to run them. Affected files ... .. //depot/projects/valgrind/none/tests/amd64/insn_ssse3.vgtest#3 edit .. //depot/projects/valgrind/none/tests/amd64/ssse3_misaligned.vgtest#3 edit Differences ... ==== //depot/projects/valgrind/none/tests/amd64/insn_ssse3.vgtest#3 (text+ko) ==== @@ -1,3 +1,3 @@ prog: ../../../none/tests/amd64/insn_ssse3 -prereq: ../../../tests/x86_amd64_features amd64-ssse3 +prereq: ../../../tests/x86_amd64_features amd64-ssse3 && test -e insn_ssse3 vgopts: -q ==== //depot/projects/valgrind/none/tests/amd64/ssse3_misaligned.vgtest#3 (text+ko) ==== @@ -1,3 +1,3 @@ prog: ssse3_misaligned -prereq: ../../../tests/x86_amd64_features amd64-ssse3 +prereq: ../../../tests/x86_amd64_features amd64-ssse3 && test -e ssse3_misaligned vgopts: -q From stas at FreeBSD.org Mon Oct 5 12:52:43 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Mon Oct 5 12:52:49 2009 Subject: PERFORCE change 169220 for review Message-ID: <200910051252.n95Cqgx9086312@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169220 Change 169220 by stas@stas_yandex on 2009/10/05 12:52:03 - exp-ptrcheck doesn't work on FreeBSD (yet). Affected files ... .. //depot/projects/valgrind/exp-ptrcheck/h_main.c#5 edit .. //depot/projects/valgrind/exp-ptrcheck/pc_main.c#4 edit Differences ... ==== //depot/projects/valgrind/exp-ptrcheck/h_main.c#5 (text+ko) ==== @@ -2448,251 +2448,10 @@ ADD(1, __NR_ipc); /* ppc{32,64}-linux horrors */ # endif + /* --------------- FreeBSD ------------- */ + # elif defined(VGO_freebsd) -# define ADD(_flag, _syscallname) \ - do { UWordPair p; p.uw1 = (_syscallname); p.uw2 = (_flag); \ - VG_(addToXA)( post_syscall_table, &p ); \ - } while (0) - - /* These ones definitely don't return pointers. They're not - particularly grammatical, either. */ - -# if defined(__NR__llseek) - ADD(0, __NR__llseek); -# endif -# if defined(__NR__newselect) - ADD(0, __NR__newselect); -# endif -# if defined(__NR_accept) - ADD(0, __NR_accept); -# endif - ADD(0, __NR_access); -# if defined(__NR_bind) - ADD(0, __NR_bind); -# endif -# if defined(__NR_chdir) - ADD(0, __NR_chdir); -# endif - ADD(0, __NR_chmod); - ADD(0, __NR_chown); -# if defined(__NR_chown32) - ADD(0, __NR_chown32); -# endif - ADD(0, __NR_clock_getres); - ADD(0, __NR_clock_gettime); - ADD(0, __NR_close); -# if defined(__NR_connect) - ADD(0, __NR_connect); -# endif - ADD(0, __NR_dup); - ADD(0, __NR_dup2); - ADD(0, __NR_execve); /* presumably we see this because the call failed? */ - ADD(0, __NR_exit); /* hmm, why are we still alive? */ - ADD(0, __NR_fchmod); - ADD(0, __NR_fchown); -# if defined(__NR_fchown32) - ADD(0, __NR_fchown32); -# endif - ADD(0, __NR_fcntl); -# if defined(__NR_fcntl64) - ADD(0, __NR_fcntl64); -# endif - ADD(0, __NR_flock); - ADD(0, __NR_fstat); -# if defined(__NR_fstat64) - ADD(0, __NR_fstat64); -# endif - ADD(0, __NR_fstatfs); - # if defined(__NR_fstatfs64) - ADD(0, __NR_fstatfs64); -# endif - ADD(0, __NR_fsync); - ADD(0, __NR_ftruncate); -# if defined(__NR_ftruncate64) - ADD(0, __NR_ftruncate64); -# endif - ADD(0, __NR_getdents); // something to do with teeth - ADD(0, __NR_getegid); -# if defined(__NR_getegid32) - ADD(0, __NR_getegid32); -# endif - ADD(0, __NR_geteuid); -# if defined(__NR_geteuid32) - ADD(0, __NR_geteuid32); -# endif - ADD(0, __NR_getgid); -# if defined(__NR_getgid32) - ADD(0, __NR_getgid32); -# endif - ADD(0, __NR_getgroups); -# if defined(__NR_getgroups32) - ADD(0, __NR_getgroups32); -# endif - ADD(0, __NR_getitimer); -# if defined(__NR_getpeername) - ADD(0, __NR_getpeername); -# endif - ADD(0, __NR_getpid); - ADD(0, __NR_getpgrp); - ADD(0, __NR_getppid); - ADD(0, __NR_getpriority); - ADD(0, __NR_getresgid); -# if defined(__NR_getresgid32) - ADD(0, __NR_getresgid32); -# endif - ADD(0, __NR_getresuid); -# if defined(__NR_getresuid32) - ADD(0, __NR_getresuid32); -# endif - ADD(0, __NR_getrlimit); - ADD(0, __NR_getrusage); -# if defined(__NR_getsockname) - ADD(0, __NR_getsockname); -# endif -# if defined(__NR_getsockopt) - ADD(0, __NR_getsockopt); -# endif - ADD(0, __NR_gettimeofday); - ADD(0, __NR_getuid); -# if defined(__NR_getuid32) - ADD(0, __NR_getuid32); -# endif - ADD(0, __NR_ioctl); // ioctl -- assuming no pointers returned - ADD(0, __NR_kill); - ADD(0, __NR_link); -# if defined(__NR_listen) - ADD(0, __NR_listen); -# endif - ADD(0, __NR_lseek); - ADD(0, __NR_lstat); -# if defined(__NR_lstat64) - ADD(0, __NR_lstat64); -# endif - ADD(0, __NR_madvise); - ADD(0, __NR_mkdir); - ADD(0, __NR_mlock); - ADD(0, __NR_mprotect); - ADD(0, __NR_munmap); // die_mem_munmap already called, segment remove); - ADD(0, __NR_nanosleep); - ADD(0, __NR_open); - ADD(0, __NR_pipe); - ADD(0, __NR_poll); - ADD(0, __NR_read); - ADD(0, __NR_readlink); - ADD(0, __NR_readv); -# if defined(__NR_recvfrom) - ADD(0, __NR_recvfrom); -# endif -# if defined(__NR_recvmsg) - ADD(0, __NR_recvmsg); -# endif - ADD(0, __NR_rename); - ADD(0, __NR_rmdir); - ADD(0, __NR_sched_get_priority_max); - ADD(0, __NR_sched_get_priority_min); - ADD(0, __NR_sched_getparam); - ADD(0, __NR_sched_getscheduler); - ADD(0, __NR_sched_setscheduler); - ADD(0, __NR_sched_yield); - ADD(0, __NR_select); -# if defined(__NR_semctl) - ADD(0, __NR_semctl); -# endif -# if defined(__NR_semget) - ADD(0, __NR_semget); -# endif -# if defined(__NR_semop) - ADD(0, __NR_semop); -# endif -# if defined(__NR_sendto) - ADD(0, __NR_sendto); -# endif -# if defined(__NR_sendmsg) - ADD(0, __NR_sendmsg); -# endif -# if defined(__NR_set_thread_area) - ADD(0, __NR_set_thread_area); -# endif - ADD(0, __NR_setgid); - ADD(0, __NR_setitimer); - ADD(0, __NR_setpgid); - ADD(0, __NR_setpriority); - ADD(0, __NR_setregid); - ADD(0, __NR_setresgid); - ADD(0, __NR_setresuid); - ADD(0, __NR_setreuid); - ADD(0, __NR_setrlimit); - ADD(0, __NR_setsid); -# if defined(__NR_setsockopt) - ADD(0, __NR_setsockopt); -# endif - ADD(0, __NR_setuid); -# if defined(__NR_shmctl) - ADD(0, __NR_shmctl); - ADD(0, __NR_shmdt); -# endif -# if defined(__NR_shutdown) - ADD(0, __NR_shutdown); -# endif - ADD(0, __NR_sigaltstack); -# if defined(__NR_socket) - ADD(0, __NR_socket); -# endif -# if defined(__NR_socketcall) - ADD(0, __NR_socketcall); /* the nasty x86-linux socket multiplexor */ -# endif -# if defined(__NR_socketpair) - ADD(0, __NR_socketpair); -# endif -# if defined(__NR_statfs64) - ADD(0, __NR_statfs64); -# endif -# if defined(__NR_sigreturn) - ADD(0, __NR_sigreturn); /* not sure if we should see this or not */ -# endif -# if defined(__NR_stat64) - ADD(0, __NR_stat64); -# endif - ADD(0, __NR_stat); - ADD(0, __NR_statfs); - ADD(0, __NR_symlink); - ADD(0, __NR_truncate); -# if defined(__NR_truncate64) - ADD(0, __NR_truncate64); -# endif -# if defined(__NR_ugetrlimit) - ADD(0, __NR_ugetrlimit); -# endif - ADD(0, __NR_umask); - ADD(0, __NR_uname); - ADD(0, __NR_unlink); - ADD(0, __NR_vfork); -# if defined(__NR_waitpid) - ADD(0, __NR_waitpid); -# endif - ADD(0, __NR_wait4); - ADD(0, __NR_write); - ADD(0, __NR_writev); - - /* Whereas the following need special treatment */ -# if defined(__NR_arch_prctl) - ADD(1, __NR_arch_prctl); -# endif - ADD(1, __NR_mmap); -# if defined(__NR_mmap2) - ADD(1, __NR_mmap2); -# endif -# if defined(__NR_shmat) - ADD(1, __NR_shmat); -# endif -# if defined(__NR_shmget) - ADD(1, __NR_shmget); -# endif -# if defined(__NR_ipc) && defined(VKI_SHMAT) - ADD(1, __NR_ipc); /* ppc{32,64}-linux horrors */ -# endif - /* --------------- AIX5 --------------- */ # elif defined(VGO_aix5) ==== //depot/projects/valgrind/exp-ptrcheck/pc_main.c#4 (text+ko) ==== @@ -152,6 +152,11 @@ VG_(printf)("Ptrcheck doesn't work on Darwin yet, sorry.\n"); VG_(exit)(1); #endif +#if defined(VGO_freebsd) + // This makes the (all-failing) regtests run much faster. + VG_(printf)("Ptrcheck doesn't work on FreeBSD yet, sorry.\n"); + VG_(exit)(1); +#endif VG_(details_name) ("exp-ptrcheck"); VG_(details_version) (NULL); From stas at FreeBSD.org Mon Oct 5 12:54:45 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Mon Oct 5 12:54:51 2009 Subject: PERFORCE change 169221 for review Message-ID: <200910051254.n95Csiim086425@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169221 Change 169221 by stas@stas_yandex on 2009/10/05 12:54:33 - Do not try to run SSSE3 tests if SSSE3 support is not available. Affected files ... .. //depot/projects/valgrind/none/tests/x86/insn_ssse3.vgtest#3 edit .. //depot/projects/valgrind/none/tests/x86/ssse3_misaligned.vgtest#3 edit Differences ... ==== //depot/projects/valgrind/none/tests/x86/insn_ssse3.vgtest#3 (text+ko) ==== @@ -1,3 +1,3 @@ prog: ../../../none/tests/x86/insn_ssse3 -prereq: ../../../tests/x86_amd64_features x86-ssse3 +prereq: ../../../tests/x86_amd64_features x86-ssse3 && test -e insn_ssse3 vgopts: -q ==== //depot/projects/valgrind/none/tests/x86/ssse3_misaligned.vgtest#3 (text+ko) ==== @@ -1,3 +1,3 @@ prog: ssse3_misaligned -prereq: ../../../tests/x86_amd64_features x86-ssse3 +prereq: ../../../tests/x86_amd64_features x86-ssse3 && test -e ssse3_misaligned vgopts: -q From stas at FreeBSD.org Mon Oct 5 14:15:13 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Mon Oct 5 14:15:19 2009 Subject: PERFORCE change 169225 for review Message-ID: <200910051415.n95EFCq8094368@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169225 Change 169225 by stas@stas_yandex on 2009/10/05 14:15:05 - Build "threads" callgrind test on FreeBSD, use right linker flags when building it. Affected files ... .. //depot/projects/valgrind/callgrind/tests/Makefile.am#5 edit Differences ... ==== //depot/projects/valgrind/callgrind/tests/Makefile.am#5 (text+ko) ==== @@ -17,13 +17,9 @@ notpower2-use.vgtest notpower2-use.stderr.exp \ threads.vgtest threads.stderr.exp -check_PROGRAMS = clreq simwork - -if !VGCONF_PLATFORMS_INCLUDE_X86_FREEBSD -check_PROGRAMS += threads -endif +check_PROGRAMS = clreq simwork threads AM_CFLAGS += $(AM_FLAG_M3264_PRI) AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) -threads_LDADD = -lpthread +threads_LDFLAGS = -pthread From stas at FreeBSD.org Mon Oct 5 14:59:01 2009 From: stas at FreeBSD.org (Stanislav Sedov) Date: Mon Oct 5 14:59:07 2009 Subject: PERFORCE change 169228 for review Message-ID: <200910051459.n95Ex0kd097529@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169228 Change 169228 by stas@stas_yandex on 2009/10/05 14:58:11 - Correct the detection of signal source. Affected files ... .. //depot/projects/valgrind/coregrind/m_signals.c#14 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_signals.c#14 (text+ko) ==== @@ -1407,7 +1407,7 @@ // them. return ( si_code > VKI_SI_USER ? True : False ); #elif defined(VGO_freebsd) - return ( si_code < VKI_SI_USER ? True : False ); + return ( (si_code & VKI_SI_USER) == 0 ? True : False ); #elif defined(VGO_darwin) // On Darwin 9.6.0, the si_code is completely unreliable. It should be the // case that 0 means "user", and >0 means "kernel". But: From truncs at FreeBSD.org Mon Oct 5 22:26:13 2009 From: truncs at FreeBSD.org (Aditya Sarawgi) Date: Mon Oct 5 22:26:19 2009 Subject: PERFORCE change 169251 for review Message-ID: <200910052226.n95MQCCG058423@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169251 Change 169251 by truncs@aditya on 2009/10/05 22:26:11 Reflect new location of ext2fs and remove obsolete header files. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ext2fs/Makefile#2 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ext2fs/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ # $FreeBSD: src/sys/modules/ext2fs/Makefile,v 1.6 2005/06/15 02:36:11 rodrigc Exp $ -.PATH: ${.CURDIR}/../../gnu/fs/ext2fs +.PATH: ${.CURDIR}/../../fs/ext2fs KMOD= ext2fs SRCS= opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \ ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \ - ext2_inode_cnv.c ext2_linux_balloc.c ext2_linux_ialloc.c \ - ext2_lookup.c ext2_subr.c ext2_vfsops.c ext2_vnops.c + ext2_inode_cnv.c ext2_lookup.c ext2_subr.c ext2_vfsops.c \ + ext2_vnops.c .include From rwatson at FreeBSD.org Tue Oct 6 12:47:57 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Tue Oct 6 12:48:08 2009 Subject: PERFORCE change 169263 for review Message-ID: <200910061247.n96CluRN074831@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169263 Change 169263 by rwatson@rwatson_freebsd_capabilities on 2009/10/06 12:47:23 Integrate TrustedBSD capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.platform#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-pam.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth1.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/defines.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/includes.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/jpake.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/jpake.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kex.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kex.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_wrap.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/packet.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/packet.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/readconf.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/readconf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/schnorr.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/servconf.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/session.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.1#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_namespace.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect2.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.8#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config#4 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshlogin.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/version.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#8 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/ftpd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/kde#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/other#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/sshd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/system#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/telnetd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/xdm#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/defaultroute#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routing#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/static_arp#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/services#2 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/trustedbsd/capabilities/src/include/langinfo.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/nl_langinfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/libexec/sftp-server/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.sbin/sshd/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/de.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/unix.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/urtw.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/zyd.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#10 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/fetch.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/store.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-src.dot#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#19 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-ati.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_common.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_create.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_init.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_move.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_subr.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/elf_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/cpufunc.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#22 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_proc.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_acl.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_default.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/cxgb/cxgb/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfslockd/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/route.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/pmc.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/vnode.h#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/mmap/mmap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/main.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/netstat.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/unix.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/whois/whois.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/whois/whois.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); #include #include @@ -82,7 +82,6 @@ STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -1043,7 +1042,7 @@ endword: if (syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); if (varnest != 0) { startlinno = plinno; @@ -1303,7 +1302,6 @@ parsebackq: { struct nodelist **nlpp; - int savepbq; union node *n; char *volatile str; struct jmploc jmploc; @@ -1311,11 +1309,9 @@ int savelen; int saveprompt; - savepbq = parsebackquote; if (setjmp(jmploc.loc)) { if (str) ckfree(str); - parsebackquote = 0; handler = savehandler; longjmp(handler->loc, 1); } @@ -1397,7 +1393,6 @@ nlpp = &(*nlpp)->next; *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); (*nlpp)->next = NULL; - parsebackquote = oldstyle; if (oldstyle) { saveprompt = doprompt; @@ -1433,7 +1428,6 @@ str = NULL; INTON; } - parsebackquote = savepbq; handler = savehandler; if (arinest || dblquote) USTPUTC(CTLBACKQ | CTLQUOTE, out); ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ + +20090622 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 + [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] + alphabetize includes; reduces diff vs portable and style(9). + ok stevesk djm + (Id sync only; these were already in order in -portable) + +20090621 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2009/03/17 21:37:00 + [ssh.c] + pass correct argv[0] to openlog(); ok djm@ + - jmc@cvs.openbsd.org 2009/03/19 15:15:09 + [ssh.1] + for "Ciphers", just point the reader to the keyword in ssh_config(5), just + as we do for "MACs": this stops us getting out of sync when the lists + change; + fixes documentation/6102, submitted by Peter J. Philipp + alternative fix proposed by djm + ok markus + - tobias@cvs.openbsd.org 2009/03/23 08:31:19 + [ssh-agent.c] + Fixed a possible out-of-bounds memory access if the environment variable + SHELL is shorter than 3 characters. + with input by and ok dtucker + - tobias@cvs.openbsd.org 2009/03/23 19:38:04 + [ssh-agent.c] + My previous commit didn't fix the problem at all, so stick at my first + version of the fix presented to dtucker. + Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). + ok dtucker + - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 + [sftp-server.8 sshd.8 ssh-agent.1] + fix a few typographical errors found by spell(1). + ok dtucker@, jmc@ + - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 + [sshd_config.5] + fix possessive; ok djm@ + - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 + [sftp-server.c] + remove unused option character from getopt() optstring; ok markus@ + - jj@cvs.openbsd.org 2009/04/14 21:10:54 + [servconf.c] + Fixed a few the-the misspellings in comments. Skipped a bunch in + binutils,gcc and so on. ok jmc@ + - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 + [session.c] + use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; + ok djm@ markus@ + - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 + [sshd_config.5] + clarify that even internal-sftp needs /dev/log for logging to work; ok + markus@ + - jmc@cvs.openbsd.org 2009/04/18 18:39:10 + [sshd_config.5] + tweak previous; ok stevesk + - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 + [sshd_config.5] + clarify we cd to user's home after chroot; ok markus@ on + earlier version; tweaks and ok jmc@ + - andreas@cvs.openbsd.org 2009/05/25 06:48:01 + [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c + monitor.c] + Put the globals in packet.c into a struct and don't access it directly + from other files. No functional changes. + ok markus@ djm@ + - andreas@cvs.openbsd.org 2009/05/27 06:31:25 + [canohost.h canohost.c] + Add clear_cached_addr(), needed for upcoming changes allowing the peer + address to change. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:33:39 + [clientloop.c] + Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger + change from Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:34:36 + [kex.c kex.h] + Move the KEX_COOKIE_LEN define to kex.h + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:36:07 + [packet.h packet.c] + Add packet_put_int64() and packet_get_int64(), part of a larger change + from Martin Forssen. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:38:16 + [sshconnect.h sshconnect.c] + Un-static ssh_exchange_identification(), part of a larger change from + Martin Forssen and needed for upcoming changes. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c Added roaming.h roaming_common.c roaming_dummy.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ + Also, applied appropriate changes to Makefile.in + - andreas@cvs.openbsd.org 2009/06/12 20:43:22 + [monitor.c packet.c] + Fix warnings found by chl@ and djm@ and change roaming_atomicio's + return type to match atomicio's + Diff from djm@, ok markus@ + - andreas@cvs.openbsd.org 2009/06/12 20:58:32 + [packet.c] + Move some more statics into session_state + ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 + [kexdhs.c kexgexs.c] + abort if key_sign fails, preventing possible null deref. Based on report + from Paolo Ganci, ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 + [roaming.h roaming_common.c roaming_dummy.c] + Add tags for the benefit of the sync scripts + Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. + - (dtucker) [servconf.c sshd.c] More whitespace sync. + - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include in + ifdef. + +20090616 + - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t + is a struct with a __val member. Fixes build on, eg, Redhat 6.2. + +20090504 + - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include + variable declarations. Should prevent unused warnings anywhere it's set + (only Crays as far as I can tell) and be a no-op everywhere else. + +20090318 + - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem + that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. + Based on patch from vinschen at redhat com. + +20090308 + - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c + auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} + openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old + version of Cygwin. Patch from vinschen at redhat com. + +20090307 + - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it + exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS + has a /dev/random). + - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add + EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c + to use them. Allows building with older OpenSSL versions. + - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. + - (dtucker) [configure.ac] Missing comma in type list. + - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] + EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg + in openssl 0.9.6) so add an explicit test for it. + +20090306 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2009/03/05 07:18:19 + [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] + [sshconnect2.c] + refactor the (disabled) Schnorr proof code to make it a little more + generally useful + - djm@cvs.openbsd.org 2009/03/05 11:30:50 + [uuencode.c] + document what these functions do so I don't ever have to recuse into + b64_pton/ntop to remember their return values + 20090223 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2009/02/22 23:50:57 ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#4 (text+ko) ==== @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.2 for the release notes. +See http://www.openssh.com/txt/release-5.3 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ +$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $ ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.platform#3 (text+ko) ==== @@ -56,6 +56,18 @@ http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ +Linux +----- + +Some Linux distributions (including Red Hat/Fedora/CentOS) include +headers and library links in the -devel RPMs rather than the main +binary RPMs. If you get an error about headers, or complaining about a +missing prerequisite then you may need to install the equivalent +development packages. On Redhat based distros these may be openssl-devel, +zlib-devel and pam-devel, on Debian based distros these may be +libssl-dev, libz-dev and libpam-dev. + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -81,4 +93,4 @@ return the output from pam_nologin to the client. -$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $ +$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $ ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-pam.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */ +/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */ #include "includes.h" #include @@ -602,16 +602,16 @@ return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); + if (sshpam_session_open) { + debug("PAM: closing session"); + pam_close_session(sshpam_handle, PAM_SILENT); + sshpam_session_open = 0; + } if (sshpam_cred_established) { debug("PAM: deleting credentials"); pam_setcred(sshpam_handle, PAM_DELETE_CRED); sshpam_cred_established = 0; } - if (sshpam_session_open) { - debug("PAM: closing session"); - pam_close_session(sshpam_handle, PAM_SILENT); - sshpam_session_open = 0; - } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-passwd.c#3 (text+ko) ==== @@ -102,7 +102,7 @@ } #endif #ifdef HAVE_CYGWIN - if (is_winnt) { + { HANDLE hToken = cygwin_logon_user(pw, password); if (hToken == INVALID_HANDLE_VALUE) ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-sia.c#3 (text+ko) ==== @@ -34,10 +34,6 @@ #include #include #include -#include -#include -#include -#include #include "ssh.h" #include "key.h" @@ -53,52 +49,6 @@ extern int saved_argc; extern char **saved_argv; -static int -sia_password_change_required(const char *user) -{ - struct es_passwd *acct; - time_t pw_life; - time_t pw_date; - - set_auth_parameters(saved_argc, saved_argv); - - if ((acct = getespwnam(user)) == NULL) { - error("Couldn't access protected database entry for %s", user); - endprpwent(); - return (0); - } - - /* If forced password change flag is set, honor it */ - if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) { - endprpwent(); - return (1); - } - - /* Obtain password lifetime; if none, it can't have expired */ - if (acct->uflg->fg_expire) - pw_life = acct->ufld->fd_expire; - else if (acct->sflg->fg_expire) - pw_life = acct->sfld->fd_expire; - else { - endprpwent(); - return (0); - } - - /* Offset from last change; if none, it must be expired */ - if (acct->uflg->fg_schange) - pw_date = acct->ufld->fd_schange + pw_life; - else { - endprpwent(); - return (1); - } - - endprpwent(); - - /* If expiration date is prior to now, change password */ - - return (pw_date <= time((time_t *) NULL)); -} - int sys_auth_passwd(Authctxt *authctxt, const char *pass) { @@ -126,9 +76,6 @@ sia_ses_release(&ent); - authctxt->force_pwchange = sia_password_change_required( - authctxt->user); - return (1); } ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth1.c#3 (text+ko) ==== @@ -318,15 +318,7 @@ } #endif /* _UNICOS */ -#ifdef HAVE_CYGWIN - if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, - authctxt->pw)) { - packet_disconnect("Authentication rejected for uid %d.", - authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); - authenticated = 0; - } -#else +#ifndef HAVE_CYGWIN /* Special handling for root */ if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(meth->name)) { ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-jpake.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" +#include "auth.h" #include "buffer.h" -#include "auth.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-kbdint.c#3 (text+ko) ==== @@ -58,10 +58,6 @@ xfree(devs); xfree(lang); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-none.c#3 (text+ko) ==== @@ -61,10 +61,6 @@ { none_enabled = 0; packet_check_eom(); -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - return (0); -#endif if (options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-passwd.c#2 (text+ko) ==== @@ -68,10 +68,6 @@ logit("password change not supported"); else if (PRIVSEP(auth_password(authctxt, password)) == 1) authenticated = 1; -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - authenticated = 0; -#endif memset(password, 0, len); xfree(password); return authenticated; ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#3 (text+ko) ==== @@ -170,10 +170,6 @@ key_free(key); xfree(pkalg); xfree(pkblob); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -24,7 +24,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $"); #include #include @@ -36,8 +36,8 @@ #include #include +#include "atomicio.h" #include "xmalloc.h" -#include "atomicio.h" #include "ssh2.h" #include "packet.h" #include "log.h" ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,6 +35,8 @@ #include "misc.h" static void check_ip_options(int, char *); +static char *canonical_host_ip = NULL; +static int cached_port = -1; /* * Return the canonical name of the host at the other end of the socket. The @@ -304,6 +306,16 @@ return get_socket_address(sock, 0, NI_NAMEREQD); } +void +clear_cached_addr(void) +{ + if (canonical_host_ip != NULL) { + xfree(canonical_host_ip); + canonical_host_ip = NULL; + } + cached_port = -1; +} + /* * Returns the IP-address of the remote host as a string. The returned * string must not be freed. @@ -312,8 +324,6 @@ const char * get_remote_ipaddr(void) { - static char *canonical_host_ip = NULL; - /* Check whether we have cached the ipaddr. */ if (canonical_host_ip == NULL) { if (packet_connection_is_on_socket()) { @@ -402,13 +412,11 @@ int get_remote_port(void) { - static int port = -1; - /* Cache to avoid getpeername() on a dead connection */ - if (port == -1) - port = get_port(0); + if (cached_port == -1) + cached_port = get_port(0); - return port; + return cached_port; } int ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.h,v 1.11 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen @@ -24,6 +24,6 @@ int get_remote_port(void); int get_local_port(void); int get_sock_port(int, int); - +void clear_cached_addr(void); void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1653,6 +1653,7 @@ } return -1; } +#ifndef BROKEN_TCGETATTR_ICANON if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') { if (tcgetattr(c->wfd, &tio) == 0 && !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) { @@ -1666,6 +1667,7 @@ packet_send(); } } +#endif buffer_consume(&c->output, len); if (compat20 && len > 0) { c->local_consumed += len; @@ -2431,7 +2433,7 @@ int id; /* Reset keepalive timeout */ - keep_alive_timeouts = 0; + packet_set_alive_timeouts(0); id = packet_get_int(); packet_check_eom(); ==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -109,6 +109,7 @@ #include "misc.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From rwatson at FreeBSD.org Tue Oct 6 12:57:07 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Tue Oct 6 12:57:19 2009 Subject: PERFORCE change 169264 for review Message-ID: <200910061257.n96Cv7iv075448@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169264 Change 169264 by rwatson@rwatson_cinnamon on 2009/10/06 12:56:28 OpenBSM bits for ENOTCAPABLE on FreeBSD. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#20 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#20 $ */ #include @@ -684,6 +684,13 @@ ERRNO_NO_LOCAL_MAPPING, #endif ES("Key was rejected by service") }, + { BSM_ERRNO_ENOTCAPABLE, +#ifdef ENOTCAPABLE + ENOTCAPABLE, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + ES("Capabilities insufficient") }, }; static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 $ */ #ifndef _BSM_AUDIT_ERRNO_H_ @@ -204,6 +204,7 @@ #define BSM_ERRNO_EKEYEXPIRED 220 /* Linux-specific. */ #define BSM_ERRNO_EKEYREVOKED 221 /* Linux-specific. */ #define BSM_ERRNO_EKEYREJECTED 222 /* Linux-specific. */ +#define BSM_ERRNO_ENOTCAPABLE 223 /* FreeBSD-specific. */ /* * In the event that OpenBSM doesn't have a file representation of a local From rwatson at FreeBSD.org Tue Oct 6 12:57:08 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Tue Oct 6 12:57:19 2009 Subject: PERFORCE change 169265 for review Message-ID: <200910061257.n96Cv7T4075453@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169265 Change 169265 by rwatson@rwatson_cinnamon on 2009/10/06 12:56:52 ENOTCAPABLE support for OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#46 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#46 (text+ko) ==== @@ -2,7 +2,8 @@ OpenBSM 1.2 alpha 1 -- Add audit events for FreeBSD process descriptor system calls. +- Add audit events for FreeBSD process descriptor system calls, ENOTCAPABLE + BSM errno constant. OpenBSM 1.1p2 @@ -468,4 +469,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#45 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#46 $ From remko at FreeBSD.org Tue Oct 6 14:06:23 2009 From: remko at FreeBSD.org (Remko Lodder) Date: Tue Oct 6 14:06:37 2009 Subject: PERFORCE change 169267 for review Message-ID: <200910061406.n96E6NjS082413@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169267 Change 169267 by remko@remko_guardian on 2009/10/06 14:05:41 Submit latest WIP Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#18 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#18 (text+ko) ==== @@ -894,7 +894,7 @@ pdf - Adobe's Porteerbaar Document Formaat + Adobe's Porteerbare Document Formaat @@ -919,13 +919,14 @@ - Page numbers are not automatically updated when - loading Rich Text Format into Word. Press Pagina nummers worden niet automatisch bijgewerkt + wanneer het Rich Text Format geladen wordt in Word. + Toets CtrlA, CtrlEnd, - F9 after loading the document, to - update the page numbers. + F9 na het laden van het document om + de pagina nummers bij te werken. @@ -1083,7 +1084,7 @@ - Het kanaal ##FreeBSD oo Het kanaal ##FreeBSD op Freenode is een generiek help kanaal met ongeveer 300 gebruikers op elk willekeurig moment. De gesprekken hebben een tijd @@ -1116,7 +1117,7 @@ - Het kanaal #FreeBSD oo Het kanaal #FreeBSD op UNDERNET is beschikbaar op us.undernet.org in de VS en eu.undernet.org in Europa. Omdat @@ -1145,12 +1146,12 @@ Elk van deze kanalen zijn uniek en niet met elkaar verbonden. De chat stijl verschilt ook per server, dus het kan voorkomen dat je meerdere servers moet proberen - om te zien welke geschikt is voor jou chat stijl. Zoals + om te zien welke geschikt is voor jouw stijl. Zoals met alle type van IRC verkeer geldt dat als je snel geraakt bent, of als je niet kan omgaan met jongere mensen (meer dan de paar oudere die er zitten) - waarbij het equivalent van moddergevechten wordt gedaan, - doe dan maar geen moeite. + waarbij een vorm van moddervechten wordt gevoerd; doe dan + maar geen moeite. @@ -1824,7 +1825,7 @@ - &os; herkent d Ontrack Disk + &os; herkent de Ontrack Disk Manager en accepteert deze. Andere schijf managers worden niet ondersteund. @@ -1870,7 +1871,7 @@ - Dit is een ander symptoom van het proleem beschreven in + Dit is een ander symptoom van het probleem beschreven in voorgaande vraag. Uw BIOS geometrie en &os; geometrie instellingen komen niet overeen! Als uw controller of BIOS cylinder translation ondersteund (veelal gemarkeerd als @@ -1946,24 +1947,25 @@ - Het standaard wachtwoord formaat op &os; is door - gebruik te maken van MD5 - gebaseerde wachtwoorden. Deze worden geacht veiliger te - zijn dan het traditionele &unix; wachtwoord formaat welke - gebruik maakt van een schema gebaseerd op het - DES algorithme. DES wachtwoorden zijn + Het standaard wachtwoord formaat op &os; is op + MD5 gebaseerde wachtwoorden. Deze + worden geacht veiliger te zijn dan het traditionele + &unix; wachtwoord formaat welke gebruik maakt van een + schema dat gebaseerd is op het DES + algorithme. DES wachtwoorden zijn nog steeds beschikbaar als u uw wachtwoord bestand moet delen met oudere besturingssystemen, welke nog gebruik maken van het minder veilige wachtwoord formaat. &os; stelt u ook - in staat om gebruik te maken van het Blowfish wachtwoord - formaat, welke veiliger is. Welk wachtwoord formaat er - gebruikt wordt voor nieuwe wachtwoorden, wordt ingesteld - door de passwd_format login mogelijkheden - in /etc/login.conf, welke de waardes - des, blf (als deze - beschikbaar is) of md5 accepteert. Zie - de &man.login.conf.5; handleiding voor meer informatie over - login mogelijkheden. + in staat om gebruik te maken van het Blowfish format welke + veiliger is. + Welk wachtwoord formaat er + gebruikt wordt voor nieuwe wachtwoorden, wordt ingesteld door + de passwd_format variable in + /etc/login.conf, welke ingesteld kan + worden met de waardes des, + blf (mits beschikbaar) of + md5. Zie de &man.login.conf.5; handleiding + voor meer informatie over diverse login mogelijkheden. From mav at FreeBSD.org Tue Oct 6 16:41:14 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Tue Oct 6 16:41:22 2009 Subject: PERFORCE change 169270 for review Message-ID: <200910061641.n96GfCfD095663@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169270 Change 169270 by mav@mav_mavbook on 2009/10/06 16:40:16 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/README#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/README.platform#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth1.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/auth2.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/canohost.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/canohost.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/channels.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/config.h#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/config.h.in#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/defines.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/includes.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/jpake.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/jpake.h#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/kex.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/kex.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/monitor.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/packet.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/packet.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/readconf.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/readconf.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/roaming.h#1 branch .. //depot/projects/scottl-camlock/src/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/scottl-camlock/src/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/scottl-camlock/src/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/schnorr.h#1 branch .. //depot/projects/scottl-camlock/src/crypto/openssh/servconf.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/serverloop.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/session.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sftp-server.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh.1#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.8#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshlogin.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/version.h#3 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#9 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/ftpd#3 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/kde#3 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/other#3 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/sshd#3 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/system#2 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/telnetd#3 integrate .. //depot/projects/scottl-camlock/src/etc/pam.d/xdm#3 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/security/200.chkmounts#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/faith#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/routing#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/static_arp#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/stf#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#6 integrate .. //depot/projects/scottl-camlock/src/etc/services#4 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes.sp.ok#3 integrate .. //depot/projects/scottl-camlock/src/include/langinfo.h#2 integrate .. //depot/projects/scottl-camlock/src/include/libgen.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/basename.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fts.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fts.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/nl_langinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libradius/radlib.c#4 integrate .. //depot/projects/scottl-camlock/src/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/scottl-camlock/src/sbin/growfs/growfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/scottl-camlock/src/secure/libexec/sftp-server/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/secure/usr.bin/ssh/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/de.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/unix.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/urtw.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/zyd.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/tuning.7#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/fetch.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/store.9#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#6 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#7 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/southamerica#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#27 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/i80321_timer.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#48 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_acad.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_regs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phyreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hda_reg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_core.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_tty.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_create.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_init.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elf_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#14 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfslockd/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#20 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/elf_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/elf_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/fcntl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/pmc.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/rwlock.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sx.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#20 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#14 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/mmap/mmap.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/locale/locale.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/locale/locale.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.h#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/unix.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/freebsd-update/freebsd-update.sh#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lp/lp.sh#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); #include #include @@ -82,7 +82,6 @@ STATIC struct heredoc *heredoclist; /* list of here documents to read */ -STATIC int parsebackquote; /* nonzero if we are inside backquotes */ STATIC int doprompt; /* if set, prompt the user */ STATIC int needprompt; /* true if interactive and at start of line */ STATIC int lasttoken; /* last token read */ @@ -1043,7 +1042,7 @@ endword: if (syntax == ARISYNTAX) synerror("Missing '))'"); - if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) + if (syntax != BASESYNTAX && eofmark == NULL) synerror("Unterminated quoted string"); if (varnest != 0) { startlinno = plinno; @@ -1303,7 +1302,6 @@ parsebackq: { struct nodelist **nlpp; - int savepbq; union node *n; char *volatile str; struct jmploc jmploc; @@ -1311,11 +1309,9 @@ int savelen; int saveprompt; - savepbq = parsebackquote; if (setjmp(jmploc.loc)) { if (str) ckfree(str); - parsebackquote = 0; handler = savehandler; longjmp(handler->loc, 1); } @@ -1397,7 +1393,6 @@ nlpp = &(*nlpp)->next; *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); (*nlpp)->next = NULL; - parsebackquote = oldstyle; if (oldstyle) { saveprompt = doprompt; @@ -1433,7 +1428,6 @@ str = NULL; INTON; } - parsebackquote = savepbq; handler = savehandler; if (arinest || dblquote) USTPUTC(CTLBACKQ | CTLQUOTE, out); ==== //depot/projects/scottl-camlock/src/crypto/openssh/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,282 @@ +20090926 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release + - (djm) [README] update relnotes URL + - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere + - (djm) Release 5.3p1 + +20090911 + - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X + 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch + from jbasney at ncsa uiuc edu. + +20090908 + - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port + (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ + +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + +20090829 + - (dtucker) [README.platform] Add text about development packages, based on + text from Chris Pepper in bug #1631. + +20090828 + - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently + causes problems in some Tru64 configurations. + - (djm) [sshd_config.5] downgrade mention of login.conf to be an example + and mention PAM as another provider for ChallengeResponseAuthentication; + bz#1408; ok dtucker@ + - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when + attempting atomic rename(); ok dtucker@ + - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables + in argv, so pass them in the environment; ok dtucker@ + - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on + the pty master on Solaris, since it never succeeds and can hang if large + amounts of data is sent to the slave (eg a copy-paste). Based on a patch + originally from Doke Scott, ok djm@ + - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer + size a compile-time option and set it to 64k on Cygwin, since Corinna + reports that it makes a significant difference to performance. ok djm@ + - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. + +20090820 + - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not + using it since the type conflicts can cause problems on FreeBSD. Patch + from Jonathan Chen. + - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move + the setpcred call on AIX to immediately before the permanently_set_uid(). + Ensures that we still have privileges when we call chroot and + pam_open_sesson. Based on a patch from David Leonard. + +20090817 + - (dtucker) [configure.ac] Check for headers before libraries for openssl an + zlib, which should make the errors slightly more meaningful on platforms + where there's separate "-devel" packages for those. + - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make + PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. + +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + +20090713 + - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it + fits into 16 bits to work around a bug in glibc's resolver where it masks + off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. + +20090712 + - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, + prevents configure complaining on older BSDs. + - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch + from Corinna Vinschen. + - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on + logout to after the session close. Patch from Anicka Bernathova, + originally from Andreas Schwab via Novelll ok djm. + +20090707 + - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated + scripts and fix usage of eval. Patch from Corinna Vinschen. + +20090705 + - (dtucker) OpenBSD CVS Sync + - andreas@cvs.openbsd.org 2009/06/27 09:29:06 + [packet.h packet.c] + packet_bacup_state() and packet_restore_state() will be used to + temporarily save the current state ren resuming a suspended connection. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:32:43 + [roaming_common.c roaming.h] + It may be necessary to retransmit some data when resuming, so add it + to a buffer when roaming is enabled. + Most of this code was written by Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/06/27 09:35:06 + [readconf.h readconf.c] + Add client option UseRoaming. It doesn't do anything yet but will + control whether the client tries to use roaming if enabled on the + server. From Martin Forssen. + ok markus@ + - markus@cvs.openbsd.org 2009/06/30 14:54:40 + [version.h] + crank version; ok deraadt + - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 + [ssh.c] + allow for long home dir paths (bz #1615). ok deraadt + (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ + +20090622 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 + [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] + alphabetize includes; reduces diff vs portable and style(9). + ok stevesk djm + (Id sync only; these were already in order in -portable) + +20090621 + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2009/03/17 21:37:00 + [ssh.c] + pass correct argv[0] to openlog(); ok djm@ + - jmc@cvs.openbsd.org 2009/03/19 15:15:09 + [ssh.1] + for "Ciphers", just point the reader to the keyword in ssh_config(5), just + as we do for "MACs": this stops us getting out of sync when the lists + change; + fixes documentation/6102, submitted by Peter J. Philipp + alternative fix proposed by djm + ok markus + - tobias@cvs.openbsd.org 2009/03/23 08:31:19 + [ssh-agent.c] + Fixed a possible out-of-bounds memory access if the environment variable + SHELL is shorter than 3 characters. + with input by and ok dtucker + - tobias@cvs.openbsd.org 2009/03/23 19:38:04 + [ssh-agent.c] + My previous commit didn't fix the problem at all, so stick at my first + version of the fix presented to dtucker. + Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). + ok dtucker + - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 + [sftp-server.8 sshd.8 ssh-agent.1] + fix a few typographical errors found by spell(1). + ok dtucker@, jmc@ + - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 + [sshd_config.5] + fix possessive; ok djm@ + - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 + [sftp-server.c] + remove unused option character from getopt() optstring; ok markus@ + - jj@cvs.openbsd.org 2009/04/14 21:10:54 + [servconf.c] + Fixed a few the-the misspellings in comments. Skipped a bunch in + binutils,gcc and so on. ok jmc@ + - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 + [session.c] + use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; + ok djm@ markus@ + - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 + [sshd_config.5] + clarify that even internal-sftp needs /dev/log for logging to work; ok + markus@ + - jmc@cvs.openbsd.org 2009/04/18 18:39:10 + [sshd_config.5] + tweak previous; ok stevesk + - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 + [sshd_config.5] + clarify we cd to user's home after chroot; ok markus@ on + earlier version; tweaks and ok jmc@ + - andreas@cvs.openbsd.org 2009/05/25 06:48:01 + [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c + monitor.c] + Put the globals in packet.c into a struct and don't access it directly + from other files. No functional changes. + ok markus@ djm@ + - andreas@cvs.openbsd.org 2009/05/27 06:31:25 + [canohost.h canohost.c] + Add clear_cached_addr(), needed for upcoming changes allowing the peer + address to change. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:33:39 + [clientloop.c] + Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger + change from Martin Forssen, maf at appgate dot com. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:34:36 + [kex.c kex.h] + Move the KEX_COOKIE_LEN define to kex.h + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:36:07 + [packet.h packet.c] + Add packet_put_int64() and packet_get_int64(), part of a larger change + from Martin Forssen. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/27 06:38:16 + [sshconnect.h sshconnect.c] + Un-static ssh_exchange_identification(), part of a larger change from + Martin Forssen and needed for upcoming changes. + ok markus@ + - andreas@cvs.openbsd.org 2009/05/28 16:50:16 + [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c + monitor.c Added roaming.h roaming_common.c roaming_dummy.c] + Keep track of number of bytes read and written. Needed for upcoming + changes. Most code from Martin Forssen, maf at appgate dot com. + ok markus@ + Also, applied appropriate changes to Makefile.in + - andreas@cvs.openbsd.org 2009/06/12 20:43:22 + [monitor.c packet.c] + Fix warnings found by chl@ and djm@ and change roaming_atomicio's + return type to match atomicio's + Diff from djm@, ok markus@ + - andreas@cvs.openbsd.org 2009/06/12 20:58:32 + [packet.c] + Move some more statics into session_state + ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 + [kexdhs.c kexgexs.c] + abort if key_sign fails, preventing possible null deref. Based on report + from Paolo Ganci, ok markus@ djm@ + - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 + [roaming.h roaming_common.c roaming_dummy.c] + Add tags for the benefit of the sync scripts + Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. + - (dtucker) [servconf.c sshd.c] More whitespace sync. + - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include in + ifdef. + +20090616 + - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t + is a struct with a __val member. Fixes build on, eg, Redhat 6.2. + +20090504 + - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include + variable declarations. Should prevent unused warnings anywhere it's set + (only Crays as far as I can tell) and be a no-op everywhere else. + +20090318 + - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem + that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. + Based on patch from vinschen at redhat com. + +20090308 + - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c + auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} + openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old + version of Cygwin. Patch from vinschen at redhat com. + +20090307 + - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it + exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS + has a /dev/random). + - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add + EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c + to use them. Allows building with older OpenSSL versions. + - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. + - (dtucker) [configure.ac] Missing comma in type list. + - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] + EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg + in openssl 0.9.6) so add an explicit test for it. + +20090306 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2009/03/05 07:18:19 + [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] + [sshconnect2.c] + refactor the (disabled) Schnorr proof code to make it a little more + generally useful + - djm@cvs.openbsd.org 2009/03/05 11:30:50 + [uuencode.c] + document what these functions do so I don't ever have to recuse into + b64_pton/ntop to remember their return values + 20090223 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2009/02/22 23:50:57 ==== //depot/projects/scottl-camlock/src/crypto/openssh/README#3 (text+ko) ==== @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.2 for the release notes. +See http://www.openssh.com/txt/release-5.3 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ +$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $ ==== //depot/projects/scottl-camlock/src/crypto/openssh/README.platform#3 (text+ko) ==== @@ -56,6 +56,18 @@ http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ +Linux +----- + +Some Linux distributions (including Red Hat/Fedora/CentOS) include +headers and library links in the -devel RPMs rather than the main +binary RPMs. If you get an error about headers, or complaining about a +missing prerequisite then you may need to install the equivalent +development packages. On Redhat based distros these may be openssl-devel, +zlib-devel and pam-devel, on Debian based distros these may be +libssl-dev, libz-dev and libpam-dev. + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -81,4 +93,4 @@ return the output from pam_nologin to the client. -$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $ +$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $ ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-pam.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */ +/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */ #include "includes.h" #include @@ -602,16 +602,16 @@ return; debug("PAM: cleanup"); pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); + if (sshpam_session_open) { + debug("PAM: closing session"); + pam_close_session(sshpam_handle, PAM_SILENT); + sshpam_session_open = 0; + } if (sshpam_cred_established) { debug("PAM: deleting credentials"); pam_setcred(sshpam_handle, PAM_DELETE_CRED); sshpam_cred_established = 0; } - if (sshpam_session_open) { - debug("PAM: closing session"); - pam_close_session(sshpam_handle, PAM_SILENT); - sshpam_session_open = 0; - } sshpam_authenticated = 0; pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-passwd.c#3 (text+ko) ==== @@ -102,7 +102,7 @@ } #endif #ifdef HAVE_CYGWIN - if (is_winnt) { + { HANDLE hToken = cygwin_logon_user(pw, password); if (hToken == INVALID_HANDLE_VALUE) ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth-sia.c#3 (text+ko) ==== @@ -34,10 +34,6 @@ #include #include #include -#include -#include -#include -#include #include "ssh.h" #include "key.h" @@ -53,52 +49,6 @@ extern int saved_argc; extern char **saved_argv; -static int -sia_password_change_required(const char *user) -{ - struct es_passwd *acct; - time_t pw_life; - time_t pw_date; - - set_auth_parameters(saved_argc, saved_argv); - - if ((acct = getespwnam(user)) == NULL) { - error("Couldn't access protected database entry for %s", user); - endprpwent(); - return (0); - } - - /* If forced password change flag is set, honor it */ - if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) { - endprpwent(); - return (1); - } - - /* Obtain password lifetime; if none, it can't have expired */ - if (acct->uflg->fg_expire) - pw_life = acct->ufld->fd_expire; - else if (acct->sflg->fg_expire) - pw_life = acct->sfld->fd_expire; - else { - endprpwent(); - return (0); - } - - /* Offset from last change; if none, it must be expired */ - if (acct->uflg->fg_schange) - pw_date = acct->ufld->fd_schange + pw_life; - else { - endprpwent(); - return (1); - } - - endprpwent(); - - /* If expiration date is prior to now, change password */ - - return (pw_date <= time((time_t *) NULL)); -} - int sys_auth_passwd(Authctxt *authctxt, const char *pass) { @@ -126,9 +76,6 @@ sia_ses_release(&ent); - authctxt->force_pwchange = sia_password_change_required( - authctxt->user); - return (1); } ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth1.c#3 (text+ko) ==== @@ -318,15 +318,7 @@ } #endif /* _UNICOS */ -#ifdef HAVE_CYGWIN - if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, - authctxt->pw)) { - packet_disconnect("Authentication rejected for uid %d.", - authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); - authenticated = 0; - } -#else +#ifndef HAVE_CYGWIN /* Special handling for root */ if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(meth->name)) { ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-jpake.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" +#include "auth.h" #include "buffer.h" -#include "auth.h" #include "packet.h" #include "dispatch.h" #include "log.h" @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-kbdint.c#3 (text+ko) ==== @@ -58,10 +58,6 @@ xfree(devs); xfree(lang); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-none.c#3 (text+ko) ==== @@ -61,10 +61,6 @@ { none_enabled = 0; packet_check_eom(); -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - return (0); -#endif if (options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); return (0); ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-passwd.c#2 (text+ko) ==== @@ -68,10 +68,6 @@ logit("password change not supported"); else if (PRIVSEP(auth_password(authctxt, password)) == 1) authenticated = 1; -#ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw) == 0) - authenticated = 0; -#endif memset(password, 0, len); xfree(password); return authenticated; ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2-pubkey.c#3 (text+ko) ==== @@ -170,10 +170,6 @@ key_free(key); xfree(pkalg); xfree(pkblob); -#ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw) == 0) - authenticated = 0; -#endif return authenticated; } ==== //depot/projects/scottl-camlock/src/crypto/openssh/auth2.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -24,7 +24,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $"); #include #include @@ -36,8 +36,8 @@ #include #include +#include "atomicio.h" #include "xmalloc.h" -#include "atomicio.h" #include "ssh2.h" #include "packet.h" #include "log.h" ==== //depot/projects/scottl-camlock/src/crypto/openssh/canohost.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */ +/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland >>> TRUNCATED FOR MAIL (1000 lines) <<< From rwatson at FreeBSD.org Tue Oct 6 17:18:55 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Tue Oct 6 17:19:03 2009 Subject: PERFORCE change 169271 for review Message-ID: <200910061718.n96HIsq4009563@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169271 Change 169271 by rwatson@rwatson_cinnamon on 2009/10/06 17:18:32 libcapabilitym no longer required; we now use the same library both inside and outside of sandboxes. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#9 (text+ko) ==== @@ -31,7 +31,6 @@ LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a LIBCAPABILITY?= ${DESTDIR}${LIBDIR}/libcapability.a -LIBCAPABILITYM?= ${DESTDIR}${LIBDIR}/libcapabilitym.a LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a From mav at FreeBSD.org Wed Oct 7 05:25:09 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Wed Oct 7 05:25:16 2009 Subject: PERFORCE change 169283 for review Message-ID: <200910070525.n975P82g008841@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169283 Change 169283 by mav@mav_mavbook on 2009/10/07 05:25:04 Now 48bit commands should also be mentioned here. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#10 (text+ko) ==== @@ -355,7 +355,9 @@ /* only DMA R/W goes through the EMDA machine */ if (request->u.ata.command != ATA_READ_DMA && - request->u.ata.command != ATA_WRITE_DMA) { + request->u.ata.command != ATA_WRITE_DMA && + request->u.ata.command != ATA_READ_DMA48 && + request->u.ata.command != ATA_WRITE_DMA48) { /* disable the EDMA machinery */ if (ATA_INL(ctlr->r_res1, 0x02028 + ATA_MV_EDMA_BASE(ch)) & 0x00000001) From rwatson at FreeBSD.org Wed Oct 7 08:46:49 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Oct 7 08:46:56 2009 Subject: PERFORCE change 169285 for review Message-ID: <200910070846.n978km9Q026346@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169285 Change 169285 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 08:46:43 Integrate TrustedBSD capabilities -- including loop-back of pread(2) change for rtld, basename_r(3). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcsh/sh.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/include/libgen.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#12 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/execution/unknown1.0#1 branch Differences ... ==== //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); #include #include @@ -713,12 +713,7 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } + find_command(argv[0], &cmdentry, 0, path); /* implement the bltin builtin here */ if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { for (;;) { @@ -740,7 +735,7 @@ /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN ==== //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); #include #include @@ -429,6 +429,7 @@ outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: ==== //depot/projects/trustedbsd/capabilities/src/contrib/tcsh/sh.c#4 (text+ko) ==== @@ -1291,6 +1291,8 @@ /* * Mop-up. */ + /* Take care of these (especially HUP) here instead of inside flush. */ + handle_pending_signals(); if (intty) { if (loginsh) { xprintf("logout\n"); ==== //depot/projects/trustedbsd/capabilities/src/include/libgen.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */ -/* $FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */ +/* $FreeBSD: src/include/libgen.h,v 1.3 2009/10/06 14:05:57 rwatson Exp $ */ /* * Copyright (c) 1997 Todd C. Miller ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#12 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $ */ FBSD_1.0 { @@ -370,6 +370,7 @@ }; FBSD_1.2 { + basename_r; getpagesizes; }; ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.9 2009/10/06 14:05:57 rwatson Exp $ .\" -.Dd October 12, 2006 +.Dd October 6, 2009 .Dt BASENAME 3 .Os .Sh NAME ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/basename.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.8 2009/10/06 14:05:57 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#7 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/map_object.c,v 1.22 2009/07/17 19:32:04 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/map_object.c,v 1.23 2009/10/06 17:14:39 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#4 (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/amd64/include/atomic.h,v 1.46 2008/11/22 05:55:56 kmacy Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.47 2009/10/06 13:45:49 attilio Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -73,10 +73,13 @@ */ #if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM) #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ -void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) +void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \ +void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v) int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); +int atomic_cmpset_barr_int(volatile u_int *dst, u_int exp, u_int src); +int atomic_cmpset_barr_long(volatile u_long *dst, u_long exp, u_long src); u_int atomic_fetchadd_int(volatile u_int *p, u_int v); u_long atomic_fetchadd_long(volatile u_long *p, u_long v); @@ -97,8 +100,9 @@ #endif /* - * The assembly is volatilized to demark potential before-and-after side - * effects if an interrupt or SMP collision were to occur. + * The assembly is volatilized to avoid code chunk removal by the compiler. + * GCC aggressively reorders operations and memory clobbering is necessary + * in order to avoid that for memory barriers. */ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ static __inline void \ @@ -108,6 +112,15 @@ : "=m" (*p) \ : CONS (V), "m" (*p)); \ } \ + \ +static __inline void \ +atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + __asm __volatile(MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p) \ + : "memory"); \ +} \ struct __hack /* @@ -160,6 +173,9 @@ return (res); } +#define atomic_cmpset_barr_int atomic_cmpset_int +#define atomic_cmpset_barr_long atomic_cmpset_long + /* * Atomically add the value of v to the integer pointed to by p and return * the previous value of *p. @@ -205,18 +221,23 @@ * PentiumPro or higher, reads may pass writes, so for that case we have * to use a serializing instruction (i.e. with LOCK) to do the load in * SMP kernels. For UP kernels, however, the cache of the single processor - * is always consistent, so we don't need any memory barriers. + * is always consistent, so we only need to take care of compiler. */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ - return (*p); \ + u_##TYPE tmp; \ + \ + tmp = *p; \ + __asm __volatile ("" : : : "memory"); \ + return (tmp); \ } \ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ + __asm __volatile ("" : : : "memory"); \ *p = v; \ } \ struct __hack @@ -247,7 +268,8 @@ __asm __volatile(SOP \ : "=m" (*p), /* 0 */ \ "+r" (v) /* 1 */ \ - : "m" (*p)); /* 2 */ \ + : "m" (*p) /* 2 */ \ + : "memory"); \ } \ struct __hack @@ -327,46 +349,45 @@ #endif /* __GNUCLIKE_ASM */ -/* Acquire and release variants are identical to the normal ones. */ -#define atomic_set_acq_char atomic_set_char -#define atomic_set_rel_char atomic_set_char -#define atomic_clear_acq_char atomic_clear_char -#define atomic_clear_rel_char atomic_clear_char -#define atomic_add_acq_char atomic_add_char -#define atomic_add_rel_char atomic_add_char -#define atomic_subtract_acq_char atomic_subtract_char -#define atomic_subtract_rel_char atomic_subtract_char +#define atomic_set_acq_char atomic_set_barr_char +#define atomic_set_rel_char atomic_set_barr_char +#define atomic_clear_acq_char atomic_clear_barr_char +#define atomic_clear_rel_char atomic_clear_barr_char +#define atomic_add_acq_char atomic_add_barr_char +#define atomic_add_rel_char atomic_add_barr_char +#define atomic_subtract_acq_char atomic_subtract_barr_char +#define atomic_subtract_rel_char atomic_subtract_barr_char -#define atomic_set_acq_short atomic_set_short -#define atomic_set_rel_short atomic_set_short -#define atomic_clear_acq_short atomic_clear_short -#define atomic_clear_rel_short atomic_clear_short -#define atomic_add_acq_short atomic_add_short -#define atomic_add_rel_short atomic_add_short -#define atomic_subtract_acq_short atomic_subtract_short -#define atomic_subtract_rel_short atomic_subtract_short +#define atomic_set_acq_short atomic_set_barr_short +#define atomic_set_rel_short atomic_set_barr_short +#define atomic_clear_acq_short atomic_clear_barr_short +#define atomic_clear_rel_short atomic_clear_barr_short +#define atomic_add_acq_short atomic_add_barr_short +#define atomic_add_rel_short atomic_add_barr_short +#define atomic_subtract_acq_short atomic_subtract_barr_short +#define atomic_subtract_rel_short atomic_subtract_barr_short -#define atomic_set_acq_int atomic_set_int -#define atomic_set_rel_int atomic_set_int -#define atomic_clear_acq_int atomic_clear_int -#define atomic_clear_rel_int atomic_clear_int -#define atomic_add_acq_int atomic_add_int -#define atomic_add_rel_int atomic_add_int -#define atomic_subtract_acq_int atomic_subtract_int -#define atomic_subtract_rel_int atomic_subtract_int -#define atomic_cmpset_acq_int atomic_cmpset_int -#define atomic_cmpset_rel_int atomic_cmpset_int +#define atomic_set_acq_int atomic_set_barr_int +#define atomic_set_rel_int atomic_set_barr_int +#define atomic_clear_acq_int atomic_clear_barr_int +#define atomic_clear_rel_int atomic_clear_barr_int +#define atomic_add_acq_int atomic_add_barr_int +#define atomic_add_rel_int atomic_add_barr_int +#define atomic_subtract_acq_int atomic_subtract_barr_int +#define atomic_subtract_rel_int atomic_subtract_barr_int +#define atomic_cmpset_acq_int atomic_cmpset_barr_int +#define atomic_cmpset_rel_int atomic_cmpset_barr_int -#define atomic_set_acq_long atomic_set_long -#define atomic_set_rel_long atomic_set_long -#define atomic_clear_acq_long atomic_clear_long -#define atomic_clear_rel_long atomic_clear_long -#define atomic_add_acq_long atomic_add_long -#define atomic_add_rel_long atomic_add_long -#define atomic_subtract_acq_long atomic_subtract_long -#define atomic_subtract_rel_long atomic_subtract_long -#define atomic_cmpset_acq_long atomic_cmpset_long -#define atomic_cmpset_rel_long atomic_cmpset_long +#define atomic_set_acq_long atomic_set_barr_long +#define atomic_set_rel_long atomic_set_barr_long +#define atomic_clear_acq_long atomic_clear_barr_long +#define atomic_clear_rel_long atomic_clear_barr_long +#define atomic_add_acq_long atomic_add_barr_long +#define atomic_add_rel_long atomic_add_barr_long +#define atomic_subtract_acq_long atomic_subtract_barr_long +#define atomic_subtract_rel_long atomic_subtract_barr_long +#define atomic_cmpset_acq_long atomic_cmpset_barr_long +#define atomic_cmpset_rel_long atomic_cmpset_barr_long /* Operations on 8-bit bytes. */ #define atomic_set_8 atomic_set_char ==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 (text+ko) ==== @@ -1821,6 +1821,12 @@ #endif #ifdef _KERNEL + if (needfree) + return (1); + if (arc_size > arc_c_max) + return (1); + if (arc_size <= arc_c_min) + return (0); /* * If pages are needed or we're within 2048 pages @@ -1829,9 +1835,6 @@ if (vm_pages_needed || (vm_paging_target() > -2048)) return (1); - if (needfree) - return (1); - #if 0 /* * take 'desfree' extra pages, so we reclaim sooner, rather than later ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#4 (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/i386/include/atomic.h,v 1.51 2008/12/06 21:33:44 kib Exp $ + * $FreeBSD: src/sys/i386/include/atomic.h,v 1.52 2009/10/06 13:45:49 attilio Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -73,9 +73,11 @@ */ #if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM) #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ -void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) +void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \ +void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v) int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); +int atomic_cmpset_barr_int(volatile u_int *dst, u_int exp, u_int src); u_int atomic_fetchadd_int(volatile u_int *p, u_int v); #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ @@ -95,8 +97,9 @@ #endif /* - * The assembly is volatilized to demark potential before-and-after side - * effects if an interrupt or SMP collision were to occur. + * The assembly is volatilized to avoid code chunk removal by the compiler. + * GCC aggressively reorders operations and memory clobbering is necessary + * in order to avoid that for memory barriers. */ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ static __inline void \ @@ -106,6 +109,15 @@ : "=m" (*p) \ : CONS (V), "m" (*p)); \ } \ + \ +static __inline void \ +atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + __asm __volatile(MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p) \ + : "memory"); \ +} \ struct __hack /* @@ -168,6 +180,8 @@ #endif /* CPU_DISABLE_CMPXCHG */ +#define atomic_cmpset_barr_int atomic_cmpset_int + /* * Atomically add the value of v to the integer pointed to by p and return * the previous value of *p. @@ -194,18 +208,23 @@ * PentiumPro or higher, reads may pass writes, so for that case we have * to use a serializing instruction (i.e. with LOCK) to do the load in * SMP kernels. For UP kernels, however, the cache of the single processor - * is always consistent, so we don't need any memory barriers. + * is always consistent, so we only need to take care of compiler. */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ - return (*p); \ + u_##TYPE tmp; \ + \ + tmp = *p; \ + __asm __volatile("" : : : "memory"); \ + return (tmp); \ } \ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ + __asm __volatile("" : : : "memory"); \ *p = v; \ } \ struct __hack @@ -236,7 +255,8 @@ __asm __volatile(SOP \ : "=m" (*p), /* 0 */ \ "+r" (v) /* 1 */ \ - : "m" (*p)); /* 2 */ \ + : "m" (*p) /* 2 */ \ + : "memory"); \ } \ struct __hack @@ -282,6 +302,14 @@ (u_int)src)); } +static __inline int +atomic_cmpset_barr_long(volatile u_long *dst, u_long exp, u_long src) +{ + + return (atomic_cmpset_barr_int((volatile u_int *)dst, (u_int)exp, + (u_int)src)); +} + static __inline u_long atomic_fetchadd_long(volatile u_long *p, u_long v) { @@ -331,46 +359,45 @@ #endif /* __GNUCLIKE_ASM */ -/* Acquire and release variants are identical to the normal ones. */ -#define atomic_set_acq_char atomic_set_char -#define atomic_set_rel_char atomic_set_char -#define atomic_clear_acq_char atomic_clear_char -#define atomic_clear_rel_char atomic_clear_char -#define atomic_add_acq_char atomic_add_char -#define atomic_add_rel_char atomic_add_char -#define atomic_subtract_acq_char atomic_subtract_char -#define atomic_subtract_rel_char atomic_subtract_char +#define atomic_set_acq_char atomic_set_barr_char +#define atomic_set_rel_char atomic_set_barr_char +#define atomic_clear_acq_char atomic_clear_barr_char +#define atomic_clear_rel_char atomic_clear_barr_char +#define atomic_add_acq_char atomic_add_barr_char +#define atomic_add_rel_char atomic_add_barr_char +#define atomic_subtract_acq_char atomic_subtract_barr_char +#define atomic_subtract_rel_char atomic_subtract_barr_char -#define atomic_set_acq_short atomic_set_short -#define atomic_set_rel_short atomic_set_short -#define atomic_clear_acq_short atomic_clear_short -#define atomic_clear_rel_short atomic_clear_short -#define atomic_add_acq_short atomic_add_short -#define atomic_add_rel_short atomic_add_short -#define atomic_subtract_acq_short atomic_subtract_short -#define atomic_subtract_rel_short atomic_subtract_short +#define atomic_set_acq_short atomic_set_barr_short +#define atomic_set_rel_short atomic_set_barr_short +#define atomic_clear_acq_short atomic_clear_barr_short +#define atomic_clear_rel_short atomic_clear_barr_short +#define atomic_add_acq_short atomic_add_barr_short +#define atomic_add_rel_short atomic_add_barr_short +#define atomic_subtract_acq_short atomic_subtract_barr_short +#define atomic_subtract_rel_short atomic_subtract_barr_short -#define atomic_set_acq_int atomic_set_int -#define atomic_set_rel_int atomic_set_int -#define atomic_clear_acq_int atomic_clear_int -#define atomic_clear_rel_int atomic_clear_int -#define atomic_add_acq_int atomic_add_int -#define atomic_add_rel_int atomic_add_int -#define atomic_subtract_acq_int atomic_subtract_int -#define atomic_subtract_rel_int atomic_subtract_int -#define atomic_cmpset_acq_int atomic_cmpset_int -#define atomic_cmpset_rel_int atomic_cmpset_int +#define atomic_set_acq_int atomic_set_barr_int +#define atomic_set_rel_int atomic_set_barr_int +#define atomic_clear_acq_int atomic_clear_barr_int +#define atomic_clear_rel_int atomic_clear_barr_int +#define atomic_add_acq_int atomic_add_barr_int +#define atomic_add_rel_int atomic_add_barr_int +#define atomic_subtract_acq_int atomic_subtract_barr_int +#define atomic_subtract_rel_int atomic_subtract_barr_int +#define atomic_cmpset_acq_int atomic_cmpset_barr_int +#define atomic_cmpset_rel_int atomic_cmpset_barr_int -#define atomic_set_acq_long atomic_set_long -#define atomic_set_rel_long atomic_set_long -#define atomic_clear_acq_long atomic_clear_long -#define atomic_clear_rel_long atomic_clear_long -#define atomic_add_acq_long atomic_add_long -#define atomic_add_rel_long atomic_add_long -#define atomic_subtract_acq_long atomic_subtract_long -#define atomic_subtract_rel_long atomic_subtract_long -#define atomic_cmpset_acq_long atomic_cmpset_long -#define atomic_cmpset_rel_long atomic_cmpset_long +#define atomic_set_acq_long atomic_set_barr_long +#define atomic_set_rel_long atomic_set_barr_long +#define atomic_clear_acq_long atomic_clear_barr_long +#define atomic_clear_rel_long atomic_clear_barr_long +#define atomic_add_acq_long atomic_add_barr_long +#define atomic_add_rel_long atomic_add_barr_long +#define atomic_subtract_acq_long atomic_subtract_barr_long +#define atomic_subtract_rel_long atomic_subtract_barr_long +#define atomic_cmpset_acq_long atomic_cmpset_barr_long +#define atomic_cmpset_rel_long atomic_cmpset_barr_long /* Operations on 8-bit bytes. */ #define atomic_set_8 atomic_set_char ==== //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.412 2009/10/05 22:24:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.413 2009/10/06 20:35:41 rwatson Exp $"); #include "opt_ipfw.h" /* for ipfw_fwd */ #include "opt_inet.h" @@ -180,26 +180,6 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, read_locking, CTLFLAG_RW, &tcp_read_locking, 0, "Enable read locking strategy"); -int tcp_rlock_atfirst; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, rlock_atfirst, CTLFLAG_RD, - &tcp_rlock_atfirst, 0, ""); - -int tcp_wlock_atfirst; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_wlock_atfirst, CTLFLAG_RD, - &tcp_wlock_atfirst, 0, ""); - -int tcp_wlock_upgraded; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, wlock_upgraded, CTLFLAG_RD, - &tcp_wlock_upgraded, 0, ""); - -int tcp_wlock_relocked; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, wlock_relocked, CTLFLAG_RD, - &tcp_wlock_relocked, 0, ""); - -int tcp_wlock_looped; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, wlock_looped, CTLFLAG_RD, - &tcp_wlock_looped, 0, ""); - VNET_DEFINE(struct inpcbhead, tcb); VNET_DEFINE(struct inpcbinfo, tcbinfo); #define tcb6 tcb /* for KAME src sync over BSD*'s */ @@ -505,11 +485,9 @@ tcp_read_locking == 0) { INP_INFO_WLOCK(&V_tcbinfo); ti_locked = TI_WLOCKED; - tcp_wlock_atfirst++; } else { INP_INFO_RLOCK(&V_tcbinfo); ti_locked = TI_RLOCKED; - tcp_rlock_atfirst++; } findpcb: @@ -662,15 +640,11 @@ ti_locked = TI_WLOCKED; INP_WLOCK(inp); if (in_pcbrele(inp)) { - tcp_wlock_looped++; inp = NULL; goto findpcb; } - tcp_wlock_relocked++; - } else { + } else ti_locked = TI_WLOCKED; - tcp_wlock_upgraded++; - } } INP_INFO_WLOCK_ASSERT(&V_tcbinfo); @@ -717,16 +691,12 @@ ti_locked = TI_WLOCKED; INP_WLOCK(inp); if (in_pcbrele(inp)) { - tcp_wlock_looped++; inp = NULL; goto findpcb; } - tcp_wlock_relocked++; goto relocked; - } else { + } else ti_locked = TI_WLOCKED; - tcp_wlock_upgraded++; - } } INP_INFO_WLOCK_ASSERT(&V_tcbinfo); } From rwatson at FreeBSD.org Wed Oct 7 14:10:43 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Oct 7 14:10:50 2009 Subject: PERFORCE change 169291 for review Message-ID: <200910071410.n97EAgYC076243@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169291 Change 169291 by rwatson@rwatson_cinnamon on 2009/10/07 14:10:37 Integrate TrustedBSD capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/cdcontrol/cdcontrol.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-tcp.c#3 (text+ko) ==== @@ -124,6 +124,7 @@ { TCPOPT_CCECHO, "" }, { TCPOPT_SIGNATURE, "md5" }, { TCPOPT_AUTH, "enhanced auth" }, + { TCPOPT_UTO, "uto" }, { 0, NULL } }; @@ -613,6 +614,17 @@ */ break; + case TCPOPT_UTO: + datalen = 2; + LENCHECK(datalen); + uint utoval = EXTRACT_16BITS(cp); + if (utoval & 0x0001) + utoval = (utoval >> 1) * 60; + else + utoval >>= 1; + (void)printf(" %u", utoval); + break; + default: datalen = len - 2; for (i = 0; i < datalen; ++i) { ==== //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcp.h#3 (text+ko) ==== @@ -83,6 +83,8 @@ #define TCPOLEN_SIGNATURE 18 #define TCP_SIGLEN 16 /* length of an option 19 digest */ #define TCPOPT_AUTH 20 /* Enhanced AUTH option */ +#define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */ +#define TCPOLEN_UTO 4 #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) ==== //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#4 (text+ko) ==== @@ -29,14 +29,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bge.4,v 1.35 2009/05/19 17:17:53 joel Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.36 2009/10/07 13:25:24 stas Exp $ .\" -.Dd May 19, 2009 +.Dd Oct 7, 2009 .Dt BGE 4 .Os .Sh NAME .Nm bge -.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver" +.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,8 +56,8 @@ The .Nm driver provides support for various NICs based on the Broadcom BCM570x, -5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet -controller chips. +5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families +of Gigabit Ethernet controller chips. .Pp All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5 copper cable, except for the SysKonnect SK-9D41 which supports only ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#5 (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/amd64/include/atomic.h,v 1.47 2009/10/06 13:45:49 attilio Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.48 2009/10/06 23:48:28 attilio Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -32,9 +32,9 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define mb() __asm__ __volatile__ ("mfence;": : :"memory") -#define wmb() __asm__ __volatile__ ("sfence;": : :"memory") -#define rmb() __asm__ __volatile__ ("lfence;": : :"memory") +#define mb() __asm __volatile("mfence;" : : : "memory") +#define wmb() __asm __volatile("sfence;" : : : "memory") +#define rmb() __asm __volatile("lfence;" : : : "memory") /* * Various simple operations on memory, each of which is atomic in the @@ -131,50 +131,33 @@ * Returns 0 on failure, non-zero on success */ -static __inline int -atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) -{ - u_char res; +#define DEFINE_CMPSET_GEN(NAME, TYPE, OP) \ +static __inline int \ +atomic_cmpset_##NAME(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ +{ \ + u_char res; \ + \ + __asm __volatile( \ + " " MPLOCKED " " \ + " " OP " %2,%1 ; " \ + " sete %0 ; " \ + "1: " \ + "# atomic_cmpset_##NAME" \ + : "=a" (res), /* 0 */ \ + "=m" (*dst) /* 1 */ \ + : "r" (src), /* 2 */ \ + "a" (exp), /* 3 */ \ + "m" (*dst) /* 4 */ \ + : "memory"); \ + \ + return (res); \ +} \ +struct __hack - __asm __volatile( - " " MPLOCKED " " - " cmpxchgl %2,%1 ; " - " sete %0 ; " - "1: " - "# atomic_cmpset_int" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); - - return (res); -} - -static __inline int -atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) -{ - u_char res; - - __asm __volatile( - " " MPLOCKED " " - " cmpxchgq %2,%1 ; " - " sete %0 ; " - "1: " - "# atomic_cmpset_long" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); - - return (res); -} - -#define atomic_cmpset_barr_int atomic_cmpset_int -#define atomic_cmpset_barr_long atomic_cmpset_long +DEFINE_CMPSET_GEN(int, int, "cmpxchgl"); +DEFINE_CMPSET_GEN(long, long, "cmpxchgq"); +DEFINE_CMPSET_GEN(barr_int, int, "cmpxchgl"); +DEFINE_CMPSET_GEN(barr_long, long, "cmpxchgq"); /* * Atomically add the value of v to the integer pointed to by p and return ==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 (text+ko) ==== @@ -2538,6 +2538,7 @@ vattr_t oldva; uint_t mask = vap->va_mask; uint_t saved_mask; + uint64_t saved_mode; int trim_mask = 0; uint64_t new_mode; znode_t *attrzp; @@ -2766,6 +2767,13 @@ if (trim_mask) { saved_mask = vap->va_mask; vap->va_mask &= ~trim_mask; + if (trim_mask & AT_MODE) { + /* + * Save the mode, as secpolicy_vnode_setattr() + * will overwrite it with ova.va_mode. + */ + saved_mode = vap->va_mode; + } } err = secpolicy_vnode_setattr(cr, vp, vap, &oldva, flags, (int (*)(void *, int, cred_t *))zfs_zaccess_unix, zp); @@ -2774,8 +2782,16 @@ return (err); } - if (trim_mask) + if (trim_mask) { vap->va_mask |= saved_mask; + if (trim_mask & AT_MODE) { + /* + * Recover the mode after + * secpolicy_vnode_setattr(). + */ + vap->va_mode = saved_mode; + } + } } /* ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.227 2009/08/18 21:07:39 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.228 2009/10/07 13:12:43 stas Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -170,6 +170,7 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5720 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5721 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5722 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5723 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5750 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5750M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5751 }, @@ -184,12 +185,21 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5754M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5755 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5755M }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761E }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761S }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761SE }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5764 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5780 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5780S }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5781 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5782 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5784 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5785F }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5785G }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5786 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5787 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5787F }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5787M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5788 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5789 }, @@ -198,11 +208,19 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5903M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5906 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5906M }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57760 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57780 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57788 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57790 }, { SK_VENDORID, SK_DEVICEID_ALTIMA }, { TC_VENDORID, TC_DEVICEID_3C996 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE4 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE5 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PP250450 }, + { 0, 0 } }; @@ -216,6 +234,7 @@ { BCOM_VENDORID, "Broadcom" }, { SK_VENDORID, "SysKonnect" }, { TC_VENDORID, "3Com" }, + { FJTSU_VENDORID, "Fujitsu" }, { 0, NULL } }; @@ -271,12 +290,18 @@ { BGE_CHIPID_BCM5755_A1, "BCM5755 A1" }, { BGE_CHIPID_BCM5755_A2, "BCM5755 A2" }, { BGE_CHIPID_BCM5722_A0, "BCM5722 A0" }, + { BGE_CHIPID_BCM5761_A0, "BCM5761 A0" }, + { BGE_CHIPID_BCM5761_A1, "BCM5761 A1" }, + { BGE_CHIPID_BCM5784_A0, "BCM5784 A0" }, + { BGE_CHIPID_BCM5784_A1, "BCM5784 A1" }, /* 5754 and 5787 share the same ASIC ID */ { BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" }, { BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" }, { BGE_CHIPID_BCM5787_A2, "BCM5754/5787 A2" }, { BGE_CHIPID_BCM5906_A1, "BCM5906 A1" }, { BGE_CHIPID_BCM5906_A2, "BCM5906 A2" }, + { BGE_CHIPID_BCM57780_A0, "BCM57780 A0" }, + { BGE_CHIPID_BCM57780_A1, "BCM57780 A1" }, { 0, NULL } }; @@ -297,9 +322,13 @@ { BGE_ASICREV_BCM5780, "unknown BCM5780" }, { BGE_ASICREV_BCM5714, "unknown BCM5714" }, { BGE_ASICREV_BCM5755, "unknown BCM5755" }, + { BGE_ASICREV_BCM5761, "unknown BCM5761" }, + { BGE_ASICREV_BCM5784, "unknown BCM5784" }, + { BGE_ASICREV_BCM5785, "unknown BCM5785" }, /* 5754 and 5787 share the same ASIC ID */ { BGE_ASICREV_BCM5787, "unknown BCM5754/5787" }, { BGE_ASICREV_BCM5906, "unknown BCM5906" }, + { BGE_ASICREV_BCM57780, "unknown BCM57780" }, { 0, NULL } }; @@ -309,6 +338,7 @@ #define BGE_IS_5705_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS) #define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY) #define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS) +#define BGE_IS_5755_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5755_PLUS) const struct bge_revision * bge_lookup_rev(uint32_t); const struct bge_vendor * bge_lookup_vendor(uint16_t); @@ -1758,8 +1788,7 @@ val = BGE_WDMAMODE_ENABLE | BGE_WDMAMODE_ALL_ATTNS; /* Enable host coalescing bug fix. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5755 || - sc->bge_asicrev == BGE_ASICREV_BCM5787) + if (BGE_IS_5755_PLUS(sc)) val |= 1 << 29; /* Turn on write DMA state machine */ @@ -1768,6 +1797,12 @@ /* Turn on read DMA state machine */ val = BGE_RDMAMODE_ENABLE | BGE_RDMAMODE_ALL_ATTNS; + if (sc->bge_asicrev == BGE_ASICREV_BCM5784 || + sc->bge_asicrev == BGE_ASICREV_BCM5785 || + sc->bge_asicrev == BGE_ASICREV_BCM57780) + val |= BGE_RDMAMODE_BD_SBD_CRPT_ATTN | + BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN | + BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN; if (sc->bge_flags & BGE_FLAG_PCIE) val |= BGE_RDMAMODE_FIFO_LONG_BURST; CSR_WRITE_4(sc, BGE_RDMA_MODE, val); @@ -1790,7 +1825,10 @@ CSR_WRITE_4(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE); /* Turn on send data completion state machine */ - CSR_WRITE_4(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE); + val = BGE_SDCMODE_ENABLE; + if (sc->bge_asicrev == BGE_ASICREV_BCM5761) + val |= BGE_SDCMODE_CDELAY; + CSR_WRITE_4(sc, BGE_SDC_MODE, val); /* Turn on send data initiator state machine */ CSR_WRITE_4(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE); @@ -1897,8 +1935,11 @@ const struct bge_vendor *v; uint32_t id; - id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & - BGE_PCIMISCCTL_ASICREV; + id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >> + BGE_PCIMISCCTL_ASICREV_SHIFT; + if (BGE_ASICREV(id) == BGE_ASICREV_USE_PRODID_REG) + id = pci_read_config(dev, + BGE_PCI_PRODID_ASICREV, 4); br = bge_lookup_rev(id); v = bge_lookup_vendor(vid); { @@ -1915,8 +1956,8 @@ br != NULL ? br->br_name : "NetXtreme Ethernet Controller"); } - snprintf(buf, 96, "%s, %sASIC rev. %#04x", model, - br != NULL ? "" : "unknown ", id >> 16); + snprintf(buf, 96, "%s, %sASIC rev. %#08x", model, + br != NULL ? "" : "unknown ", id); device_set_desc_copy(dev, buf); if (pci_get_subvendor(dev) == DELL_VENDORID) sc->bge_flags |= BGE_FLAG_NO_3LED; @@ -2411,8 +2452,11 @@ /* Save various chip information. */ sc->bge_chipid = - pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & - BGE_PCIMISCCTL_ASICREV; + pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >> + BGE_PCIMISCCTL_ASICREV_SHIFT; + if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_USE_PRODID_REG) + sc->bge_chipid = pci_read_config(dev, BGE_PCI_PRODID_ASICREV, + 4); sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid); sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid); @@ -2431,6 +2475,15 @@ /* Save chipset family. */ switch (sc->bge_asicrev) { + case BGE_ASICREV_BCM5755: + case BGE_ASICREV_BCM5761: + case BGE_ASICREV_BCM5784: + case BGE_ASICREV_BCM5785: + case BGE_ASICREV_BCM5787: + case BGE_ASICREV_BCM57780: + sc->bge_flags |= BGE_FLAG_5755_PLUS | BGE_FLAG_575X_PLUS | + BGE_FLAG_5705_PLUS; + break; case BGE_ASICREV_BCM5700: case BGE_ASICREV_BCM5701: case BGE_ASICREV_BCM5703: @@ -2444,8 +2497,6 @@ /* FALLTHROUGH */ case BGE_ASICREV_BCM5750: case BGE_ASICREV_BCM5752: - case BGE_ASICREV_BCM5755: - case BGE_ASICREV_BCM5787: case BGE_ASICREV_BCM5906: sc->bge_flags |= BGE_FLAG_575X_PLUS; /* FALLTHROUGH */ @@ -2466,6 +2517,8 @@ if (BGE_IS_5705_PLUS(sc) && !(sc->bge_flags & BGE_FLAG_ADJUST_TRIM)) { if (sc->bge_asicrev == BGE_ASICREV_BCM5755 || + sc->bge_asicrev == BGE_ASICREV_BCM5761 || + sc->bge_asicrev == BGE_ASICREV_BCM5784 || sc->bge_asicrev == BGE_ASICREV_BCM5787) { if (sc->bge_chipid != BGE_CHIPID_BCM5722_A0) sc->bge_flags |= BGE_FLAG_JITTER_BUG; @@ -2873,8 +2926,7 @@ /* Disable fastboot on controllers that support it. */ if (sc->bge_asicrev == BGE_ASICREV_BCM5752 || - sc->bge_asicrev == BGE_ASICREV_BCM5755 || - sc->bge_asicrev == BGE_ASICREV_BCM5787) { + BGE_IS_5755_PLUS(sc)) { if (bootverbose) device_printf(sc->bge_dev, "Disabling fastboot\n"); CSR_WRITE_4(sc, BGE_FASTBOOT_PC, 0x0); @@ -4689,6 +4741,8 @@ } printf("Hardware Flags:\n"); + if (BGE_IS_5755_PLUS(sc)) + printf(" - 5755 Plus\n"); if (BGE_IS_575X_PLUS(sc)) printf(" - 575X Plus\n"); if (BGE_IS_5705_PLUS(sc)) ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.83 2009/03/23 14:36:50 marius Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.84 2009/10/07 13:12:43 stas Exp $ */ /* @@ -218,6 +218,7 @@ #define BGE_PCI_UNDI_TX_BD_PRODIDX_LO 0xAC #define BGE_PCI_ISR_MBX_HI 0xB0 #define BGE_PCI_ISR_MBX_LO 0xB4 +#define BGE_PCI_PRODID_ASICREV 0xBC /* PCI Misc. Host control register */ #define BGE_PCIMISCCTL_CLEAR_INTA 0x00000001 @@ -229,6 +230,7 @@ #define BGE_PCIMISCCTL_REG_WORDSWAP 0x00000040 #define BGE_PCIMISCCTL_INDIRECT_ACCESS 0x00000080 #define BGE_PCIMISCCTL_ASICREV 0xFFFF0000 +#define BGE_PCIMISCCTL_ASICREV_SHIFT 16 #define BGE_HIF_SWAP_OPTIONS (BGE_PCIMISCCTL_ENDIAN_WORDSWAP) #if BYTE_ORDER == LITTLE_ENDIAN @@ -245,66 +247,72 @@ (BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_CLEAR_INTA| \ BGE_PCIMISCCTL_MASK_PCI_INTR|BGE_PCIMISCCTL_INDIRECT_ACCESS) -#define BGE_CHIPID_TIGON_I 0x40000000 -#define BGE_CHIPID_TIGON_II 0x60000000 -#define BGE_CHIPID_BCM5700_A0 0x70000000 -#define BGE_CHIPID_BCM5700_A1 0x70010000 -#define BGE_CHIPID_BCM5700_B0 0x71000000 -#define BGE_CHIPID_BCM5700_B1 0x71010000 -#define BGE_CHIPID_BCM5700_B2 0x71020000 -#define BGE_CHIPID_BCM5700_B3 0x71030000 -#define BGE_CHIPID_BCM5700_ALTIMA 0x71040000 -#define BGE_CHIPID_BCM5700_C0 0x72000000 -#define BGE_CHIPID_BCM5701_A0 0x00000000 /* grrrr */ -#define BGE_CHIPID_BCM5701_B0 0x01000000 -#define BGE_CHIPID_BCM5701_B2 0x01020000 -#define BGE_CHIPID_BCM5701_B5 0x01050000 -#define BGE_CHIPID_BCM5703_A0 0x10000000 -#define BGE_CHIPID_BCM5703_A1 0x10010000 -#define BGE_CHIPID_BCM5703_A2 0x10020000 -#define BGE_CHIPID_BCM5703_A3 0x10030000 -#define BGE_CHIPID_BCM5703_B0 0x11000000 -#define BGE_CHIPID_BCM5704_A0 0x20000000 -#define BGE_CHIPID_BCM5704_A1 0x20010000 -#define BGE_CHIPID_BCM5704_A2 0x20020000 -#define BGE_CHIPID_BCM5704_A3 0x20030000 -#define BGE_CHIPID_BCM5704_B0 0x21000000 -#define BGE_CHIPID_BCM5705_A0 0x30000000 -#define BGE_CHIPID_BCM5705_A1 0x30010000 -#define BGE_CHIPID_BCM5705_A2 0x30020000 -#define BGE_CHIPID_BCM5705_A3 0x30030000 -#define BGE_CHIPID_BCM5750_A0 0x40000000 -#define BGE_CHIPID_BCM5750_A1 0x40010000 -#define BGE_CHIPID_BCM5750_A3 0x40030000 -#define BGE_CHIPID_BCM5750_B0 0x41000000 -#define BGE_CHIPID_BCM5750_B1 0x41010000 -#define BGE_CHIPID_BCM5750_C0 0x42000000 -#define BGE_CHIPID_BCM5750_C1 0x42010000 -#define BGE_CHIPID_BCM5750_C2 0x42020000 -#define BGE_CHIPID_BCM5714_A0 0x50000000 -#define BGE_CHIPID_BCM5752_A0 0x60000000 -#define BGE_CHIPID_BCM5752_A1 0x60010000 -#define BGE_CHIPID_BCM5752_A2 0x60020000 -#define BGE_CHIPID_BCM5714_B0 0x80000000 -#define BGE_CHIPID_BCM5714_B3 0x80030000 -#define BGE_CHIPID_BCM5715_A0 0x90000000 -#define BGE_CHIPID_BCM5715_A1 0x90010000 -#define BGE_CHIPID_BCM5715_A3 0x90030000 -#define BGE_CHIPID_BCM5755_A0 0xa0000000 -#define BGE_CHIPID_BCM5755_A1 0xa0010000 -#define BGE_CHIPID_BCM5755_A2 0xa0020000 -#define BGE_CHIPID_BCM5722_A0 0xa2000000 -#define BGE_CHIPID_BCM5754_A0 0xb0000000 -#define BGE_CHIPID_BCM5754_A1 0xb0010000 -#define BGE_CHIPID_BCM5754_A2 0xb0020000 -#define BGE_CHIPID_BCM5787_A0 0xb0000000 -#define BGE_CHIPID_BCM5787_A1 0xb0010000 -#define BGE_CHIPID_BCM5787_A2 0xb0020000 -#define BGE_CHIPID_BCM5906_A1 0xc0010000 -#define BGE_CHIPID_BCM5906_A2 0xc0020000 +#define BGE_CHIPID_TIGON_I 0x4000 +#define BGE_CHIPID_TIGON_II 0x6000 +#define BGE_CHIPID_BCM5700_A0 0x7000 +#define BGE_CHIPID_BCM5700_A1 0x7001 +#define BGE_CHIPID_BCM5700_B0 0x7100 +#define BGE_CHIPID_BCM5700_B1 0x7101 +#define BGE_CHIPID_BCM5700_B2 0x7102 +#define BGE_CHIPID_BCM5700_B3 0x7103 +#define BGE_CHIPID_BCM5700_ALTIMA 0x7104 +#define BGE_CHIPID_BCM5700_C0 0x7200 +#define BGE_CHIPID_BCM5701_A0 0x0000 /* grrrr */ +#define BGE_CHIPID_BCM5701_B0 0x0100 +#define BGE_CHIPID_BCM5701_B2 0x0102 +#define BGE_CHIPID_BCM5701_B5 0x0105 +#define BGE_CHIPID_BCM5703_A0 0x1000 +#define BGE_CHIPID_BCM5703_A1 0x1001 +#define BGE_CHIPID_BCM5703_A2 0x1002 +#define BGE_CHIPID_BCM5703_A3 0x1003 +#define BGE_CHIPID_BCM5703_B0 0x1100 +#define BGE_CHIPID_BCM5704_A0 0x2000 +#define BGE_CHIPID_BCM5704_A1 0x2001 +#define BGE_CHIPID_BCM5704_A2 0x2002 +#define BGE_CHIPID_BCM5704_A3 0x2003 +#define BGE_CHIPID_BCM5704_B0 0x2100 +#define BGE_CHIPID_BCM5705_A0 0x3000 +#define BGE_CHIPID_BCM5705_A1 0x3001 +#define BGE_CHIPID_BCM5705_A2 0x3002 +#define BGE_CHIPID_BCM5705_A3 0x3003 +#define BGE_CHIPID_BCM5750_A0 0x4000 +#define BGE_CHIPID_BCM5750_A1 0x4001 +#define BGE_CHIPID_BCM5750_A3 0x4000 +#define BGE_CHIPID_BCM5750_B0 0x4100 +#define BGE_CHIPID_BCM5750_B1 0x4101 +#define BGE_CHIPID_BCM5750_C0 0x4200 +#define BGE_CHIPID_BCM5750_C1 0x4201 +#define BGE_CHIPID_BCM5750_C2 0x4202 +#define BGE_CHIPID_BCM5714_A0 0x5000 +#define BGE_CHIPID_BCM5752_A0 0x6000 +#define BGE_CHIPID_BCM5752_A1 0x6001 +#define BGE_CHIPID_BCM5752_A2 0x6002 +#define BGE_CHIPID_BCM5714_B0 0x8000 +#define BGE_CHIPID_BCM5714_B3 0x8003 +#define BGE_CHIPID_BCM5715_A0 0x9000 +#define BGE_CHIPID_BCM5715_A1 0x9001 +#define BGE_CHIPID_BCM5715_A3 0x9003 +#define BGE_CHIPID_BCM5755_A0 0xa000 +#define BGE_CHIPID_BCM5755_A1 0xa001 +#define BGE_CHIPID_BCM5755_A2 0xa002 +#define BGE_CHIPID_BCM5722_A0 0xa200 +#define BGE_CHIPID_BCM5754_A0 0xb000 +#define BGE_CHIPID_BCM5754_A1 0xb001 +#define BGE_CHIPID_BCM5754_A2 0xb002 +#define BGE_CHIPID_BCM5761_A0 0x5761000 +#define BGE_CHIPID_BCM5761_A1 0x5761100 +#define BGE_CHIPID_BCM5784_A0 0x5784000 +#define BGE_CHIPID_BCM5784_A1 0x5784100 +#define BGE_CHIPID_BCM5787_A0 0xb000 +#define BGE_CHIPID_BCM5787_A1 0xb001 +#define BGE_CHIPID_BCM5787_A2 0xb002 +#define BGE_CHIPID_BCM5906_A1 0xc001 +#define BGE_CHIPID_BCM5906_A2 0xc002 +#define BGE_CHIPID_BCM57780_A0 0x57780000 +#define BGE_CHIPID_BCM57780_A1 0x57780001 /* shorthand one */ -#define BGE_ASICREV(x) ((x) >> 28) +#define BGE_ASICREV(x) ((x) >> 12) #define BGE_ASICREV_BCM5701 0x00 #define BGE_ASICREV_BCM5703 0x01 #define BGE_ASICREV_BCM5704 0x02 @@ -319,9 +327,16 @@ #define BGE_ASICREV_BCM5754 0x0b #define BGE_ASICREV_BCM5787 0x0b #define BGE_ASICREV_BCM5906 0x0c +/* Should consult BGE_PCI_PRODID_ASICREV for ChipID */ +#define BGE_ASICREV_USE_PRODID_REG 0x0f +/* BGE_PCI_PRODID_ASICREV ASIC rev. identifiers. */ +#define BGE_ASICREV_BCM5761 0x5761 +#define BGE_ASICREV_BCM5784 0x5784 +#define BGE_ASICREV_BCM5785 0x5785 +#define BGE_ASICREV_BCM57780 0x57780 /* chip revisions */ -#define BGE_CHIPREV(x) ((x) >> 24) +#define BGE_CHIPREV(x) ((x) >> 8) #define BGE_CHIPREV_5700_AX 0x70 #define BGE_CHIPREV_5700_BX 0x71 #define BGE_CHIPREV_5700_CX 0x72 @@ -331,6 +346,9 @@ #define BGE_CHIPREV_5704_BX 0x21 #define BGE_CHIPREV_5750_AX 0x40 #define BGE_CHIPREV_5750_BX 0x41 +/* BGE_PCI_PRODID_ASICREV chip rev. identifiers. */ +#define BGE_CHIPREV_5761_AX 0x57611 +#define BGE_CHIPREV_5784_AX 0x57841 /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF @@ -861,6 +879,7 @@ #define BGE_SDCMODE_RESET 0x00000001 #define BGE_SDCMODE_ENABLE 0x00000002 #define BGE_SDCMODE_ATTN 0x00000004 +#define BGE_SDCMODE_CDELAY 0x00000010 /* Send Data completion status register */ #define BGE_SDCSTAT_ATTN 0x00000004 @@ -1378,6 +1397,9 @@ #define BGE_RDMAMODE_PCI_FIFOOREAD_ATTN 0x00000100 #define BGE_RDMAMODE_LOCWRITE_TOOBIG 0x00000200 #define BGE_RDMAMODE_ALL_ATTNS 0x000003FC +#define BGE_RDMAMODE_BD_SBD_CRPT_ATTN 0x00000800 +#define BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN 0x00001000 +#define BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN 0x00002000 #define BGE_RDMAMODE_FIFO_SIZE_128 0x00020000 #define BGE_RDMAMODE_FIFO_LONG_BURST 0x00030000 @@ -2101,6 +2123,7 @@ #define BCOM_DEVICEID_BCM5720 0x1658 #define BCOM_DEVICEID_BCM5721 0x1659 #define BCOM_DEVICEID_BCM5722 0x165A +#define BCOM_DEVICEID_BCM5723 0x165B #define BCOM_DEVICEID_BCM5750 0x1676 #define BCOM_DEVICEID_BCM5750M 0x167C #define BCOM_DEVICEID_BCM5751 0x1677 @@ -2115,13 +2138,22 @@ #define BCOM_DEVICEID_BCM5754M 0x1672 #define BCOM_DEVICEID_BCM5755 0x167B #define BCOM_DEVICEID_BCM5755M 0x1673 +#define BCOM_DEVICEID_BCM5761 0x1681 +#define BCOM_DEVICEID_BCM5761E 0x1680 +#define BCOM_DEVICEID_BCM5761S 0x1688 +#define BCOM_DEVICEID_BCM5761SE 0x1689 +#define BCOM_DEVICEID_BCM5764 0x1684 #define BCOM_DEVICEID_BCM5780 0x166A #define BCOM_DEVICEID_BCM5780S 0x166B #define BCOM_DEVICEID_BCM5781 0x16DD #define BCOM_DEVICEID_BCM5782 0x1696 +#define BCOM_DEVICEID_BCM5784 0x1698 +#define BCOM_DEVICEID_BCM5785F 0x16a0 +#define BCOM_DEVICEID_BCM5785G 0x1699 #define BCOM_DEVICEID_BCM5786 0x169A #define BCOM_DEVICEID_BCM5787 0x169B #define BCOM_DEVICEID_BCM5787M 0x1693 +#define BCOM_DEVICEID_BCM5787F 0x167f #define BCOM_DEVICEID_BCM5788 0x169C #define BCOM_DEVICEID_BCM5789 0x169D #define BCOM_DEVICEID_BCM5901 0x170D @@ -2129,6 +2161,10 @@ #define BCOM_DEVICEID_BCM5903M 0x16FF #define BCOM_DEVICEID_BCM5906 0x1712 #define BCOM_DEVICEID_BCM5906M 0x1713 +#define BCOM_DEVICEID_BCM57760 0x1690 +#define BCOM_DEVICEID_BCM57780 0x1692 +#define BCOM_DEVICEID_BCM57788 0x1691 +#define BCOM_DEVICEID_BCM57790 0x1694 /* * Alteon AceNIC PCI vendor/device ID. @@ -2179,6 +2215,14 @@ #define SUN_VENDORID 0x108e /* + * Fujitsu vendor/device IDs + */ +#define FJTSU_VENDORID 0x10cf +#define FJTSU_DEVICEID_PW008GE5 0x11a1 +#define FJTSU_DEVICEID_PW008GE4 0x11a2 +#define FJTSU_DEVICEID_PP250450 0x11cc /* PRIMEPOWER250/450 LAN */ + +/* * Offset of MAC address inside EEPROM. */ #define BGE_EE_MAC_OFFSET 0x7C @@ -2558,6 +2602,7 @@ #define BGE_FLAG_5705_PLUS 0x00002000 #define BGE_FLAG_5714_FAMILY 0x00004000 #define BGE_FLAG_575X_PLUS 0x00008000 +#define BGE_FLAG_5755_PLUS 0x00010000 #define BGE_FLAG_RX_ALIGNBUG 0x00100000 #define BGE_FLAG_NO_3LED 0x00200000 #define BGE_FLAG_ADC_BUG 0x00400000 @@ -2568,8 +2613,8 @@ #define BGE_FLAG_CRC_BUG 0x08000000 #define BGE_FLAG_5788 0x20000000 uint32_t bge_chipid; - uint8_t bge_asicrev; - uint8_t bge_chiprev; + uint32_t bge_asicrev; + uint32_t bge_chiprev; uint8_t bge_asf_mode; uint8_t bge_asf_count; struct bge_ring_data bge_ldata; /* rings */ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#5 (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/i386/include/atomic.h,v 1.52 2009/10/06 13:45:49 attilio Exp $ + * $FreeBSD: src/sys/i386/include/atomic.h,v 1.53 2009/10/06 23:48:28 attilio Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -130,57 +130,62 @@ #ifdef CPU_DISABLE_CMPXCHG -static __inline int -atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) -{ - u_char res; - - __asm __volatile( - " pushfl ; " - " cli ; " - " cmpl %3,%4 ; " - " jne 1f ; " - " movl %2,%1 ; " - "1: " - " sete %0 ; " - " popfl ; " - "# atomic_cmpset_int" - : "=q" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "r" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); +#define DEFINE_CMPSET_GEN(NAME) \ +static __inline int \ +atomic_cmpset_##NAME(volatile u_int *dst, u_int exp, u_int src)\ +{ \ + u_char res; \ + \ + __asm __volatile( \ + " pushfl ; " \ + " cli ; " \ + " cmpl %3,%4 ; " \ + " jne 1f ; " \ + " movl %2,%1 ; " \ + "1: " \ + " sete %0 ; " \ + " popfl ; " \ + "# atomic_cmpset_##NAME" \ + : "=q" (res), /* 0 */ \ + "=m" (*dst) /* 1 */ \ + : "r" (src), /* 2 */ \ + "r" (exp), /* 3 */ \ + "m" (*dst) /* 4 */ \ + : "memory"); \ + \ + return (res); \ +} \ +struct __hack - return (res); -} - #else /* !CPU_DISABLE_CMPXCHG */ -static __inline int -atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) -{ - u_char res; - - __asm __volatile( - " " MPLOCKED " " - " cmpxchgl %2,%1 ; " - " sete %0 ; " - "1: " - "# atomic_cmpset_int" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); +#define DEFINE_CMPSET_GEN(NAME) \ +static __inline int \ +atomic_cmpset_##NAME(volatile u_int *dst, u_int exp, u_int src)\ +{ \ + u_char res; \ + \ + __asm __volatile( \ + " " MPLOCKED " " \ + " cmpxchgl %2,%1 ; " \ + " sete %0 ; " \ + "1: " \ + "# atomic_cmpset_##NAME" \ + : "=a" (res), /* 0 */ \ + "=m" (*dst) /* 1 */ \ + : "r" (src), /* 2 */ \ + "a" (exp), /* 3 */ \ + "m" (*dst) /* 4 */ \ + : "memory"); \ + \ + return (res); \ +} \ +struct __hack - return (res); -} - #endif /* CPU_DISABLE_CMPXCHG */ -#define atomic_cmpset_barr_int atomic_cmpset_int +DEFINE_CMPSET_GEN(int); +DEFINE_CMPSET_GEN(barr_int); /* * Atomically add the value of v to the integer pointed to by p and return ==== //depot/projects/trustedbsd/capabilities/src/usr.sbin/cdcontrol/cdcontrol.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.51 2008/07/14 13:22:09 gahr Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.52 2009/10/07 13:25:22 jh Exp $"); #include #include @@ -241,7 +241,7 @@ if (argc > 0) { char buf[80], *p; - int len; + int len, rc; for (p=buf; argc-->0; ++argv) { len = strlen (*argv); @@ -257,7 +257,11 @@ } *p = 0; arg = parse (buf, &cmd); - return (run (cmd, arg)); + rc = run (cmd, arg); + if (rc < 0 && verbose) + warn(NULL); + + return (rc); } if (verbose == 1) From rwatson at FreeBSD.org Wed Oct 7 14:15:48 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Oct 7 14:15:54 2009 Subject: PERFORCE change 169292 for review Message-ID: <200910071415.n97EFmD6076748@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169292 Change 169292 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:14:59 Following merge of basename_r to head, the symbol should have the new FBSD_1.2 symbol version. Also move other new symbols for capability stuff in libc. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#13 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#13 (text) ==== @@ -328,7 +328,6 @@ FBSD_1.1 { arc4random_buf; arc4random_uniform; - basename_r; fdevname; fdevname_r; fdopendir; @@ -341,8 +340,6 @@ fts_read; fts_set; fts_set_clientptr; - ld_caplibindex_lookup; - ld_insandbox; posix_spawn; posix_spawn_file_actions_addclose; posix_spawn_file_actions_adddup2; @@ -372,6 +369,8 @@ FBSD_1.2 { basename_r; getpagesizes; + ld_caplibindex_lookup; + ld_insandbox; }; FBSDprivate_1.0 { From rwatson at FreeBSD.org Wed Oct 7 14:19:53 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Oct 7 14:19:59 2009 Subject: PERFORCE change 169293 for review Message-ID: <200910071419.n97EJqHc076966@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169293 Change 169293 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:19:47 Document ENOTCAPABLE in errno(2). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#3 (text+ko) ==== @@ -456,6 +456,9 @@ .It Er 88 EDOOFUS Em "Programming error" . A function or API is being abused in a way which could only be detected at run-time. +.It Er 93 ENOTCAPABLE Em "Capabilities insufficient" . +An operation on a capability file descriptor requires greater privilege than +the capability allows. .El .Sh DEFINITIONS .Bl -tag -width Ds From rwatson at FreeBSD.org Wed Oct 7 14:34:09 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Wed Oct 7 14:34:15 2009 Subject: PERFORCE change 169295 for review Message-ID: <200910071434.n97EY8gG078038@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169295 Change 169295 by rwatson@rwatson_freebsd_capabilities on 2009/10/07 14:33:39 Integrate TrustedBSD capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.228 2009/10/07 13:12:43 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.229 2009/10/07 14:29:48 stas Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1789,7 +1789,7 @@ /* Enable host coalescing bug fix. */ if (BGE_IS_5755_PLUS(sc)) - val |= 1 << 29; + val |= BGE_WDMAMODE_STATUS_TAG_FIX; /* Turn on write DMA state machine */ CSR_WRITE_4(sc, BGE_WDMA_MODE, val); ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.84 2009/10/07 13:12:43 stas Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.85 2009/10/07 14:29:48 stas Exp $ */ /* @@ -1431,6 +1431,7 @@ #define BGE_WDMAMODE_PCI_FIFOOREAD_ATTN 0x00000100 #define BGE_WDMAMODE_LOCREAD_TOOBIG 0x00000200 #define BGE_WDMAMODE_ALL_ATTNS 0x000003FC +#define BGE_WDMAMODE_STATUS_TAG_FIX 0x20000000 /* Write DMA status register */ #define BGE_WDMASTAT_PCI_TGT_ABRT_ATTN 0x00000004 From yohanes at FreeBSD.org Wed Oct 7 15:37:20 2009 From: yohanes at FreeBSD.org (Yohanes Nugroho) Date: Wed Oct 7 15:37:28 2009 Subject: PERFORCE change 169297 for review Message-ID: <200910071537.n97FbHjB083804@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169297 Change 169297 by yohanes@econa on 2009/10/07 15:36:43 update source Affected files ... .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#6 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/csjp.key#1 branch .. //depot/projects/str91xx/doc/share/pgpkeys/gahr.key#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/jh.key#1 branch .. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys-developers.sgml#5 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys.ent#5 integrate .. //depot/projects/str91xx/ports/KNOBS#4 integrate .. //depot/projects/str91xx/ports/MOVED#9 integrate .. //depot/projects/str91xx/ports/Tools/scripts/rmport#2 integrate .. //depot/projects/str91xx/src/bin/sh/eval.c#6 integrate .. //depot/projects/str91xx/src/bin/sh/exec.c#5 integrate .. //depot/projects/str91xx/src/bin/sh/parser.c#3 integrate .. //depot/projects/str91xx/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/str91xx/src/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/str91xx/src/contrib/tcsh/sh.c#3 integrate .. //depot/projects/str91xx/src/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/README#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/README.platform#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth1.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/auth2.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/canohost.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/canohost.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/channels.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/config.h#3 integrate .. //depot/projects/str91xx/src/crypto/openssh/config.h.in#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/defines.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/includes.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/jpake.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/jpake.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/kex.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/kex.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/monitor.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/packet.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/packet.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/readconf.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/readconf.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/roaming.h#1 branch .. //depot/projects/str91xx/src/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/str91xx/src/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/str91xx/src/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/schnorr.h#1 branch .. //depot/projects/str91xx/src/crypto/openssh/servconf.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/session.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh.1#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh_config#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh_namespace.h#3 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshd.8#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshd.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshd_config#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/version.h#2 integrate .. //depot/projects/str91xx/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/str91xx/src/etc/network.subr#6 integrate .. //depot/projects/str91xx/src/etc/pam.d/ftpd#2 integrate .. //depot/projects/str91xx/src/etc/pam.d/kde#2 integrate .. //depot/projects/str91xx/src/etc/pam.d/other#2 integrate .. //depot/projects/str91xx/src/etc/pam.d/sshd#2 integrate .. //depot/projects/str91xx/src/etc/pam.d/system#2 integrate .. //depot/projects/str91xx/src/etc/pam.d/telnetd#2 integrate .. //depot/projects/str91xx/src/etc/pam.d/xdm#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/defaultroute#4 integrate .. //depot/projects/str91xx/src/etc/rc.d/faith#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#4 integrate .. //depot/projects/str91xx/src/etc/rc.d/netoptions#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/routing#4 integrate .. //depot/projects/str91xx/src/etc/rc.d/static_arp#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/stf#2 integrate .. //depot/projects/str91xx/src/etc/rc.subr#5 integrate .. //depot/projects/str91xx/src/etc/services#2 integrate .. //depot/projects/str91xx/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/str91xx/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/str91xx/src/include/langinfo.h#2 integrate .. //depot/projects/str91xx/src/include/libgen.h#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/str91xx/src/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/str91xx/src/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/basename.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/nl_langinfo.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/str91xx/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/libpmc/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/libradius/radlib.c#3 integrate .. //depot/projects/str91xx/src/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/str91xx/src/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/str91xx/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/str91xx/src/secure/libexec/sftp-server/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/scp/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/ssh-add/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/ssh-agent/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/str91xx/src/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man4/de.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/unix.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/urtw.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/zyd.4#2 integrate .. //depot/projects/str91xx/src/share/man/man9/Makefile#6 integrate .. //depot/projects/str91xx/src/share/man/man9/fetch.9#2 integrate .. //depot/projects/str91xx/src/share/man/man9/store.9#2 integrate .. //depot/projects/str91xx/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/str91xx/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/str91xx/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/str91xx/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/str91xx/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/str91xx/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/str91xx/src/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/str91xx/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/str91xx/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/str91xx/src/sys/conf/files#8 integrate .. //depot/projects/str91xx/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_acad.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/str91xx/src/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_create.c#3 integrate .. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/str91xx/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/str91xx/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/str91xx/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/init_main.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/str91xx/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/str91xx/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/str91xx/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/net/flowtable.c#4 integrate .. //depot/projects/str91xx/src/sys/net/flowtable.h#4 integrate .. //depot/projects/str91xx/src/sys/net/route.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/in.c#6 integrate .. //depot/projects/str91xx/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/str91xx/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/str91xx/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/str91xx/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/sys/pmc.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/sx.h#4 integrate .. //depot/projects/str91xx/src/sys/sys/syscall.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/str91xx/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/str91xx/src/sys/sys/vnode.h#5 integrate .. //depot/projects/str91xx/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/str91xx/src/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/str91xx/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/str91xx/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/str91xx/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch .. //depot/projects/str91xx/src/tools/regression/bin/sh/execution/unknown1.0#1 branch .. //depot/projects/str91xx/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/mmap/mmap.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch .. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch .. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch .. //depot/projects/str91xx/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch .. //depot/projects/str91xx/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/str91xx/src/usr.bin/locale/locale.1#2 integrate .. //depot/projects/str91xx/src/usr.bin/locale/locale.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/main.c#3 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/whois/whois.1#2 integrate .. //depot/projects/str91xx/src/usr.bin/whois/whois.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate .. //depot/projects/str91xx/src/usr.sbin/lpr/lp/lp.sh#3 integrate .. //depot/projects/str91xx/www/de/platforms/sparc.sgml#2 integrate .. //depot/projects/str91xx/www/de/share/sgml/news.xml#6 integrate .. //depot/projects/str91xx/www/en/administration.sgml#3 integrate .. //depot/projects/str91xx/www/en/cgi/query-pr.cgi#2 integrate .. //depot/projects/str91xx/www/en/developers.sgml#5 integrate .. //depot/projects/str91xx/www/en/donations/donors.sgml#4 integrate .. //depot/projects/str91xx/www/en/news/status/Makefile#2 integrate .. //depot/projects/str91xx/www/en/news/status/report-2009-04-2009-09.xml#1 branch .. //depot/projects/str91xx/www/hu/share/sgml/news.xml#7 integrate .. //depot/projects/str91xx/www/it/share/sgml/l10n.ent#2 integrate .. //depot/projects/str91xx/www/share/sgml/advisories.xml#3 integrate .. //depot/projects/str91xx/www/share/sgml/news.xml#7 integrate .. //depot/projects/str91xx/www/share/sgml/notices.xml#3 integrate .. //depot/projects/str91xx/www/share/sgml/usergroups.xml#3 integrate Differences ... ==== //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.99 2009/06/13 20:35:13 bcr Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.747 2009/06/08 20:10:08 bcr Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.100 2009/10/07 10:19:09 bcr Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.748 2009/10/04 18:22:15 bcr Exp $ - basiert auf: 1.1116 + basiert auf: 1.1117 --> @@ -35,7 +35,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.747 2009/06/08 20:10:08 bcr Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.748 2009/10/04 18:22:15 bcr Exp $ 1995 @@ -368,12 +368,9 @@ - James Howards Artikel The - BSD Family Tree, der in DaemonNews - erschienen ist, beschreibt sehr gut die Geschichte und die - Unterschiede der BSD-Varianten. + James Howards Artikel, genannt The BSD Family Tree, beschreibt sehr gut die Geschichte + und die Unterschiede der BSD-Varianten. ==== //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.48 2008/03/26 19:02:44 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.134 2008/03/25 19:34:02 jkois Exp $ - basiert auf: 1.229 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.49 2009/10/07 10:19:10 bcr Exp $ + $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.142 2009/09/24 18:36:59 bcr Exp $ + basiert auf: 1.238 --> @@ -64,7 +64,8 @@ Die Grundlagen der Konfiguration mit rc.conf und des Systems zum Starten - von Anwendungen in /usr/local/etc/rc.d. + von Anwendungen in /usr/local/etc/rc.d. Wie Sie Netzwerkkarten konfigurieren und testen. @@ -75,7 +76,7 @@ Wie Sie die verschiedenen Konfigurationsdateien - in /etc benutzen. + in /etc benutzen. Wie Sie mit sysctl-Variablen &os; @@ -107,9 +108,12 @@ Layout von Partitionen Layout von Partitionen - /etc - /var - /usr + /etc + /var + /usr Partitionen @@ -121,31 +125,45 @@ inneren Spuren. Daher sollten die kleineren oft benutzten Dateisysteme, wie das Root-Dateisystem oder die Swap-Partition, an den äußeren Rand der Platte gelegt werden. - Die größeren Partitionen wie /usr - sollten in die inneren Bereiche gelegt werden. - Es empfiehlt sich, die Partitionen in einer ähnlichen - Reihenfolge wie Root-Partition, Swap, /var - und /usr anzulegen. + Die größeren Partitionen wie /usr sollten in die inneren Bereiche + gelegt werden. Es empfiehlt sich, die Partitionen in einer + ähnlichen Reihenfolge wie Root-Partition, Swap, /var und /usr anzulegen. - Die Größe von /var - ist abhängig vom Zweck der Maschine. - /var enthält hauptsächlich - Postfächer, den Spoolbereich zum Drucken und Logdateien. - Abhängig von der Anzahl der Systembenutzer und der + Die Größe der /var-Partition ist abhängig vom + Zweck der Maschine. Das /var-Dateisystem enthält + hauptsächlich Postfächer, den Spoolbereich zum Drucken und + Logdateien. Abhängig von der Anzahl der Systembenutzer und der Aufbewahrungszeit für Logdateien, können gerade die Postfächer und Logdateien zu ungeahnten Größen - wachsen. Oft werden Sie mit weniger als einem Gigabyte - auskommen, doch beachten Sie, dass - /var/tmp für Pakete ausreichend - dimensioniert ist. + wachsen. Die meisten Benutzer werden selten mehr als etwa ein + Gigabyte in /var + benötigen. - Die /usr-Partition enthält den - Hauptteil des Systems, die Ports-Sammlung (empfohlen) und die - Quellen (optional). Im Laufe der Installation haben Sie die - Möglichkeit, die Quellen und die Ports-Sammlung gleich mit - zu installieren. Für die - /usr-Partition sollten Sie mindestens - zwei Gigabyte vorsehen. + + Ein paar Mal wird es vorkommen, dass viel Festplattenspeicher + in /var/tmp gebraucht + wird. Wenn neue Software mit &man.pkg.add.1; installiert wird, + extrahieren die Paketwerkzeuge eine vorübergehende Kopie der + Pakete unter /var/tmp. Die + Installation grosser Softwarepakete wie + Firefox oder + Openoffice kann sich wegen zu wenig + Speicherplatz in /var/tmp + als trickreich herausstellen. + + + Die /usr-Partition + enthält viele der Hauptbestandteile des Systems, dazu + gehöhren die &man.ports.7;-Sammlung (empfohlen) und die Quellen + (optional). Sowohl die Ports als auch die Quellen des Basissystems + sind zum Zeitpunkt der Installation optional, trotzdem sollten Sie + mindestens zwei Gigabyte für diese Partition + vorsehen. Wenn Sie die Größe der Partitionen festlegen, beachten Sie bitte das Wachstum Ihres Systems. Wenn Sie den @@ -155,9 +173,9 @@ Die automatische Partitionierung von &man.sysinstall.8; mit Auto-defaults legt manchmal zu kleine - / und /var-Partition an. - Partitionieren Sie weise und großzügig. - + / und /var-Partition an. Partitionieren Sie + weise und großzügig. @@ -208,10 +226,11 @@ Gegen eine einzelne Partition sprechen mehrere Gründe. Jede Partition hat im Betrieb unterschiedliche Eigenschaften und die Trennung der Partitionen erlaubt es, die Dateisysteme - an diese Eigenschaften anzupassen. Die Root- und - /usr-Partitionen weisen meist nur - lesende Zugriffe auf, während /var - und /var/tmp hauptsächlich + an diese Eigenschaften anzupassen. Die Root- und /usr-Partitionen weisen meist nur + lesende Zugriffe auf, während /var und /var/tmp hauptsächlich beschrieben werden. Indem Sie ein System richtig partitionieren, verhindern @@ -222,10 +241,10 @@ I/O-Leistung diesen Partitionen steigen. Die I/O-Leistung ist natürlich auch für große Partitionen wichtig, doch erzielen Sie eine größere - Leistungssteigerung, wenn Sie /var an den - Rand der Platte legen. Schließlich sollten Sie - noch die Stabilität des Systems beachten. - Eine kleine Root-Partition, auf die meist nur lesend + Leistungssteigerung, wenn Sie /var an den Rand der Platte legen. + Schließlich sollten Sie noch die Stabilität des Systems + beachten. Eine kleine Root-Partition, auf die meist nur lesend zugegriffen wird, überlebt einen schlimmen Absturz wahrscheinlich eher als eine große Partition. @@ -249,10 +268,10 @@ In rc.conf werden die Vorgabewerte aus /etc/defaults/rc.conf überschrieben. - Die Vorgabedatei sollte nicht nach /etc - kopiert werden, da sie die Vorgabewerte und keine Beispiele - enthält. Jede systemspezifische Änderung wird - in rc.conf vorgenommen. + Die Vorgabedatei sollte nicht nach /etc kopiert werden, da sie die + Vorgabewerte und keine Beispiele enthält. Jede systemspezifische + Änderung wird in rc.conf vorgenommen. Um den administrativen Aufwand gering zu halten, existieren in geclusterten Anwendungen mehrere Strategien, @@ -299,8 +318,8 @@ /usr/local/etc - Für gewöhnlich werden diese Dateien in - /usr/local/etc installiert. Besitzt + Für gewöhnlich werden diese Dateien in /usr/local/etc installiert. Besitzt eine Anwendung viele Konfigurationsdateien, werden diese in einem separaten Unterverzeichnis abgelegt. @@ -311,8 +330,8 @@ für eine Anwendung existieren, werden sie durch Kopieren der .default Dateien erstellt. - Als Beispiel sei /usr/local/etc/apache - gezeigt: + Als Beispiel sei /usr/local/etc/apache gezeigt: -rw-r--r-- 1 root wheel 2184 May 20 1998 access.conf -rw-r--r-- 1 root wheel 2184 May 20 1998 access.conf.default @@ -363,67 +382,6 @@ Hersteller-Version. Allerdings kann ein Dienst mit einfachen Skripten gestartet werden. - Vor der Einführung von rc.d - legten Anwendungen einfach ein Startskript im Verzeichnis - /usr/local/etc/rc.d - ab. Das Startskript wurde von den Systemskripten in - den letzten Phasen des Systemstarts ausgeführt. - - Obwohl bereits viele Startskripten auf das neue - rc.d-System umgestellt wurden, gibt es - noch Anwendungen, - die ein Startskript im eben erwähnten Verzeichnis - benötigen. In diesem Fall weisen die Skripte kleinere - Unterschiede auf. Vor &os; 5.1 wurde der alte Stil - verwendet, obwohl in den meisten Fällen auch der neue - Stil problemlos funktionieren würde. - - Die Startskripten müssen das Suffix - .sh tragen und ausführbar sein. - Sie machen ein Skript ausführbar, indem Sie mit - chmod die Rechte 755 - vergeben. Das Skript sollte die Optionen - und akzeptieren, um die Anwendung - zu starten und zu stoppen. - - Ein einfaches Startskript sieht wie folgt aus: - - #!/bin/sh -echo -n ' utility' - -case "$1" in -start) - /usr/local/bin/utility - ;; -stop) - kill -9 `cat /var/run/utility.pid` - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 - - Das Skript akzeptiert die Optionen start - und stop zum Starten und Stoppen - einer Anwendung mit Namen utility. - - Manuell wird die Anwendung mit dem nachstehenden - Kommando gestartet: - - &prompt.root; /usr/local/etc/rc.d/utility.sh start - - Obwohl nicht jede Anwendung die Zeile in - rc.conf benötigt, akzeptieren - immer mehr Ports diese Konfiguration. Prüfen Sie - die Ausgaben während der Installation einer - Anwendung, um herauszufinden, wie die Anwendung - gestartet wird. Einige Anwendungen stellen Startskripten - bereit, die das rc.d-System - (wird im nächsten Abschnitt besprochen) verwenden. - Dienste über das <filename>rc.d</filename>-System starten @@ -445,15 +403,8 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# SET THEM IN THE /etc/rc.conf FILE -# -utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} -. /etc/rc.subr +./etc/rc.subr name="utility" rcvar=`set_rcvar` @@ -461,15 +412,20 @@ load_rc_config $name +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# SET THEM IN THE /etc/rc.conf FILE +# +utility_enable=${utility_enable-"NO"} +utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} + pidfile="${utility_pidfile}" -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" - run_rc_command "$1" Dieses Skript stellt sicher, dass utility nach den - daemon-Diensten gestartet wird. + DAEMON-Pseudodiensten gestartet wird. Es stellt auch eine Methode bereit, die Prozess-ID (PID) der Anwendung in einer Datei zu speichern. @@ -491,13 +447,14 @@ Andere Arten, um Dienste zu starten Dienste wie POP3 oder - IMAP können über den + IMAP können über &man.inetd.8; gestartet werden. Nach der Installation der Anwendung aus der Ports-Sammlung muss eine Konfigurationszeile in der Datei /etc/inetd.conf hinzugefügt oder - aktiviert werden. Der Abschnitt - beschreibt den + in der aktuellen Konfiguration durch Entfernen der Kommentare + aktiviert werden. Der Abschnitt beschreibt den inetd und dessen Konfiguration. Systemdienste können auch mit &man.cron.8; gestartet @@ -536,9 +493,9 @@ überprüft fortlaufend die Datei /etc/crontab. Beim Start sucht cron neue crontab-Dateien - im Verzeichnis /var/cron/tabs. In den - crontab-Dateien wird festgelegt, welche - Programme zu welchem Zeitpunkt laufen sollen. + im Verzeichnis /var/cron/tabs. + In den crontab-Dateien wird + festgelegt, welche Programme zu welchem Zeitpunkt laufen sollen. Das Werkzeug cron verwendet zwei verschiedene Konfigurationsdateien: Die @@ -726,7 +683,7 @@ 2002 wurde das rc.d-System von NetBSD zum Start von Systemdiensten in &os; integriert. Die zu diesem System gehörenden Dateien sind im - Verzeichnis /etc/rc.d abgelegt. + Verzeichnis /etc/rc.d abgelegt. Die Skripten in diesem Verzeichnis akzeptieren die Optionen , und . Beispielsweise kann @@ -1478,7 +1435,7 @@ Konfigurationsdateien - <filename>/etc</filename> Layout + <filename class="directory">/etc</filename> Layout Konfigurationsdateien finden sich in einigen Verzeichnissen unter anderem in: @@ -1489,45 +1446,48 @@ - /etc + /etc Enthält generelle Konfigurationsinformationen, die Daten hier sind systemspezifisch. - /etc/defaults + /etc/defaults Default Versionen der Konfigurationsdateien. - /etc/mail + /etc/mail Enthält die &man.sendmail.8; Konfiguration und weitere MTA Konfigurationsdateien. - /etc/ppp + /etc/ppp Hier findet sich die Konfiguration für die User- und Kernel-ppp Programme. - /etc/namedb + /etc/namedb Das Vorgabeverzeichnis, in dem Daten von &man.named.8; gehalten werden. Normalerweise werden hier named.conf und Zonendaten abgelegt. - /usr/local/etc + /usr/local/etc Installierte Anwendungen legen hier ihre Konfigurationsdateien ab. Dieses Verzeichnis kann Unterverzeichnisse für bestimmte Anwendungen enthalten. - /usr/local/etc/rc.d + /usr/local/etc/rc.d Ort für Start- und Stopskripten installierter Anwendungen. - /var/db + /var/db Automatisch generierte systemspezifische Datenbanken, wie die Paket-Datenbank oder die locate-Datenbank. @@ -1614,33 +1574,35 @@ # $FreeBSD$ # +# # Host Database -# This file should contain the addresses and aliases -# for local hosts that share this file. +# +# This file should contain the addresses and aliases for local hosts that +# share this file. Replace 'my.domain' below with the domainname of your +# machine. +# # In the presence of the domain name service or NIS, this file may # not be consulted at all; see /etc/nsswitch.conf for the resolution order. # # -::1 localhost localhost.my.domain myname.my.domain -127.0.0.1 localhost localhost.my.domain myname.my.domain - +::1 localhost localhost.my.domain +127.0.0.1 localhost localhost.my.domain # # Imaginary network. -#10.0.0.2 myname.my.domain myname -#10.0.0.3 myfriend.my.domain myfriend +#10.0.0.2 myname.my.domain myname +#10.0.0.3 myfriend.my.domain myfriend # # According to RFC 1918, you can use the following IP networks for # private nets which will never be connected to the Internet: # -# 10.0.0.0 - 10.255.255.255 -# 172.16.0.0 - 172.31.255.255 -# 192.168.0.0 - 192.168.255.255 +# 10.0.0.0 - 10.255.255.255 +# 172.16.0.0 - 172.31.255.255 +# 192.168.0.0 - 192.168.255.255 # # In case you want to be able to connect to the Internet, you need -# real official assigned numbers. PLEASE PLEASE PLEASE do not try -# to invent your own network numbers but instead get one from your -# network provider (if any) or from the Internet Registry (ftp to -# rs.internic.net, directory `/templates'). +# real official assigned numbers. Do not try to invent your own network +# numbers but instead get one from your network provider (if any) or +# from your regional registry (ARIN, APNIC, LACNIC, RIPE NCC, or AfriNIC.) # /etc/hosts hat ein einfaches Format: @@ -2304,7 +2266,7 @@ können die benötigten Ressourcen ähnlich denen eines großen Webservers sein. - Seit &os; 4.5 wird kern.maxusers beim + Die Variable kern.maxusers wird beim Systemstart automatisch aus dem zur Verfügung stehenden Hauptspeicher bestimmt. Im laufenden Betrieb kann dieser Wert aus der (nur lesbaren) sysctl-Variable @@ -2321,10 +2283,8 @@ /boot/loader.conf (sehen Sie sich dazu auch &man.loader.conf.5; sowie die Datei /boot/defaults/loader.conf an) an Ihre - Bedürfnisse angepasst werden. Auf &os;-Systemen vor - &os; 4.4 muss dieser Wert allerdings über die - Kernelkonfigurationsoption (siehe auch &man.config.8;) - gesetzt werden. + Bedürfnisse angepasst werden, so wie es bereits an anderer + Stelle dieses Dokuments beschrieben ist. Ältere &os;-Versionen setzen diesen Wert selbst, wenn Sie in der Konfigurationsdatei den Wert 0 @@ -2363,15 +2323,7 @@ nicht begrenzt. Der Wert dieser Variablen legt neben der möglichen Anzahl der Prozesse eines Benutzers weitere sinnvolle Größen für - bestimmte Systemtabellen fest. Die Option pseudo-device pty 16 - legt die Anzahl der erlaubten Anmeldungen von entfernten - Systemen und X-Terminals fest. Unter &os; 5.X brauchen - Sie sich um die Anzahl dieser Geräte nicht mehr zu - kümmern, da der &man.pty.4;-Treiber automatisch neue - Geräte erstellt, wenn Sie die Option - device pty in Ihre Kernelkonfigurationsdatei - aufnehmen und danach den Kernel neu bauen. + bestimmte Systemtabellen fest. ==== //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.37 2008/12/27 14:19:15 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/cutting-edge/chapter.sgml,v 1.83 2008/12/27 13:40:25 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.38 2009/10/07 10:19:10 bcr Exp $ + $FreeBSDde: de-docproj/books/handbook/cutting-edge/chapter.sgml,v 1.84 2009/09/29 17:26:09 bcr Exp $ basiert auf: 1.227 --> @@ -107,15 +107,680 @@ - Portsnap: A Ports Collection Update Tool (noch - nicht übersetzt) + + + + Tom + Rhodes + Geschrieben von + + + + + Colin + Percival + Basierend auf bereitgestellten Mitschriften von + + + + + Benedict + Reuschling + Übersetzt von + + + + Portsnap: Ein Werkzeug zur Aktualisierung der Ports-Sammlung + + Updating and Upgrading + + Portsnap + Updating and Upgrading + + + Das Basissystem von &os; enthält auch ein Programm zum + Aktualisieren der Ports-Sammlung: das &man.portsnap.8; Werkzeug. Wenn + es ausgeführt wird, verbindet es sich mit einem entfernten Rechner, + überprüft den Sicherungsschlüssel und lädt eine neue + Kopie der Ports-Sammlung herunter. Der Schlüssel wird dazu + verwendet, um die Integrität aller heruntergeladenen Dateien zu + prüfen und um sicherzustellen, dass diese unterwegs nicht + verändert wurden. Um die aktuellsten Dateien der Ports-Sammlung + herunter zu laden, geben Sie das folgende Kommando ein: + + &prompt.root; portsnap fetch +Looking up portsnap.FreeBSD.org mirrors... 3 mirrors found. +Fetching snapshot tag from portsnap1.FreeBSD.org... done. +Fetching snapshot metadata... done. +Updating from Wed Aug 6 18:00:22 EDT 2008 to Sat Aug 30 20:24:11 EDT 2008. +Fetching 3 metadata patches.. done. +Applying metadata patches... done. +Fetching 3 metadata files... done. +Fetching 90 patches.....10....20....30....40....50....60....70....80....90. done. +Applying patches... done. +Fetching 133 new ports or files... done. + + Dieses Beispiel zeigt, dass &man.portsnap.8; mehrere Korrekturen + für die aktuellen Ports-Daten gefunden und verifiziert hat. Es + zeigt auch, dass das Programm zuvor schon einmal gestartet wurde. + Wäre es das erste Mal, würde nur die Ports-Sammlung + heruntergeladen werden. + + Wenn &man.portsnap.8; erfolgreich die + fetch-Operation abgeschlossen hat, befinden sich die + Ports-Sammlung und die dazugehörigen Korrekturen auf dem lokalen + System, welches die Überprüfung bestanden hat. Die + aktualisierten Dateien können nun installiert werden durch die + Eingabe von: + + &prompt.root; portsnap extract +/usr/ports/.cvsignore +/usr/ports/CHANGES +/usr/ports/COPYRIGHT +/usr/ports/GIDs +/usr/ports/KNOBS +/usr/ports/LEGAL +/usr/ports/MOVED +/usr/ports/Makefile +/usr/ports/Mk/bsd.apache.mk +/usr/ports/Mk/bsd.autotools.mk +/usr/ports/Mk/bsd.cmake.mk +... + + Der Prozess ist jetzt abgeschlossen und Anwendungen können + mittels der aktuellen Ports-Sammlung installiert oder aktualisiert + werden. + + Um beide Prozesse nacheinander auszuführen, geben Sie das + folgende Kommando ein: + + &prompt.root; portsnap fetch update + + + + + + + Benedict + Reuschling + Übersetzt von + + + + Aktualisieren der Dokumentationssammlung + + Updating and Upgrading + + + Documentation >>> TRUNCATED FOR MAIL (1000 lines) <<< From hselasky at FreeBSD.org Wed Oct 7 17:43:37 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Oct 7 17:43:44 2009 Subject: PERFORCE change 169299 for review Message-ID: <200910071743.n97HhaOB007296@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169299 Change 169299 by hselasky@hselasky_laptop001 on 2009/10/07 17:43:32 USB PCI+BIOS: - patch from Andriy Gapon to workaround buggy BIOS code in USB regard. By doing the BIOS to OS handover for all host controllers at the same time, we avoid problems where the BIOS will actually write to the USB registers of all the USB host controllers every time we handover one of them, and consequently reset the OS programmed values. Affected files ... .. //depot/projects/usb/src/sys/dev/pci/pci.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#11 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehcireg.h#1 add .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohcireg.h#1 add .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhcireg.h#1 add Differences ... ==== //depot/projects/usb/src/sys/dev/pci/pci.c#27 (text+ko) ==== @@ -62,6 +62,10 @@ #include #include +#include +#include +#include + #include "pcib_if.h" #include "pci_if.h" @@ -270,6 +274,13 @@ SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD, &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI"); +static int pci_usb_takeover = 1; +TUNABLE_INT("hw.pci.usb_early_takeover", &pci_usb_takeover); +SYSCTL_INT(_hw_pci, OID_AUTO, usb_early_takeover, CTLFLAG_RD | CTLFLAG_TUN, + &pci_usb_takeover, 1, "Enable early takeover of USB controllers.\n\ +Disable this if you depend on BIOS emulation of USB devices, that is\n\ +you use USB devices (like keyboard or mouse) but do not load USB drivers"); + /* Find a device_t by bus/slot/function in domain 0 */ device_t @@ -2569,6 +2580,106 @@ resource_list_add(&dinfo->resources, SYS_RES_IRQ, 0, irq, irq, 1); } +/* Perform early OHCI takeover from SMM. */ +static void +ohci_early_takeover(device_t self) +{ + struct resource *res; + uint32_t ctl; + int rid; + int i; + + rid = PCIR_BAR(0); + res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (res == NULL) + return; + + ctl = bus_read_4(res, OHCI_CONTROL); + if (ctl & OHCI_IR) { + if (bootverbose) + printf("ohci early: " + "SMM active, request owner change\n"); + bus_write_4(res, OHCI_COMMAND_STATUS, OHCI_OCR); + for (i = 0; (i < 100) && (ctl & OHCI_IR); i++) { + DELAY(1000); + ctl = bus_read_4(res, OHCI_CONTROL); + } + if (ctl & OHCI_IR) { + if (bootverbose) + printf("ohci early: " + "SMM does not respond, resetting\n"); + bus_write_4(res, OHCI_CONTROL, OHCI_HCFS_RESET); + } + } + + bus_release_resource(self, SYS_RES_MEMORY, rid, res); +} + +/* Perform early UHCI takeover from SMM. */ +static void +uhci_early_takeover(device_t self) +{ + /* + * Set the PIRQD enable bit and switch off all the others. We don't + * want legacy support to interfere with us XXX Does this also mean + * that the BIOS won't touch the keyboard anymore if it is connected + * to the ports of the root hub? + */ + pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 2); +} + +/* Perform early EHCI takeover from SMM. */ +static void +ehci_early_takeover(device_t self) +{ + struct resource *res; + uint32_t cparams; + uint32_t eec; + uint8_t eecp; + uint8_t bios_sem; + int rid; + int i; + + rid = PCIR_BAR(0); + res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (res == NULL) + return; + + cparams = bus_read_4(res, EHCI_HCCPARAMS); + + /* Synchronise with the BIOS if it owns the controller. */ + for (eecp = EHCI_HCC_EECP(cparams); eecp != 0; + eecp = EHCI_EECP_NEXT(eec)) { + eec = pci_read_config(self, eecp, 4); + if (EHCI_EECP_ID(eec) != EHCI_EC_LEGSUP) { + continue; + } + bios_sem = pci_read_config(self, eecp + + EHCI_LEGSUP_BIOS_SEM, 1); + if (bios_sem == 0) { + continue; + } + if (bootverbose) + printf("ehci early: " + "SMM active, request owner change\n"); + + pci_write_config(self, eecp + EHCI_LEGSUP_OS_SEM, 1, 1); + + for (i = 0; (i < 100) && (bios_sem != 0); i++) { + DELAY(1000); + bios_sem = pci_read_config(self, eecp + + EHCI_LEGSUP_BIOS_SEM, 1); + } + + if (bios_sem != 0) { + if (bootverbose) + printf("ehci early: " + "SMM does not respond\n"); + } + } + bus_release_resource(self, SYS_RES_MEMORY, rid, res); +} + void pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask) { @@ -2612,6 +2723,16 @@ pci_assign_interrupt(bus, dev, 0); #endif } + + if (pci_usb_takeover && pci_get_class(dev) == PCIC_SERIALBUS && + pci_get_subclass(dev) == PCIS_SERIALBUS_USB) { + if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_EHCI) + ehci_early_takeover(dev); + else if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_OHCI) + ohci_early_takeover(dev); + else if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_UHCI) + uhci_early_takeover(dev); + } } void ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#11 (text+ko) ==== @@ -40,138 +40,7 @@ #define EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) -/* PCI config registers */ -#define PCI_CBMEM 0x10 /* configuration base MEM */ -#define PCI_INTERFACE_EHCI 0x20 -#define PCI_USBREV 0x60 /* RO USB protocol revision */ -#define PCI_USB_REV_MASK 0xff -#define PCI_USB_REV_PRE_1_0 0x00 -#define PCI_USB_REV_1_0 0x10 -#define PCI_USB_REV_1_1 0x11 -#define PCI_USB_REV_2_0 0x20 -#define PCI_EHCI_FLADJ 0x61 /* RW Frame len adj, SOF=59488+6*fladj */ -#define PCI_EHCI_PORTWAKECAP 0x62 /* RW Port wake caps (opt) */ - -/* EHCI Extended Capabilities */ -#define EHCI_EC_LEGSUP 0x01 -#define EHCI_EECP_NEXT(x) (((x) >> 8) & 0xff) -#define EHCI_EECP_ID(x) ((x) & 0xff) - -/* Legacy support extended capability */ -#define EHCI_LEGSUP_BIOS_SEM 0x02 -#define EHCI_LEGSUP_OS_SEM 0x03 -#define EHCI_LEGSUP_USBLEGCTLSTS 0x04 - -/* EHCI capability registers */ -#define EHCI_CAPLENGTH 0x00 /* RO Capability register length field */ -/* reserved 0x01 */ -#define EHCI_HCIVERSION 0x02 /* RO Interface version number */ -#define EHCI_HCSPARAMS 0x04 /* RO Structural parameters */ -#define EHCI_HCS_DEBUGPORT(x) (((x) >> 20) & 0xf) -#define EHCI_HCS_P_INDICATOR(x) ((x) & 0x10000) -#define EHCI_HCS_N_CC(x) (((x) >> 12) & 0xf) /* # of companion ctlrs */ -#define EHCI_HCS_N_PCC(x) (((x) >> 8) & 0xf) /* # of ports per comp. */ -#define EHCI_HCS_PPC(x) ((x) & 0x10) /* port power control */ -#define EHCI_HCS_N_PORTS(x) ((x) & 0xf) /* # of ports */ -#define EHCI_HCCPARAMS 0x08 /* RO Capability parameters */ -#define EHCI_HCC_EECP(x) (((x) >> 8) & 0xff) /* extended ports caps */ -#define EHCI_HCC_IST(x) (((x) >> 4) & 0xf) /* isoc sched threshold */ -#define EHCI_HCC_ASPC(x) ((x) & 0x4) /* async sched park cap */ -#define EHCI_HCC_PFLF(x) ((x) & 0x2) /* prog frame list flag */ -#define EHCI_HCC_64BIT(x) ((x) & 0x1) /* 64 bit address cap */ -#define EHCI_HCSP_PORTROUTE 0x0c /* RO Companion port route description */ - -/* EHCI operational registers. Offset given by EHCI_CAPLENGTH register */ -#define EHCI_USBCMD 0x00 /* RO, RW, WO Command register */ -#define EHCI_CMD_ITC_M 0x00ff0000 /* RW interrupt threshold ctrl */ -#define EHCI_CMD_ITC_1 0x00010000 -#define EHCI_CMD_ITC_2 0x00020000 -#define EHCI_CMD_ITC_4 0x00040000 -#define EHCI_CMD_ITC_8 0x00080000 -#define EHCI_CMD_ITC_16 0x00100000 -#define EHCI_CMD_ITC_32 0x00200000 -#define EHCI_CMD_ITC_64 0x00400000 -#define EHCI_CMD_ASPME 0x00000800 /* RW/RO async park enable */ -#define EHCI_CMD_ASPMC 0x00000300 /* RW/RO async park count */ -#define EHCI_CMD_LHCR 0x00000080 /* RW light host ctrl reset */ -#define EHCI_CMD_IAAD 0x00000040 /* RW intr on async adv door - * bell */ -#define EHCI_CMD_ASE 0x00000020 /* RW async sched enable */ -#define EHCI_CMD_PSE 0x00000010 /* RW periodic sched enable */ -#define EHCI_CMD_FLS_M 0x0000000c /* RW/RO frame list size */ -#define EHCI_CMD_FLS(x) (((x) >> 2) & 3) /* RW/RO frame list size */ -#define EHCI_CMD_HCRESET 0x00000002 /* RW reset */ -#define EHCI_CMD_RS 0x00000001 /* RW run/stop */ -#define EHCI_USBSTS 0x04 /* RO, RW, RWC Status register */ -#define EHCI_STS_ASS 0x00008000 /* RO async sched status */ -#define EHCI_STS_PSS 0x00004000 /* RO periodic sched status */ -#define EHCI_STS_REC 0x00002000 /* RO reclamation */ -#define EHCI_STS_HCH 0x00001000 /* RO host controller halted */ -#define EHCI_STS_IAA 0x00000020 /* RWC interrupt on async adv */ -#define EHCI_STS_HSE 0x00000010 /* RWC host system error */ -#define EHCI_STS_FLR 0x00000008 /* RWC frame list rollover */ -#define EHCI_STS_PCD 0x00000004 /* RWC port change detect */ -#define EHCI_STS_ERRINT 0x00000002 /* RWC error interrupt */ -#define EHCI_STS_INT 0x00000001 /* RWC interrupt */ -#define EHCI_STS_INTRS(x) ((x) & 0x3f) - -/* - * NOTE: the doorbell interrupt is enabled, but the doorbell is never - * used! SiS chipsets require this. - */ -#define EHCI_NORMAL_INTRS (EHCI_STS_IAA | EHCI_STS_HSE | \ - EHCI_STS_PCD | EHCI_STS_ERRINT | EHCI_STS_INT) - -#define EHCI_USBINTR 0x08 /* RW Interrupt register */ -#define EHCI_INTR_IAAE 0x00000020 /* interrupt on async advance - * ena */ -#define EHCI_INTR_HSEE 0x00000010 /* host system error ena */ -#define EHCI_INTR_FLRE 0x00000008 /* frame list rollover ena */ -#define EHCI_INTR_PCIE 0x00000004 /* port change ena */ -#define EHCI_INTR_UEIE 0x00000002 /* USB error intr ena */ -#define EHCI_INTR_UIE 0x00000001 /* USB intr ena */ - -#define EHCI_FRINDEX 0x0c /* RW Frame Index register */ - -#define EHCI_CTRLDSSEGMENT 0x10 /* RW Control Data Structure Segment */ - -#define EHCI_PERIODICLISTBASE 0x14 /* RW Periodic List Base */ -#define EHCI_ASYNCLISTADDR 0x18 /* RW Async List Base */ - -#define EHCI_CONFIGFLAG 0x40 /* RW Configure Flag register */ -#define EHCI_CONF_CF 0x00000001 /* RW configure flag */ - -#define EHCI_PORTSC(n) (0x40+(4*(n))) /* RO, RW, RWC Port Status reg */ -#define EHCI_PS_WKOC_E 0x00400000 /* RW wake on over current ena */ -#define EHCI_PS_WKDSCNNT_E 0x00200000 /* RW wake on disconnect ena */ -#define EHCI_PS_WKCNNT_E 0x00100000 /* RW wake on connect ena */ -#define EHCI_PS_PTC 0x000f0000 /* RW port test control */ -#define EHCI_PS_PIC 0x0000c000 /* RW port indicator control */ -#define EHCI_PS_PO 0x00002000 /* RW port owner */ -#define EHCI_PS_PP 0x00001000 /* RW,RO port power */ -#define EHCI_PS_LS 0x00000c00 /* RO line status */ -#define EHCI_PS_IS_LOWSPEED(x) (((x) & EHCI_PS_LS) == 0x00000400) -#define EHCI_PS_PR 0x00000100 /* RW port reset */ -#define EHCI_PS_SUSP 0x00000080 /* RW suspend */ -#define EHCI_PS_FPR 0x00000040 /* RW force port resume */ -#define EHCI_PS_OCC 0x00000020 /* RWC over current change */ -#define EHCI_PS_OCA 0x00000010 /* RO over current active */ -#define EHCI_PS_PEC 0x00000008 /* RWC port enable change */ -#define EHCI_PS_PE 0x00000004 /* RW port enable */ -#define EHCI_PS_CSC 0x00000002 /* RWC connect status change */ -#define EHCI_PS_CS 0x00000001 /* RO connect status */ -#define EHCI_PS_CLEAR (EHCI_PS_OCC | EHCI_PS_PEC | EHCI_PS_CSC) - -#define EHCI_USBMODE 0x68 /* RW USB Device mode register */ -#define EHCI_UM_CM 0x00000003 /* R/WO Controller Mode */ -#define EHCI_UM_CM_IDLE 0x0 /* Idle */ -#define EHCI_UM_CM_HOST 0x3 /* Host Controller */ -#define EHCI_UM_ES 0x00000004 /* R/WO Endian Select */ -#define EHCI_UM_ES_LE 0x0 /* Little-endian byte alignment */ -#define EHCI_UM_ES_BE 0x4 /* Big-endian byte alignment */ -#define EHCI_UM_SDIS 0x00000010 /* R/WO Stream Disable Mode */ - -#define EHCI_PORT_RESET_COMPLETE 2 /* ms */ +#include /* * Alignment NOTE: structures must be aligned so that the hardware can index ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#10 (text+ko) ==== @@ -41,94 +41,7 @@ #define OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) -/* PCI config registers */ -#define PCI_CBMEM 0x10 /* configuration base memory */ -#define PCI_INTERFACE_OHCI 0x10 - -/* OHCI registers */ -#define OHCI_REVISION 0x00 /* OHCI revision */ -#define OHCI_REV_LO(rev) ((rev) & 0xf) -#define OHCI_REV_HI(rev) (((rev)>>4) & 0xf) -#define OHCI_REV_LEGACY(rev) ((rev) & 0x100) -#define OHCI_CONTROL 0x04 -#define OHCI_CBSR_MASK 0x00000003 /* Control/Bulk Service Ratio */ -#define OHCI_RATIO_1_1 0x00000000 -#define OHCI_RATIO_1_2 0x00000001 -#define OHCI_RATIO_1_3 0x00000002 -#define OHCI_RATIO_1_4 0x00000003 -#define OHCI_PLE 0x00000004 /* Periodic List Enable */ -#define OHCI_IE 0x00000008 /* Isochronous Enable */ -#define OHCI_CLE 0x00000010 /* Control List Enable */ -#define OHCI_BLE 0x00000020 /* Bulk List Enable */ -#define OHCI_HCFS_MASK 0x000000c0 /* HostControllerFunctionalStat - * e */ -#define OHCI_HCFS_RESET 0x00000000 -#define OHCI_HCFS_RESUME 0x00000040 -#define OHCI_HCFS_OPERATIONAL 0x00000080 -#define OHCI_HCFS_SUSPEND 0x000000c0 -#define OHCI_IR 0x00000100 /* Interrupt Routing */ -#define OHCI_RWC 0x00000200 /* Remote Wakeup Connected */ -#define OHCI_RWE 0x00000400 /* Remote Wakeup Enabled */ -#define OHCI_COMMAND_STATUS 0x08 -#define OHCI_HCR 0x00000001 /* Host Controller Reset */ -#define OHCI_CLF 0x00000002 /* Control List Filled */ -#define OHCI_BLF 0x00000004 /* Bulk List Filled */ -#define OHCI_OCR 0x00000008 /* Ownership Change Request */ -#define OHCI_SOC_MASK 0x00030000 /* Scheduling Overrun Count */ -#define OHCI_INTERRUPT_STATUS 0x0c -#define OHCI_SO 0x00000001 /* Scheduling Overrun */ -#define OHCI_WDH 0x00000002 /* Writeback Done Head */ -#define OHCI_SF 0x00000004 /* Start of Frame */ -#define OHCI_RD 0x00000008 /* Resume Detected */ -#define OHCI_UE 0x00000010 /* Unrecoverable Error */ -#define OHCI_FNO 0x00000020 /* Frame Number Overflow */ -#define OHCI_RHSC 0x00000040 /* Root Hub Status Change */ -#define OHCI_OC 0x40000000 /* Ownership Change */ -#define OHCI_MIE 0x80000000 /* Master Interrupt Enable */ -#define OHCI_INTERRUPT_ENABLE 0x10 -#define OHCI_INTERRUPT_DISABLE 0x14 -#define OHCI_HCCA 0x18 -#define OHCI_PERIOD_CURRENT_ED 0x1c -#define OHCI_CONTROL_HEAD_ED 0x20 -#define OHCI_CONTROL_CURRENT_ED 0x24 -#define OHCI_BULK_HEAD_ED 0x28 -#define OHCI_BULK_CURRENT_ED 0x2c -#define OHCI_DONE_HEAD 0x30 -#define OHCI_FM_INTERVAL 0x34 -#define OHCI_GET_IVAL(s) ((s) & 0x3fff) -#define OHCI_GET_FSMPS(s) (((s) >> 16) & 0x7fff) -#define OHCI_FIT 0x80000000 -#define OHCI_FM_REMAINING 0x38 -#define OHCI_FM_NUMBER 0x3c -#define OHCI_PERIODIC_START 0x40 -#define OHCI_LS_THRESHOLD 0x44 -#define OHCI_RH_DESCRIPTOR_A 0x48 -#define OHCI_GET_NDP(s) ((s) & 0xff) -#define OHCI_PSM 0x0100 /* Power Switching Mode */ -#define OHCI_NPS 0x0200 /* No Power Switching */ -#define OHCI_DT 0x0400 /* Device Type */ -#define OHCI_OCPM 0x0800 /* Overcurrent Protection Mode */ -#define OHCI_NOCP 0x1000 /* No Overcurrent Protection */ -#define OHCI_GET_POTPGT(s) ((s) >> 24) -#define OHCI_RH_DESCRIPTOR_B 0x4c -#define OHCI_RH_STATUS 0x50 -#define OHCI_LPS 0x00000001 /* Local Power Status */ -#define OHCI_OCI 0x00000002 /* OverCurrent Indicator */ -#define OHCI_DRWE 0x00008000 /* Device Remote Wakeup Enable */ -#define OHCI_LPSC 0x00010000 /* Local Power Status Change */ -#define OHCI_CCIC 0x00020000 /* OverCurrent Indicator - * Change */ -#define OHCI_CRWE 0x80000000 /* Clear Remote Wakeup Enable */ -#define OHCI_RH_PORT_STATUS(n) (0x50 + ((n)*4)) /* 1 based indexing */ - -#define OHCI_LES (OHCI_PLE | OHCI_IE | OHCI_CLE | OHCI_BLE) -#define OHCI_ALL_INTRS (OHCI_SO | OHCI_WDH | OHCI_SF | \ - OHCI_RD | OHCI_UE | OHCI_FNO | \ - OHCI_RHSC | OHCI_OC) -#define OHCI_NORMAL_INTRS (OHCI_WDH | OHCI_RD | OHCI_UE | OHCI_RHSC) - -#define OHCI_FSMPS(i) (((i-210)*6/7) << 16) -#define OHCI_PERIODIC(i) ((i)*9/10) +#include #define OHCI_NO_INTRS 32 #define OHCI_HCCA_SIZE 256 ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#10 (text+ko) ==== @@ -41,64 +41,8 @@ #define UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) -/* PCI config registers */ -#define PCI_USBREV 0x60 /* USB protocol revision */ -#define PCI_USB_REV_MASK 0xff -#define PCI_USB_REV_PRE_1_0 0x00 -#define PCI_USB_REV_1_0 0x10 -#define PCI_USB_REV_1_1 0x11 -#define PCI_LEGSUP 0xc0 /* Legacy Support register */ -#define PCI_LEGSUP_USBPIRQDEN 0x2000 /* USB PIRQ D Enable */ -#define PCI_CBIO 0x20 /* configuration base IO */ -#define PCI_INTERFACE_UHCI 0x00 - -/* UHCI registers */ -#define UHCI_CMD 0x00 -#define UHCI_CMD_RS 0x0001 -#define UHCI_CMD_HCRESET 0x0002 -#define UHCI_CMD_GRESET 0x0004 -#define UHCI_CMD_EGSM 0x0008 -#define UHCI_CMD_FGR 0x0010 -#define UHCI_CMD_SWDBG 0x0020 -#define UHCI_CMD_CF 0x0040 -#define UHCI_CMD_MAXP 0x0080 -#define UHCI_STS 0x02 -#define UHCI_STS_USBINT 0x0001 -#define UHCI_STS_USBEI 0x0002 -#define UHCI_STS_RD 0x0004 -#define UHCI_STS_HSE 0x0008 -#define UHCI_STS_HCPE 0x0010 -#define UHCI_STS_HCH 0x0020 -#define UHCI_STS_ALLINTRS 0x003f -#define UHCI_INTR 0x04 -#define UHCI_INTR_TOCRCIE 0x0001 -#define UHCI_INTR_RIE 0x0002 -#define UHCI_INTR_IOCE 0x0004 -#define UHCI_INTR_SPIE 0x0008 -#define UHCI_FRNUM 0x06 -#define UHCI_FRNUM_MASK 0x03ff -#define UHCI_FLBASEADDR 0x08 -#define UHCI_SOF 0x0c -#define UHCI_SOF_MASK 0x7f -#define UHCI_PORTSC1 0x010 -#define UHCI_PORTSC2 0x012 -#define UHCI_PORTSC_CCS 0x0001 -#define UHCI_PORTSC_CSC 0x0002 -#define UHCI_PORTSC_PE 0x0004 -#define UHCI_PORTSC_POEDC 0x0008 -#define UHCI_PORTSC_LS 0x0030 -#define UHCI_PORTSC_LS_SHIFT 4 -#define UHCI_PORTSC_RD 0x0040 -#define UHCI_PORTSC_LSDA 0x0100 -#define UHCI_PORTSC_PR 0x0200 -#define UHCI_PORTSC_OCI 0x0400 -#define UHCI_PORTSC_OCIC 0x0800 -#define UHCI_PORTSC_SUSP 0x1000 +#include -#define URWMASK(x) ((x) & (UHCI_PORTSC_SUSP | \ - UHCI_PORTSC_PR | UHCI_PORTSC_RD | \ - UHCI_PORTSC_PE)) - #define UHCI_FRAMELIST_COUNT 1024 /* units */ #define UHCI_FRAMELIST_ALIGN 4096 /* bytes */ @@ -118,8 +62,6 @@ #define UHCI_PTR_QH 0x00000002 #define UHCI_PTR_VF 0x00000004 -#define UHCI_QH_REMOVE_DELAY 5 /* us - QH remove delay */ - /* * The Queue Heads (QH) and Transfer Descriptors (TD) are accessed by * both the CPU and the USB-controller which run concurrently. Great From pgj at FreeBSD.org Wed Oct 7 20:26:35 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Wed Oct 7 20:26:41 2009 Subject: PERFORCE change 169304 for review Message-ID: <200910072026.n97KQZkk022436@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169304 Change 169304 by pgj@beehive on 2009/10/07 20:26:22 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/administration.sgml#8 integrate .. //depot/projects/docproj_hu/www/en/news/status/Makefile#6 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2009-04-2009-09.xml#1 branch .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#55 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/administration.sgml#8 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -169,6 +169,7 @@
  • &a.murray; <murray@FreeBSD.org>
  • &a.rwatson; <rwatson@FreeBSD.org>
  • &a.dwhite; <dwhite@FreeBSD.org>
    • +
  • &a.bz; <bz@FreeBSD.org>

    • FreeBSD/alpha Release Engineering Team ==== //depot/projects/docproj_hu/www/en/news/status/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/status/Makefile,v 1.46 2009/05/07 18:12:15 brd Exp $ +# $FreeBSD: www/en/news/status/Makefile,v 1.47 2009/10/05 12:49:16 danger Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -44,6 +44,7 @@ XMLDOCS+= report-2008-07-2008-09 XMLDOCS+= report-2008-10-2008-12 XMLDOCS+= report-2009-01-2009-03 +#XMLDOCS+= report-2009-04-2009-09 XSLT.DEFAULT= report.xsl ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#55 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.22 2009/09/23 10:50:07 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.23 2009/10/05 18:52:17 pgj Exp $ From pgj at FreeBSD.org Wed Oct 7 21:05:18 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Wed Oct 7 21:05:24 2009 Subject: PERFORCE change 169309 for review Message-ID: <200910072105.n97L5H7I036476@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169309 Change 169309 by pgj@beehive on 2009/10/07 21:04:25 MFen (www): 1.25 -> 1.26 hu/administration.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#20 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#20 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -249,6 +249,7 @@
  • &a.murray; <murray@FreeBSD.org>
  • &a.rwatson; <rwatson@FreeBSD.org>
  • &a.dwhite; <dwhite@FreeBSD.org>
    • +
  • &a.bz; <bz@FreeBSD.org>

    • &os;/alpha Release Engineering Team From mav at FreeBSD.org Thu Oct 8 06:13:17 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Thu Oct 8 06:13:25 2009 Subject: PERFORCE change 169316 for review Message-ID: <200910080613.n986DGD9006824@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=169316 Change 169316 by mav@mav_mavbook on 2009/10/08 06:13:04 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#6 integrate .. //depot/projects/scottl-camlock/src/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/tcpdump/tcp.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/bce.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/bge.4#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#63 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/errno.h#5 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/unknown1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/tmpfs/h_tools.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/locale/locale.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/cdcontrol.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); #include #include @@ -713,12 +713,7 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } + find_command(argv[0], &cmdentry, 0, path); /* implement the bltin builtin here */ if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { for (;;) { @@ -740,7 +735,7 @@ /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN ==== //depot/projects/scottl-camlock/src/bin/sh/exec.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); #include #include @@ -429,6 +429,7 @@ outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: ==== //depot/projects/scottl-camlock/src/bin/sh/sh.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $ .\" .Dd May 31, 2009 .Dt SH 1 @@ -1227,6 +1227,9 @@ final value of .Ar parameter is substituted. +Quoting inside +.Ar word +does not prevent field splitting or pathname expansion. Only variables, not positional parameters or special parameters, can be assigned in this way. ==== //depot/projects/scottl-camlock/src/contrib/tcpdump/print-tcp.c#3 (text+ko) ==== @@ -124,6 +124,7 @@ { TCPOPT_CCECHO, "" }, { TCPOPT_SIGNATURE, "md5" }, { TCPOPT_AUTH, "enhanced auth" }, + { TCPOPT_UTO, "uto" }, { 0, NULL } }; @@ -613,6 +614,17 @@ */ break; + case TCPOPT_UTO: + datalen = 2; + LENCHECK(datalen); + uint utoval = EXTRACT_16BITS(cp); + if (utoval & 0x0001) + utoval = (utoval >> 1) * 60; + else + utoval >>= 1; + (void)printf(" %u", utoval); + break; + default: datalen = len - 2; for (i = 0; i < datalen; ++i) { ==== //depot/projects/scottl-camlock/src/contrib/tcpdump/tcp.h#3 (text+ko) ==== @@ -83,6 +83,8 @@ #define TCPOLEN_SIGNATURE 18 #define TCP_SIGLEN 16 /* length of an option 19 digest */ #define TCPOPT_AUTH 20 /* Enhanced AUTH option */ +#define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */ +#define TCPOLEN_UTO 4 #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) ==== //depot/projects/scottl-camlock/src/contrib/tcsh/sh.c#4 (text+ko) ==== @@ -1291,6 +1291,8 @@ /* * Mop-up. */ + /* Take care of these (especially HUP) here instead of inside flush. */ + handle_pending_signals(); if (intty) { if (loginsh) { xprintf("logout\n"); ==== //depot/projects/scottl-camlock/src/lib/libc/gen/errlst.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.9 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.10 2009/10/07 20:20:51 rwatson Exp $"); #include @@ -150,5 +150,6 @@ "Multihop attempted", /* 90 - EMULTIHOP */ "Link has been severed", /* 91 - ENOLINK */ "Protocol error", /* 92 - EPROTO */ + "Capabilities insufficient", /* 93 - ENOTCAPABLE */ }; const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]); ==== //depot/projects/scottl-camlock/src/lib/libc/sys/intro.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.49 2009/09/06 07:22:09 pjd Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.50 2009/10/07 20:20:51 rwatson Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -456,6 +456,9 @@ .It Er 88 EDOOFUS Em "Programming error" . A function or API is being abused in a way which could only be detected at run-time. +.It Er 93 ENOTCAPABLE Em "Capabilities insufficient" . +An operation on a capability file descriptor requires greater privilege than +the capability allows. .El .Sh DEFINITIONS .Bl -tag -width Ds ==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/map_object.c#5 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/map_object.c,v 1.22 2009/07/17 19:32:04 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/map_object.c,v 1.23 2009/10/06 17:14:39 rwatson Exp $ */ #include @@ -273,7 +273,7 @@ } u; ssize_t nbytes; - if ((nbytes = read(fd, u.buf, PAGE_SIZE)) == -1) { + if ((nbytes = pread(fd, u.buf, PAGE_SIZE, 0)) == -1) { _rtld_error("%s: read error: %s", path, strerror(errno)); return NULL; } ==== //depot/projects/scottl-camlock/src/share/man/man4/bce.4#3 (text) ==== @@ -26,9 +26,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bce.4,v 1.12 2009/04/07 22:23:48 delphij Exp $ +.\" $FreeBSD: src/share/man/man4/bce.4,v 1.13 2009/10/07 13:45:12 simon Exp $ .\" -.Dd April 7, 2009 +.Dd October 7, 2009 .Dt BCE 4 .Os .Sh NAME @@ -165,6 +165,8 @@ .It Dell PowerEdge 2950 integrated BCM5708 NIC .It +Dell PowerEdge R710 integrated BCM5709 NIC +.It HP NC370F Multifunction Gigabit Server Adapter .It HP NC370T Multifunction Gigabit Server Adapter ==== //depot/projects/scottl-camlock/src/share/man/man4/bge.4#3 (text+ko) ==== @@ -29,14 +29,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bge.4,v 1.35 2009/05/19 17:17:53 joel Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.36 2009/10/07 13:25:24 stas Exp $ .\" -.Dd May 19, 2009 +.Dd Oct 7, 2009 .Dt BGE 4 .Os .Sh NAME .Nm bge -.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver" +.Nd "Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,8 +56,8 @@ The .Nm driver provides support for various NICs based on the Broadcom BCM570x, -5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet -controller chips. +5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families +of Gigabit Ethernet controller chips. .Pp All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5 copper cable, except for the SysKonnect SK-9D41 which supports only ==== //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#8 (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/amd64/include/atomic.h,v 1.47 2009/10/06 13:45:49 attilio Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.48 2009/10/06 23:48:28 attilio Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -32,9 +32,9 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define mb() __asm__ __volatile__ ("mfence;": : :"memory") -#define wmb() __asm__ __volatile__ ("sfence;": : :"memory") -#define rmb() __asm__ __volatile__ ("lfence;": : :"memory") +#define mb() __asm __volatile("mfence;" : : : "memory") +#define wmb() __asm __volatile("sfence;" : : : "memory") +#define rmb() __asm __volatile("lfence;" : : : "memory") /* * Various simple operations on memory, each of which is atomic in the @@ -131,50 +131,33 @@ * Returns 0 on failure, non-zero on success */ -static __inline int -atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) -{ - u_char res; +#define DEFINE_CMPSET_GEN(NAME, TYPE, OP) \ +static __inline int \ +atomic_cmpset_##NAME(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ +{ \ + u_char res; \ + \ + __asm __volatile( \ + " " MPLOCKED " " \ + " " OP " %2,%1 ; " \ + " sete %0 ; " \ + "1: " \ + "# atomic_cmpset_##NAME" \ + : "=a" (res), /* 0 */ \ + "=m" (*dst) /* 1 */ \ + : "r" (src), /* 2 */ \ + "a" (exp), /* 3 */ \ + "m" (*dst) /* 4 */ \ + : "memory"); \ + \ + return (res); \ +} \ +struct __hack - __asm __volatile( - " " MPLOCKED " " - " cmpxchgl %2,%1 ; " - " sete %0 ; " - "1: " - "# atomic_cmpset_int" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); - - return (res); -} - -static __inline int -atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) -{ - u_char res; - - __asm __volatile( - " " MPLOCKED " " - " cmpxchgq %2,%1 ; " - " sete %0 ; " - "1: " - "# atomic_cmpset_long" - : "=a" (res), /* 0 */ - "=m" (*dst) /* 1 */ - : "r" (src), /* 2 */ - "a" (exp), /* 3 */ - "m" (*dst) /* 4 */ - : "memory"); - - return (res); -} - -#define atomic_cmpset_barr_int atomic_cmpset_int -#define atomic_cmpset_barr_long atomic_cmpset_long +DEFINE_CMPSET_GEN(int, int, "cmpxchgl"); +DEFINE_CMPSET_GEN(long, long, "cmpxchgq"); +DEFINE_CMPSET_GEN(barr_int, int, "cmpxchgl"); +DEFINE_CMPSET_GEN(barr_long, long, "cmpxchgq"); /* * Atomically add the value of v to the integer pointed to by p and return ==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 (text+ko) ==== @@ -1821,6 +1821,12 @@ #endif #ifdef _KERNEL + if (needfree) + return (1); + if (arc_size > arc_c_max) + return (1); + if (arc_size <= arc_c_min) + return (0); /* * If pages are needed or we're within 2048 pages @@ -1829,9 +1835,6 @@ if (vm_pages_needed || (vm_paging_target() > -2048)) return (1); - if (needfree) - return (1); - #if 0 /* * take 'desfree' extra pages, so we reclaim sooner, rather than later ==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 (text+ko) ==== @@ -433,7 +433,7 @@ if (cp != NULL) { len = strlen(cp->provider->name) + strlen("/dev/") + 1; buf = kmem_alloc(len, KM_SLEEP); - + snprintf(buf, len, "/dev/%s", cp->provider->name); spa_strfree(vd->vdev_path); vd->vdev_path = buf; @@ -662,26 +662,6 @@ static void vdev_geom_io_done(zio_t *zio) { - - /* - * If the device returned ENXIO, then attempt we should verify if GEOM - * provider has been removed. If this is the case, then we trigger an - * asynchronous removal of the device. - */ - if (zio->io_error == ENXIO) { - vdev_t *vd = zio->io_vd; - vdev_geom_ctx_t *ctx; - struct g_provider *pp = NULL; - - ctx = vd->vdev_tsd; - if (ctx != NULL && ctx->gc_consumer != NULL) - pp = ctx->gc_consumer->provider; - - if (pp == NULL || (pp->flags & G_PF_ORPHAN)) { - vd->vdev_remove_wanted = B_TRUE; - spa_async_request(zio->io_spa, SPA_ASYNC_REMOVE); - } - } } vdev_ops_t vdev_geom_ops = { ==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 (text+ko) ==== @@ -2538,6 +2538,7 @@ vattr_t oldva; uint_t mask = vap->va_mask; uint_t saved_mask; + uint64_t saved_mode; int trim_mask = 0; uint64_t new_mode; znode_t *attrzp; @@ -2766,6 +2767,13 @@ if (trim_mask) { saved_mask = vap->va_mask; vap->va_mask &= ~trim_mask; + if (trim_mask & AT_MODE) { + /* + * Save the mode, as secpolicy_vnode_setattr() + * will overwrite it with ova.va_mode. + */ + saved_mode = vap->va_mode; + } } err = secpolicy_vnode_setattr(cr, vp, vap, &oldva, flags, (int (*)(void *, int, cred_t *))zfs_zaccess_unix, zp); @@ -2774,8 +2782,16 @@ return (err); } - if (trim_mask) + if (trim_mask) { vap->va_mask |= saved_mask; + if (trim_mask & AT_MODE) { + /* + * Recover the mode after + * secpolicy_vnode_setattr(). + */ + vap->va_mode = saved_mode; + } + } } /* ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#63 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.6 2009/09/06 21:22:24 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.7 2009/10/07 15:40:04 mav Exp $"); #include #include @@ -1259,15 +1259,16 @@ if (!ch->readlog) xpt_freeze_simq(ch->sim, ch->numrslots); - /* Handle command with timeout. */ - ahci_end_transaction(&ch->slot[slot->slot], AHCI_ERR_TIMEOUT); - /* Handle the rest of commands. */ + /* Handle frozen command. */ if (ch->frozen) { union ccb *fccb = ch->frozen; ch->frozen = NULL; fccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ; xpt_done(fccb); } + /* Handle command with timeout. */ + ahci_end_transaction(&ch->slot[slot->slot], AHCI_ERR_TIMEOUT); + /* Handle the rest of commands. */ for (i = 0; i < ch->numslots; i++) { /* Do we have a running request on slot? */ if (ch->slot[i].state < AHCI_SLOT_RUNNING) ==== //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#24 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.227 2009/08/18 21:07:39 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.229 2009/10/07 14:29:48 stas Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -170,6 +170,7 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5720 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5721 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5722 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5723 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5750 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5750M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5751 }, @@ -184,12 +185,21 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5754M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5755 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5755M }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761E }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761S }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5761SE }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5764 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5780 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5780S }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5781 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5782 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5784 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5785F }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5785G }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5786 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5787 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5787F }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5787M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5788 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5789 }, @@ -198,11 +208,19 @@ { BCOM_VENDORID, BCOM_DEVICEID_BCM5903M }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5906 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5906M }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57760 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57780 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57788 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57790 }, { SK_VENDORID, SK_DEVICEID_ALTIMA }, { TC_VENDORID, TC_DEVICEID_3C996 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE4 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE5 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PP250450 }, + { 0, 0 } }; @@ -216,6 +234,7 @@ { BCOM_VENDORID, "Broadcom" }, { SK_VENDORID, "SysKonnect" }, { TC_VENDORID, "3Com" }, + { FJTSU_VENDORID, "Fujitsu" }, { 0, NULL } }; @@ -271,12 +290,18 @@ { BGE_CHIPID_BCM5755_A1, "BCM5755 A1" }, { BGE_CHIPID_BCM5755_A2, "BCM5755 A2" }, { BGE_CHIPID_BCM5722_A0, "BCM5722 A0" }, + { BGE_CHIPID_BCM5761_A0, "BCM5761 A0" }, + { BGE_CHIPID_BCM5761_A1, "BCM5761 A1" }, + { BGE_CHIPID_BCM5784_A0, "BCM5784 A0" }, + { BGE_CHIPID_BCM5784_A1, "BCM5784 A1" }, /* 5754 and 5787 share the same ASIC ID */ { BGE_CHIPID_BCM5787_A0, "BCM5754/5787 A0" }, { BGE_CHIPID_BCM5787_A1, "BCM5754/5787 A1" }, { BGE_CHIPID_BCM5787_A2, "BCM5754/5787 A2" }, { BGE_CHIPID_BCM5906_A1, "BCM5906 A1" }, { BGE_CHIPID_BCM5906_A2, "BCM5906 A2" }, + { BGE_CHIPID_BCM57780_A0, "BCM57780 A0" }, + { BGE_CHIPID_BCM57780_A1, "BCM57780 A1" }, { 0, NULL } }; @@ -297,9 +322,13 @@ { BGE_ASICREV_BCM5780, "unknown BCM5780" }, { BGE_ASICREV_BCM5714, "unknown BCM5714" }, { BGE_ASICREV_BCM5755, "unknown BCM5755" }, + { BGE_ASICREV_BCM5761, "unknown BCM5761" }, + { BGE_ASICREV_BCM5784, "unknown BCM5784" }, + { BGE_ASICREV_BCM5785, "unknown BCM5785" }, /* 5754 and 5787 share the same ASIC ID */ { BGE_ASICREV_BCM5787, "unknown BCM5754/5787" }, { BGE_ASICREV_BCM5906, "unknown BCM5906" }, + { BGE_ASICREV_BCM57780, "unknown BCM57780" }, { 0, NULL } }; @@ -309,6 +338,7 @@ #define BGE_IS_5705_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS) #define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY) #define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS) +#define BGE_IS_5755_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_5755_PLUS) const struct bge_revision * bge_lookup_rev(uint32_t); const struct bge_vendor * bge_lookup_vendor(uint16_t); @@ -1758,9 +1788,8 @@ val = BGE_WDMAMODE_ENABLE | BGE_WDMAMODE_ALL_ATTNS; /* Enable host coalescing bug fix. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5755 || - sc->bge_asicrev == BGE_ASICREV_BCM5787) - val |= 1 << 29; + if (BGE_IS_5755_PLUS(sc)) + val |= BGE_WDMAMODE_STATUS_TAG_FIX; /* Turn on write DMA state machine */ CSR_WRITE_4(sc, BGE_WDMA_MODE, val); @@ -1768,6 +1797,12 @@ /* Turn on read DMA state machine */ val = BGE_RDMAMODE_ENABLE | BGE_RDMAMODE_ALL_ATTNS; + if (sc->bge_asicrev == BGE_ASICREV_BCM5784 || + sc->bge_asicrev == BGE_ASICREV_BCM5785 || + sc->bge_asicrev == BGE_ASICREV_BCM57780) + val |= BGE_RDMAMODE_BD_SBD_CRPT_ATTN | + BGE_RDMAMODE_MBUF_RBD_CRPT_ATTN | + BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN; if (sc->bge_flags & BGE_FLAG_PCIE) val |= BGE_RDMAMODE_FIFO_LONG_BURST; CSR_WRITE_4(sc, BGE_RDMA_MODE, val); @@ -1790,7 +1825,10 @@ CSR_WRITE_4(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE); /* Turn on send data completion state machine */ - CSR_WRITE_4(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE); + val = BGE_SDCMODE_ENABLE; + if (sc->bge_asicrev == BGE_ASICREV_BCM5761) + val |= BGE_SDCMODE_CDELAY; + CSR_WRITE_4(sc, BGE_SDC_MODE, val); /* Turn on send data initiator state machine */ CSR_WRITE_4(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE); @@ -1897,8 +1935,11 @@ const struct bge_vendor *v; uint32_t id; - id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & - BGE_PCIMISCCTL_ASICREV; + id = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >> + BGE_PCIMISCCTL_ASICREV_SHIFT; + if (BGE_ASICREV(id) == BGE_ASICREV_USE_PRODID_REG) + id = pci_read_config(dev, + BGE_PCI_PRODID_ASICREV, 4); br = bge_lookup_rev(id); v = bge_lookup_vendor(vid); { @@ -1915,8 +1956,8 @@ br != NULL ? br->br_name : "NetXtreme Ethernet Controller"); } - snprintf(buf, 96, "%s, %sASIC rev. %#04x", model, - br != NULL ? "" : "unknown ", id >> 16); + snprintf(buf, 96, "%s, %sASIC rev. %#08x", model, + br != NULL ? "" : "unknown ", id); device_set_desc_copy(dev, buf); if (pci_get_subvendor(dev) == DELL_VENDORID) sc->bge_flags |= BGE_FLAG_NO_3LED; @@ -2411,8 +2452,11 @@ /* Save various chip information. */ sc->bge_chipid = - pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & - BGE_PCIMISCCTL_ASICREV; + pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >> + BGE_PCIMISCCTL_ASICREV_SHIFT; + if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_USE_PRODID_REG) + sc->bge_chipid = pci_read_config(dev, BGE_PCI_PRODID_ASICREV, + 4); sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid); sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid); @@ -2431,6 +2475,15 @@ /* Save chipset family. */ switch (sc->bge_asicr