From owner-p4-projects Sun Mar 23 13:46:20 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B519C37B404; Sun, 23 Mar 2003 13:45:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C50B37B401 for ; Sun, 23 Mar 2003 13:45:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 822B543FA3 for ; Sun, 23 Mar 2003 13:45:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2NLjt0U057401 for ; Sun, 23 Mar 2003 13:45:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2NLjtTd057398 for perforce@freebsd.org; Sun, 23 Mar 2003 13:45:55 -0800 (PST) Date: Sun, 23 Mar 2003 13:45:55 -0800 (PST) Message-Id: <200303232145.h2NLjtTd057398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27263 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27263 Change 27263 by marcel@marcel_nfs on 2003/03/23 13:44:53 Round one: if it aint broken, break it. This round redefines all context related structures in terms of the register sets. It includes trapframe, pcb, mcontext, sigframe, ptrace registers and so on. The immediate consequence is that any piece of code that accesses these structures has to be rewritten. Rewriting varies from a simple substitution to a wholesale overhaul. Some pieces have been modified to the extend that compilation is possible. Other pieces have been removed from the compilation by removing functionality (such as DDB). A new file has been added (context.s) that has functions to save and restore register sets (not quite complete). The intend is to call these functions whenever a register set has to be saved or restored. This approach will very likely not yield the most optimal code in some cases, but will improve maintainability in all cases. Maybe in 5 or 10 years we have stabilized enough that we can micro- optimize each individual case, avoid the call overhead and squeeze all the ILP we can get out of it. Future enhancements to these functions will include cycle count collection and frequency statistics to allow us to tune the algorithms and inject lfetch instructions (and shit :-) This branch can only compile SKI now. The kernel will crash and burn as soon as we start to create new threads though. From this moment on it's fixing and rewiting the code to work with the new register sets and to deal with the fact that we may have to use unwinding to construct register sets that are not being saved... With GDB compilable, we can now also work on getting the ptrace interface in shape. Affected files ... .. //depot/projects/ia64_epc/sys/conf/files.ia64#4 edit .. //depot/projects/ia64_epc/sys/ia64/conf/SKI#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#1 add .. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/elf_machdep.c#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/exception.s#4 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/genassym.c#4 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#4 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/swtch.s#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#4 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/vm_machdep.c#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/_regset.h#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/cpu.h#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/db_machdep.h#2 edit .. //depot/projects/ia64_epc/sys/ia64/include/pcb.h#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/reg.h#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/signal.h#3 edit .. //depot/projects/ia64_epc/sys/ia64/include/ucontext.h#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/conf/files.ia64#4 (text+ko) ==== @@ -30,6 +30,7 @@ ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard ia64/ia64/clock_if.m standard +ia64/ia64/context.s standard ia64/ia64/critical.c standard ia64/ia64/db_disasm.c optional ddb ia64/ia64/db_interface.c optional ddb @@ -60,8 +61,8 @@ ia64/ia64/sys_machdep.c standard ia64/ia64/syscall.s standard ia64/ia64/trap.c standard -ia64/ia64/unaligned.c standard -ia64/ia64/unwind.c standard +#ia64/ia64/unaligned.c standard +#ia64/ia64/unwind.c standard ia64/ia64/vga_machdep.c optional vga ia64/ia64/vm_machdep.c standard ia64/isa/isa.c optional isa ==== //depot/projects/ia64_epc/sys/ia64/conf/SKI#2 (text+ko) ==== @@ -32,7 +32,6 @@ options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 -options DDB options FFS #Berkeley Fast Filesystem options INET #InterNETworking options INET6 #IPv6 communications protocols ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#2 (text+ko) ==== @@ -76,23 +76,21 @@ struct db_variable db_regs[] = { /* Misc control/app registers */ -#define DB_MISC_REGS 15 /* make sure this is correct */ +#define DB_MISC_REGS 13 /* make sure this is correct */ {"pc", (db_expr_t*) 0, db_get_pc_reg}, - {"ip", (db_expr_t*) &ddb_regs.tf_cr_iip, FCN_NULL}, - {"psr", (db_expr_t*) &ddb_regs.tf_cr_ipsr, FCN_NULL}, - {"cr.isr", (db_expr_t*) &ddb_regs.tf_cr_isr, FCN_NULL}, - {"cr.ifa", (db_expr_t*) &ddb_regs.tf_cr_ifa, FCN_NULL}, - {"pr", (db_expr_t*) &ddb_regs.tf_pr, FCN_NULL}, - {"ar.rsc", (db_expr_t*) &ddb_regs.tf_ar_rsc, FCN_NULL}, - {"ar.pfs", (db_expr_t*) &ddb_regs.tf_ar_pfs, FCN_NULL}, - {"cr.ifs", (db_expr_t*) &ddb_regs.tf_cr_ifs, FCN_NULL}, - {"ar.bspstore", (db_expr_t*) &ddb_regs.tf_ar_bspstore, FCN_NULL}, - {"ar.rnat", (db_expr_t*) &ddb_regs.tf_ar_rnat, FCN_NULL}, - {"ndirty", (db_expr_t*) &ddb_regs.tf_ndirty, FCN_NULL}, - {"ar.unat", (db_expr_t*) &ddb_regs.tf_ar_unat, FCN_NULL}, - {"ar.ccv", (db_expr_t*) &ddb_regs.tf_ar_ccv, FCN_NULL}, - {"ar.fpsr", (db_expr_t*) &ddb_regs.tf_ar_fpsr, FCN_NULL}, + {"ip", (db_expr_t*) &ddb_regs.tf_special.ip, FCN_NULL}, + {"psr", (db_expr_t*) &ddb_regs.tf_special.psr, FCN_NULL}, + {"cr.isr", (db_expr_t*) &ddb_regs.tf_special.isr, FCN_NULL}, + {"cr.ifa", (db_expr_t*) &ddb_regs.tf_special.ifa, FCN_NULL}, + {"pr", (db_expr_t*) &ddb_regs.tf_special.pr, FCN_NULL}, + {"ar.rsc", (db_expr_t*) &ddb_regs.tf_special.rsc, FCN_NULL}, + {"ar.pfs", (db_expr_t*) &ddb_regs.tf_special.pfs, FCN_NULL}, + {"cr.ifs", (db_expr_t*) &ddb_regs.tf_special.ifs, FCN_NULL}, + {"ar.bspstore", (db_expr_t*) &ddb_regs.tf_special.bspstore, FCN_NULL}, + {"ar.rnat", (db_expr_t*) &ddb_regs.tf_special.rnat, FCN_NULL}, + {"ar.unat", (db_expr_t*) &ddb_regs.tf_special.nat, FCN_NULL}, + {"ar.fpsr", (db_expr_t*) &ddb_regs.tf_special.fpsr, FCN_NULL}, /* Branch registers */ {"rp", (db_expr_t*) &ddb_regs.tf_b[0], FCN_NULL}, ==== //depot/projects/ia64_epc/sys/ia64/ia64/elf_machdep.c#2 (text+ko) ==== @@ -262,8 +262,10 @@ if (ph->p_type == PT_IA_64_UNWIND) { vaddr = ph->p_vaddr + reloc; +#if 0 ia64_add_unwind_table((vm_offset_t)lf->address, vaddr, vaddr + ph->p_memsz); +#endif } ++ph; } @@ -275,6 +277,8 @@ elf_cpu_unload_file(linker_file_t lf) { +#if 0 ia64_delete_unwind_table((vm_offset_t)lf->address); +#endif return (0); } ==== //depot/projects/ia64_epc/sys/ia64/ia64/exception.s#4 (text+ko) ==== @@ -793,7 +793,7 @@ { .mfi alloc r14=ar.pfs,0,0,1,0 // in case we call ast() nop 1 - add r3=TF_CR_IPSR+16,sp + add r3=TF_SPECIAL_PSR+16,sp ;; } { .mmi ==== //depot/projects/ia64_epc/sys/ia64/ia64/genassym.c#4 (text+ko) ==== @@ -93,6 +93,8 @@ ASSYM(PCB_CURRENT_PMAP, offsetof(struct pcb, pcb_current_pmap)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); +ASSYM(PCB_PRESERVED_NAT, offsetof(struct pcb, pcb_preserved.nat)); +ASSYM(PCB_SPECIAL_RP, offsetof(struct pcb, pcb_special.rp)); ASSYM(R_IA64_DIR64LSB, R_IA64_DIR64LSB); ASSYM(R_IA64_FPTR64LSB, R_IA64_FPTR64LSB); @@ -103,11 +105,19 @@ ASSYM(SIZEOF_TRAPFRAME, sizeof(struct trapframe)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); -ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); +ASSYM(TF_SPECIAL_BSP, offsetof(struct trapframe, tf_special.bsp)); +ASSYM(TF_SPECIAL_PFS, offsetof(struct trapframe, tf_special.pfs)); +ASSYM(TF_SPECIAL_PSR, offsetof(struct trapframe, tf_special.psr)); + +ASSYM(UC_MCONTEXT_MC_SPECIAL_BSPSTORE, + offsetof(ucontext_t, uc_mcontext.mc_special.bspstore)); +ASSYM(UC_MCONTEXT_MC_SPECIAL_RNAT, + offsetof(ucontext_t, uc_mcontext.mc_special.rnat)); + ASSYM(VM_MAX_ADDRESS, VM_MAX_ADDRESS); ==== //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#2 (text+ko) ==== @@ -120,7 +120,7 @@ ;; ld8 out0=[out0] ;; - add r16=PCB_RP,out0 // return to mi_startup_trampoline + add r16=PCB_SPECIAL_RP,out0 // return to mi_startup_trampoline movl r17=mi_startup_trampoline ;; st8 [r16]=r17 @@ -267,7 +267,7 @@ mov b6=r8 // transfer to a branch register cover ;; - add r8=UC_MCONTEXT_MC_AR_BSP,r16 // address or mc_ar_bsp + add r8=UC_MCONTEXT_MC_SPECIAL_BSPSTORE,r16 // address or mc_ar_bsp mov r9=ar.bsp // save ar.bsp ;; st8 [r8]=r9 @@ -275,7 +275,7 @@ (p1) br.cond.sptk.few 1f // branch if not switching flushrs // flush out to old bs mov ar.rsc=0 // switch off RSE - add r8=UC_MCONTEXT_MC_AR_RNAT,r16 // address of mc_ar_rnat + add r8=UC_MCONTEXT_MC_SPECIAL_RNAT,r16 // address of mc_ar_rnat ;; mov r9=ar.rnat // value of ar.rnat after flush mov ar.bspstore=r18 // point at new bs @@ -298,11 +298,11 @@ ;; (p1) br.cond.sptk.few 2f // note: p1 is preserved mov ar.rsc=0 - add r8=UC_MCONTEXT_MC_AR_RNAT,r4 // address of mc_ar_rnat + add r8=UC_MCONTEXT_MC_SPECIAL_RNAT,r4 // address of mc_ar_rnat ;; ld8 r9=[r8] ;; - add r8=UC_MCONTEXT_MC_AR_BSP,r4 // address of mc_ar_bsp + add r8=UC_MCONTEXT_MC_SPECIAL_BSPSTORE,r4 // address of mc_ar_bsp ;; ld8 r10=[r8] ;; ==== //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#4 (text+ko) ==== @@ -708,9 +708,9 @@ * XXX what is all this +/- 16 stuff? */ thread0.td_frame = (struct trapframe *)thread0.td_pcb - 1; - thread0.td_pcb->pcb_special.gr[_GR12] = + thread0.td_pcb->pcb_special.sp = (u_int64_t)thread0.td_frame - 16; - thread0.td_pcb->pcb_special.ar_bspstore = (u_int64_t)proc0kstack; + thread0.td_pcb->pcb_special.bspstore = (u_int64_t)proc0kstack; mutex_init(); @@ -804,7 +804,7 @@ PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; frame = td->td_frame; - sp = frame->tf_special.gr[_GR12]; + sp = frame->tf_special.sp; oonstack = sigonstack(sp); rndfsize = ((sizeof(sf) + 15) / 16) * 16; @@ -890,28 +890,28 @@ /* Set up the registers to return to sigcode. */ frame->tf_special.psr &= ~IA64_PSR_RI; frame->tf_special.ip = PS_STRINGS - (esigcode - sigcode); - frame->tf_special.gr[_GR1] = sig; + frame->tf_special.gp = sig; PROC_LOCK(p); if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { - frame->tf_scratch.gr[_GR15] = (u_int64_t)&(sfp->sf_si); + frame->tf_scratch.gr15 = (u_int64_t)&(sfp->sf_si); /* Fill in POSIX parts */ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_special.ifa; } else - frame->tf_scratch.gr[_GR15] = code; + frame->tf_scratch.gr15 = code; - frame->tf_special.gr[_GR12] = (u_int64_t)sfp - 16; - frame->tf_scratch.gr[_GR14] = sig; - frame->tf_scratch.gr[_GR16] = (u_int64_t) &sfp->sf_uc; - frame->tf_scratch.gr[_GR17] = (u_int64_t)catcher; - frame->tf_scratch.gr[_GR18] = sbs; + frame->tf_special.sp = (u_int64_t)sfp - 16; + frame->tf_scratch.gr14 = sig; + frame->tf_scratch.gr16 = (u_int64_t) &sfp->sf_uc; + frame->tf_scratch.gr17 = (u_int64_t)catcher; + frame->tf_scratch.gr18 = sbs; #ifdef DEBUG if (sigdebug & SDB_FOLLOW) printf("sendsig(%d): pc %lx, catcher %lx\n", p->p_pid, - frame->tf_cr_iip, frame->tf_scratch.gr[_GR17]); + frame->tf_cr_iip, frame->tf_scratch.gr17); if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sendsig(%d): sig %d returns\n", p->p_pid, sig); @@ -973,7 +973,7 @@ PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) - if (sigonstack(frame->tf_special.gr[_GR12])) + if (sigonstack(frame->tf_special.sp)) p->p_sigstk.ss_flags |= SS_ONSTACK; else p->p_sigstk.ss_flags &= ~SS_ONSTACK; @@ -1053,7 +1053,7 @@ IA64_PSR_DT | IA64_PSR_RT | IA64_PSR_DFH | IA64_PSR_BN | IA64_PSR_CPL_USER; - frame->tf_special.gr[_GR12] = (stack & ~15) - 16; + frame->tf_special.sp = (stack & ~15) - 16; /* * Write values for out0, out1 and out2 to the user's backing @@ -1061,13 +1061,13 @@ * initial register frame. Assumes that (bspstore & 0x1f8) < * 0x1e0. */ - frame->tf_special.ar_bspstore = td->td_md.md_bspstore + 24; - suword((caddr_t)frame->tf_special.ar_bspstore - 24, stack); - suword((caddr_t)frame->tf_special.ar_bspstore - 16, ps_strings); - suword((caddr_t)frame->tf_special.ar_bspstore - 8, 0); + frame->tf_special.bspstore = td->td_md.md_bspstore + 24; + suword((caddr_t)frame->tf_special.bspstore - 24, stack); + suword((caddr_t)frame->tf_special.bspstore - 16, ps_strings); + suword((caddr_t)frame->tf_special.bspstore - 8, 0); - frame->tf_special.ar_rsc = 0xf; - frame->tf_special.ar_fpsr = IA64_FPSR_DEFAULT; + frame->tf_special.rsc = 0xf; + frame->tf_special.fpsr = IA64_FPSR_DEFAULT; td->td_md.md_flags &= ~MDP_FPUSED; ia64_fpstate_drop(td); @@ -1161,7 +1161,7 @@ /* XXX preserved */ ia64_fpstate_save(td, 0); - fpregs->fpr_highfp = pcb->pcb_highfp; + fpregs->fpr_high = pcb->pcb_high_fp; return (0); } @@ -1175,7 +1175,7 @@ /* XXX preserved */ ia64_fpstate_drop(td); - pcb->pcb_highfp = fpregs->fpr_highfp; + pcb->pcb_high_fp = fpregs->fpr_high; return (0); } @@ -1226,10 +1226,7 @@ ia64_fpstate_save(struct thread *td, int write) { if (td == PCPU_GET(fpcurthread)) { - /* - * Save the state in the pcb. - */ - savehighfp(&td->td_pcb->pcb_highfp); + _get_high_fp(&td->td_pcb->pcb_high_fp); if (write) { td->td_frame->tf_special.psr |= IA64_PSR_DFH; @@ -1264,13 +1261,13 @@ fptd = PCPU_GET(fpcurthread); if (fptd != NULL) { /* Dump the old fp state if its valid. */ - savehighfp(&fptd->td_pcb->pcb_highfp); + _get_high_fp(&fptd->td_pcb->pcb_high_fp); fptd->td_frame->tf_special.psr |= IA64_PSR_DFH; } /* Remember the new FP owner and reload its state. */ PCPU_SET(fpcurthread, td); - restorehighfp(&td->td_pcb->pcb_highfp); + _set_high_fp(&td->td_pcb->pcb_high_fp); td->td_frame->tf_special.psr &= ~IA64_PSR_DFH; td->td_md.md_flags |= MDP_FPUSED; ==== //depot/projects/ia64_epc/sys/ia64/ia64/swtch.s#2 (text+ko) ==== @@ -197,7 +197,7 @@ ENTRY(pcb_restore,0) mov ar.rsc=0 add r9=8,r8 - add r31=PCB_UNAT47,r8 + add r31=PCB_PRESERVED_NAT,r8 ;; ld8 r12=[r8],16 // sp ld8 r30=[r9],16 // ar.unat @@ -438,322 +438,6 @@ END(cpu_switch) /* - * savehighfp: Save f32-f127 - * - * Arguments: - * in0 array of struct ia64_fpreg - */ -ENTRY(savehighfp, 1) - - add r14=16,in0 - ;; - stf.spill [in0]=f32,32 - stf.spill [r14]=f33,32 - ;; - stf.spill [in0]=f34,32 - stf.spill [r14]=f35,32 - ;; - stf.spill [in0]=f36,32 - stf.spill [r14]=f37,32 - ;; - stf.spill [in0]=f38,32 - stf.spill [r14]=f39,32 - ;; - stf.spill [in0]=f40,32 - stf.spill [r14]=f41,32 - ;; - stf.spill [in0]=f42,32 - stf.spill [r14]=f43,32 - ;; - stf.spill [in0]=f44,32 - stf.spill [r14]=f45,32 - ;; - stf.spill [in0]=f46,32 - stf.spill [r14]=f47,32 - ;; - stf.spill [in0]=f48,32 - stf.spill [r14]=f49,32 - ;; - stf.spill [in0]=f50,32 - stf.spill [r14]=f51,32 - ;; - stf.spill [in0]=f52,32 - stf.spill [r14]=f53,32 - ;; - stf.spill [in0]=f54,32 - stf.spill [r14]=f55,32 - ;; - stf.spill [in0]=f56,32 - stf.spill [r14]=f57,32 - ;; - stf.spill [in0]=f58,32 - stf.spill [r14]=f59,32 - ;; - stf.spill [in0]=f60,32 - stf.spill [r14]=f61,32 - ;; - stf.spill [in0]=f62,32 - stf.spill [r14]=f63,32 - ;; - stf.spill [in0]=f64,32 - stf.spill [r14]=f65,32 - ;; - stf.spill [in0]=f66,32 - stf.spill [r14]=f67,32 - ;; - stf.spill [in0]=f68,32 - stf.spill [r14]=f69,32 - ;; - stf.spill [in0]=f70,32 - stf.spill [r14]=f71,32 - ;; - stf.spill [in0]=f72,32 - stf.spill [r14]=f73,32 - ;; - stf.spill [in0]=f74,32 - stf.spill [r14]=f75,32 - ;; - stf.spill [in0]=f76,32 - stf.spill [r14]=f77,32 - ;; - stf.spill [in0]=f78,32 - stf.spill [r14]=f79,32 - ;; - stf.spill [in0]=f80,32 - stf.spill [r14]=f81,32 - ;; - stf.spill [in0]=f82,32 - stf.spill [r14]=f83,32 - ;; - stf.spill [in0]=f84,32 - stf.spill [r14]=f85,32 - ;; - stf.spill [in0]=f86,32 - stf.spill [r14]=f87,32 - ;; - stf.spill [in0]=f88,32 - stf.spill [r14]=f89,32 - ;; - stf.spill [in0]=f90,32 - stf.spill [r14]=f91,32 - ;; - stf.spill [in0]=f92,32 - stf.spill [r14]=f93,32 - ;; - stf.spill [in0]=f94,32 - stf.spill [r14]=f95,32 - ;; - stf.spill [in0]=f96,32 - stf.spill [r14]=f97,32 - ;; - stf.spill [in0]=f98,32 - stf.spill [r14]=f99,32 - ;; - stf.spill [in0]=f100,32 - stf.spill [r14]=f101,32 - ;; - stf.spill [in0]=f102,32 - stf.spill [r14]=f103,32 - ;; - stf.spill [in0]=f104,32 - stf.spill [r14]=f105,32 - ;; - stf.spill [in0]=f106,32 - stf.spill [r14]=f107,32 - ;; - stf.spill [in0]=f108,32 - stf.spill [r14]=f109,32 - ;; - stf.spill [in0]=f110,32 - stf.spill [r14]=f111,32 - ;; - stf.spill [in0]=f112,32 - stf.spill [r14]=f113,32 - ;; - stf.spill [in0]=f114,32 - stf.spill [r14]=f115,32 - ;; - stf.spill [in0]=f116,32 - stf.spill [r14]=f117,32 - ;; - stf.spill [in0]=f118,32 - stf.spill [r14]=f119,32 - ;; - stf.spill [in0]=f120,32 - stf.spill [r14]=f121,32 - ;; - stf.spill [in0]=f122,32 - stf.spill [r14]=f123,32 - ;; - stf.spill [in0]=f124,32 - stf.spill [r14]=f125,32 - ;; - stf.spill [in0]=f126 - stf.spill [r14]=f127 - ;; - br.ret.sptk.few rp - -END(savehighfp) - -/* - * restorehighfp: Restore f32-f127 - * - * Arguments: - * in0 array of struct ia64_fpreg - */ -ENTRY(restorehighfp, 1) - - add r14=16,in0 - ;; - ldf.fill f32=[in0],32 - ldf.fill f33=[r14],32 - ;; - ldf.fill f34=[in0],32 - ldf.fill f35=[r14],32 - ;; - ldf.fill f36=[in0],32 - ldf.fill f37=[r14],32 - ;; - ldf.fill f38=[in0],32 - ldf.fill f39=[r14],32 - ;; - ldf.fill f40=[in0],32 - ldf.fill f41=[r14],32 - ;; - ldf.fill f42=[in0],32 - ldf.fill f43=[r14],32 - ;; - ldf.fill f44=[in0],32 - ldf.fill f45=[r14],32 - ;; - ldf.fill f46=[in0],32 - ldf.fill f47=[r14],32 - ;; - ldf.fill f48=[in0],32 - ldf.fill f49=[r14],32 - ;; - ldf.fill f50=[in0],32 - ldf.fill f51=[r14],32 - ;; - ldf.fill f52=[in0],32 - ldf.fill f53=[r14],32 - ;; - ldf.fill f54=[in0],32 - ldf.fill f55=[r14],32 - ;; - ldf.fill f56=[in0],32 - ldf.fill f57=[r14],32 - ;; - ldf.fill f58=[in0],32 - ldf.fill f59=[r14],32 - ;; - ldf.fill f60=[in0],32 - ldf.fill f61=[r14],32 - ;; - ldf.fill f62=[in0],32 - ldf.fill f63=[r14],32 - ;; - ldf.fill f64=[in0],32 - ldf.fill f65=[r14],32 - ;; - ldf.fill f66=[in0],32 - ldf.fill f67=[r14],32 - ;; - ldf.fill f68=[in0],32 - ldf.fill f69=[r14],32 - ;; - ldf.fill f70=[in0],32 - ldf.fill f71=[r14],32 - ;; - ldf.fill f72=[in0],32 - ldf.fill f73=[r14],32 - ;; - ldf.fill f74=[in0],32 - ldf.fill f75=[r14],32 - ;; - ldf.fill f76=[in0],32 - ldf.fill f77=[r14],32 - ;; - ldf.fill f78=[in0],32 - ldf.fill f79=[r14],32 - ;; - ldf.fill f80=[in0],32 - ldf.fill f81=[r14],32 - ;; - ldf.fill f82=[in0],32 - ldf.fill f83=[r14],32 - ;; - ldf.fill f84=[in0],32 - ldf.fill f85=[r14],32 - ;; - ldf.fill f86=[in0],32 - ldf.fill f87=[r14],32 - ;; - ldf.fill f88=[in0],32 - ldf.fill f89=[r14],32 - ;; - ldf.fill f90=[in0],32 - ldf.fill f91=[r14],32 - ;; - ldf.fill f92=[in0],32 - ldf.fill f93=[r14],32 - ;; - ldf.fill f94=[in0],32 - ldf.fill f95=[r14],32 - ;; - ldf.fill f96=[in0],32 - ldf.fill f97=[r14],32 - ;; - ldf.fill f98=[in0],32 - ldf.fill f99=[r14],32 - ;; - ldf.fill f100=[in0],32 - ldf.fill f101=[r14],32 - ;; - ldf.fill f102=[in0],32 - ldf.fill f103=[r14],32 - ;; - ldf.fill f104=[in0],32 - ldf.fill f105=[r14],32 - ;; - ldf.fill f106=[in0],32 - ldf.fill f107=[r14],32 - ;; - ldf.fill f108=[in0],32 - ldf.fill f109=[r14],32 - ;; - ldf.fill f110=[in0],32 - ldf.fill f111=[r14],32 - ;; - ldf.fill f112=[in0],32 - ldf.fill f113=[r14],32 - ;; - ldf.fill f114=[in0],32 - ldf.fill f115=[r14],32 - ;; - ldf.fill f116=[in0],32 - ldf.fill f117=[r14],32 - ;; - ldf.fill f118=[in0],32 - ldf.fill f119=[r14],32 - ;; - ldf.fill f120=[in0],32 - ldf.fill f121=[r14],32 - ;; - ldf.fill f122=[in0],32 - ldf.fill f123=[r14],32 - ;; - ldf.fill f124=[in0],32 - ldf.fill f125=[r14],32 - ;; - ldf.fill f126=[in0] - ldf.fill f127=[r14] - ;; - br.ret.sptk.few rp - -END(restorehighfp) - -/* * fork_trampoline() * * Arrange for a function to be invoked neatly, after a cpu_switch(). ==== //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Marcel Moolenaar + * Copyright (c) 2002, 2003 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -150,20 +150,20 @@ st8 [r30]=r27,16 // tf_b[2] st8 [r31]=r16,16 // tf_b[3] ;; - st8 [r30]=r17,TF_R_R1-(TF_B+4*8) // tf_b[4] - st8 [r31]=r29,TF_R_R4-(TF_B+5*8) // tf_b[5] + st8 [r30]=r17,-64 // tf_b[4] + st8 [r31]=r29,-64 // tf_b[5] ;; - st8 [r30]=r1,TF_R_R5-TF_R_R1 // tf_r[0] (=r1=gp) + st8 [r30]=r1,-64 // tf_r[0] (=r1=gp) .mem.offset 8,0 st8.spill [r31]=r4,16 // tf_r[3] (=r4) ;; .mem.offset 0,0 st8.spill [r30]=r5,16 // tf_r[4] (=r5) .mem.offset 8,0 - st8.spill [r31]=r6,TF_R_SP-TF_R_R6 // tf_r[5] (=r6) + st8.spill [r31]=r6,-64 // tf_r[5] (=r6) ;; .mem.offset 0,0 - st8.spill [r30]=r7,TF_R_R15-TF_R_R7 // tf_r[6] (=r7) + st8.spill [r30]=r7,-64 // tf_r[6] (=r7) st8 [r31]=r18 // tf_r[11] (=r12=sp) ;; st8 [r30]=r8 // tf_r[14] (syscall number) @@ -193,12 +193,11 @@ mov r19=ar.bsp add sp=-16,sp ;; - add r20=TF_CR_IFS+(8*8),r16 - sub r19=r19,r17 - add r21=TF_NDIRTY+(8*8),r16 + add r20=TF_SPECIAL_PFS+(8*8),r16 + add r21=TF_SPECIAL_BSP+(8*8),r16 ;; st8 [r20]=r18 // tf_cr_ifs - st8 [r21]=r19 // tf_ndirty + st8 [r21]=r19 // tf_as_bsp ;; alloc r14=ar.pfs,0,1,3,0 add loc0=(8*8),r16 @@ -212,18 +211,18 @@ add r15=0,loc0 add r16=SIZEOF_TRAPFRAME,loc0 ;; - add r30=TF_R_R10,r15 - add r31=TF_R_SP,r15 + add r30=0,r15 // R10 + add r31=0,r15 // SP ;; alloc r14=ar.pfs,0,0,0,0 mov ar.k6=r16 - ld8 sp=[r31],TF_R_R9-TF_R_SP // tf_r[11] (r12=sp) + ld8 sp=[r31],-64 // tf_r[11] (r12=sp) ;; ld8 r10=[r30],-16 // tf_r[9] (=r10) - ld8 r9=[r31],TF_R_R1-TF_R_R9 // tf_r[8] (=r9) + ld8 r9=[r31],-64 // tf_r[8] (=r9) ;; - ld8 r8=[r30],TF_B-TF_R_R8 // tf_r[7] (=r8) - ld8 r1=[r31],TF_AR_FPSR-TF_R_R1 // tf_r[0] (=r1=gp) + ld8 r8=[r30],-64 // tf_r[7] (=r8) + ld8 r1=[r31],-64 // tf_r[0] (=r1=gp) ;; ld8 r16=[r30],-32 // tf_b[0] ld8 r17=[r31],-16 // tf_ar_fpsr @@ -266,320 +265,3 @@ br.ret.sptk b6 ;; .endp epc_syscall - - -/* - * _{get|set}_special_sync - * Do not follow runtime convention! - */ -/* - * inputs: r16 struct _special - * r17 return address - */ -ENTRY(_get_special_sync, 0) -{ .mii - flushrs - mov b6=r17 - add r17=8,r16 - ;; -} -{ .mmi - st8 [r16]=r1,16 // gp - st8 [r17]=r12,16 // sp - mov r18=b0 - ;; -} -{ .mmi - st8 [r16]=r13,16 // tp - mov r19=ar.rsc - mov r20=pr - ;; -} -{ .mmi - st8 [r17]=r18,16 // rp - mov ar.rsc=0 - mov r21=ar.pfs - ;; -} -{ .mmb - st8 [r16]=r20,16 // pr - st8 [r17]=r19,16 // ar.rsc - nop 0 - ;; -} -{ .mmi - st8 [r16]=r21,16 // ar.pfs - mov r22=ar.bsp - nop 1 - ;; -} -{ .mmb - st8 [r17]=r22,16 // ar.bspstore - mov r23=ar.rnat - nop 2 - ;; -} -{ .mmi - st8 [r16]=r23 // ar.rnat - mov r24=ar.fpsr - nop 3 - ;; -} -{ .mmb - st8 [r17]=r24 // ar.fpsr - mov ar.rsc=r19 - br.sptk b6 - ;; -} -END(_get_special_sync) - -/* - * inputs: r16 struct _special - */ -ENTRY(_set_special_sync, 0) -{ .mmi - invala - mov ar.rsc=0 - add r17=8,r16 - ;; -} -{ .mmb - ld8 r1=[r16],16 // gp - ld8 r12=[r17],16 // sp - nop 0 - ;; -} -{ .mmb - ld8 r13=[r16],16 // tp - ld8 r18=[r17],16 // rp - nop 1 - ;; -} -{ .mmi - ld8 r19=[r16],16 // pr - ld8 r20=[r17],16 // ar.rsc - mov b0=r18 - ;; -} -{ .mmi - loadrs - ld8 r21=[r16],16 // ar.pfs - mov pr=r19,0x1fffe - ;; -} -{ .mmi - ld8 r22=[r17],16 // ar.bspstore - ld8 r23=[r16] // ar.rnat - mov ar.pfs=r21 - ;; -} -{ .mmb - ld8 r24=[r17] // ar.fpsr - mov ar.bspstore=r22 - nop 2 - ;; -} -{ .mmb - mov ar.rnat=r23 - mov ar.rsc=r20 - nop 3 - ;; -} -{ .mib - mov ar.fpsr=r24 - nop 4 - br.ret.sptk rp - ;; -} -END(_set_special_sync) - -/* - * _{get|set}_callee_saved - */ -ENTRY(_get_callee_saved, 1) -{ .mii - mov r31=ar.unat - add r2=8,in0 - add r3=16,in0 - ;; -} -{ .mmi - .mem.offset 0,0 - st8.spill [r2]=r4,16 // r4 - .mem.offset 8,0 - st8.spill [r3]=r5,16 // r5 - mov r29=b1 - ;; -} -{ .mmi - .mem.offset 16,0 - st8.spill [r2]=r6,16 // r6 - .mem.offset 24,0 - st8.spill [r3]=r7,16 // r7 - mov r28=b2 - ;; -} -{ .mmi - st8 [r2]=r29,16 // b1 - mov r30=ar.unat - mov r27=b3 - ;; -} -{ .mmi - st8 [in0]=r30 // nat - st8 [r3]=r28,16 // b2 - mov r26=b4 - ;; -} -{ .mmi - st8 [r2]=r27,16 // b3 - st8 [r3]=r26,16 // b4 - mov r25=b5 - ;; -} -{ .mmi - st8 [r2]=r25,16 // b5 - st8 [r3]=r31 // ar.unat - mov r24=ar.lc - ;; -} -{ .mfb - st8 [r2]=r24 // ar.lc - nop 0 - br.ret.sptk rp - ;; -} -END(_get_callee_saved) - -ENTRY(_set_callee_saved, 1) -{ .mii - ld8 r31=[in0] // nat - add r2=8,in0 - add r3=16,in0 - ;; -} -{ .mmb - mov ar.unat=r31 - lfetch [r3] >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 23 15:28: 4 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 226D037B404; Sun, 23 Mar 2003 15:28:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBD2A37B401 for ; Sun, 23 Mar 2003 15:28:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76F7143FCB for ; Sun, 23 Mar 2003 15:28:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2NNS10U089873 for ; Sun, 23 Mar 2003 15:28:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2NNS190089870 for perforce@freebsd.org; Sun, 23 Mar 2003 15:28:01 -0800 (PST) Date: Sun, 23 Mar 2003 15:28:01 -0800 (PST) Message-Id: <200303232328.h2NNS190089870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27267 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27267 Change 27267 by marcel@marcel_nfs on 2003/03/23 15:27:32 Fix cut-n-paste bogon. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#2 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#2 (text+ko) ==== @@ -157,10 +157,10 @@ /* * General register sets: - * _get_callee_saved - Save preserved FP registers. - * _set_callee_saved - Restore preserved FP registers. - * _get_caller_saved - Save scratch FP registers. - * _set_caller_saved - Restore scratch FP registers. + * _get_callee_saved - Save preserved registers. + * _set_callee_saved - Restore preserved registers. + * _get_caller_saved - Save scratch registers. + * _set_caller_saved - Restore scratch registers. */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 23 16:50:53 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4106837B407; Sun, 23 Mar 2003 16:50:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAFED37B405 for ; Sun, 23 Mar 2003 16:50:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A5C443F75 for ; Sun, 23 Mar 2003 16:50:43 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2O0oh0U001397 for ; Sun, 23 Mar 2003 16:50:43 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2O0ogmQ001389 for perforce@freebsd.org; Sun, 23 Mar 2003 16:50:42 -0800 (PST) Date: Sun, 23 Mar 2003 16:50:42 -0800 (PST) Message-Id: <200303240050.h2O0ogmQ001389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27270 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27270 Change 27270 by marcel@marcel_nfs on 2003/03/23 16:50:13 Implement _get_caller_saved. This function saves the non-FP, non-stacked scratch registers. The primary (only?) use is to save the scratch registers at interruption and thus determines most of what can and cannot be done. In short: o We don't call this function. We jump to it and explicitly pass the return address to jump back to. o We don't pass arguments in the stacked registers, because we may not have a register stack usable. o We assume the function is called with register bank 0 selected and we have to save the registers in bank 1. This is normal procedure for interrupt handling. o We leave register bank 1 selected on exit. o Assume we cannot use the preserved registers because saving those requires the use of scratch registers, which we're trying to save here. Break the circular dependency with this assumption. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#3 (text+ko) ==== @@ -285,12 +285,142 @@ /* * _get_caller_saved * - * PRECONDITION: Must be called with register bank 0 selected - * POSTCONDITION: Will return with register bank 1 selected + * Does not follow runtime specification: + * inputs: r16 = pointer to struct _caller_saved + * r17 = return address (no call/ret semantics) + * precondition: Must be called with register bank 0 selected, + * + * postcondition: Will return with register bank 1 selected. */ -ENTRY(_get_caller_saved, 1) - br.ret.sptk rp +ENTRY(_get_caller_saved, 0) + mov r18=ar.unat + mov r19=r2 + add r2=8,r16 + mov r20=r3 + add r3=16,r16 + mov r21=r8 + ;; +{ .mmi + .mem.offset 8,0 + st8.spill [r2]=r19,16 // r2 + .mem.offset 16,0 + st8.spill [r3]=r20,16 // r3 + mov r8=r16 + ;; +} +{ .mmi + .mem.offset 24,0 + st8.spill [r2]=r21,16 // r8 + .mem.offset 32,0 + st8.spill [r3]=r9,16 // r9 + mov r9=r17 + ;; +} +{ .mmi + .mem.offset 40,0 + st8.spill [r2]=r10,16 // r10 + .mem.offset 48,0 + st8.spill [r3]=r11,16 // r11 + mov r10=r18 + ;; +} +{ .mmb + .mem.offset 56,0 + st8.spill [r2]=r14,16 // r14 + .mem.offset 64,0 + st8.spill [r3]=r15,16 // r15 + bsw.1 + ;; +} + /* We're using register bank 1 now. */ +{ .mmi + .mem.offset 72,0 + st8.spill [r2]=r16,16 // r16 + .mem.offset 80,0 + st8.spill [r3]=r17,16 // r17 + mov r14=b6 + ;; +} +{ .mmi + .mem.offset 88,0 + st8.spill [r2]=r18,16 // r18 + .mem.offset 96,0 + st8.spill [r3]=r19,16 // r19 + mov r15=b7 + ;; +} +{ .mmi + .mem.offset 104,0 + st8.spill [r2]=r20,16 // r20 + .mem.offset 112,0 + st8.spill [r3]=r21,16 // r21 + mov b6=r9 + ;; +} +{ .mmb + .mem.offset 120,0 + st8.spill [r2]=r22,16 // r22 + .mem.offset 128,0 + st8.spill [r3]=r23,16 // r23 + nop 0 + ;; +} +{ .mmi + .mem.offset 136,0 + st8.spill [r2]=r24,16 // r24 + .mem.offset 144,0 + st8.spill [r3]=r25,16 // r25 + nop 1 + ;; +} +{ .mmb + .mem.offset 152,0 + st8.spill [r2]=r26,16 // r26 + .mem.offset 160,0 + st8.spill [r3]=r27,16 // r27 + nop 2 + ;; +} +{ .mmi + .mem.offset 168,0 + st8.spill [r2]=r28,16 // r28 + .mem.offset 176,0 + st8.spill [r3]=r29,16 // r29 + nop 3 + ;; +} +{ .mmb + .mem.offset 184,0 + st8.spill [r2]=r30,16 // r30 + .mem.offset 192,0 + st8.spill [r3]=r31,16 // r31 + nop 4 + ;; +} +{ .mmi + st8 [r2]=r10,16 // unat (before) + mov r9=ar.unat + nop 5 + ;; +} +{ .mmb + st8 [r3]=r14,16 // b6 + st8 [r2]=r15,16 // b7 + nop 6 + ;; +} +{ .mmi + st8 [r8]=r9,16 // nat (after) + mov r10=ar.ccv + nop 7 + ;; +} +{ .mmb + st8 [r3]=r10 // ccv + st8 [r2]=r0 // __spare + br.sptk b6 ;; +} END(_get_caller_saved) /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 23 18:41:10 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93B6837B404; Sun, 23 Mar 2003 18:41:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 160AA37B401 for ; Sun, 23 Mar 2003 18:41:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16F3A43FF3 for ; Sun, 23 Mar 2003 18:40:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2O2eu0U010662 for ; Sun, 23 Mar 2003 18:40:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2O2euqu010659 for perforce@freebsd.org; Sun, 23 Mar 2003 18:40:56 -0800 (PST) Date: Sun, 23 Mar 2003 18:40:56 -0800 (PST) Message-Id: <200303240240.h2O2euqu010659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27272 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27272 Change 27272 by marcel@marcel_nfs on 2003/03/23 18:40:56 Implement _set_caller_saved This function restores the non-FP, non-stacked scratch registers. It's used in the same context as _get_caller_saved, however things are slughly different. Since the details are not fixed, I assume for now that this function cannot follow the runtime specification but still use RP to branch back (we have no other branch registers free). We have to revisit this when we know how we save and restore the trapframe... Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#4 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#4 (text+ko) ==== @@ -426,10 +426,85 @@ /* * _set_caller_saved * - * PRECONDITION: Must be called with register bank 1 selected - * POSTCONDITION: Will return with register bank 0 selected + * Does not follow runtime specification: + * inputs: r16 = pointer to struct _caller_saved + * r17 = return address (no call/ret semantics) + * precondition: Must be called with register bank 1 selected, + * + * postcondition: Will return with register bank 0 selected. */ -ENTRY(_set_caller_saved, 1) +ENTRY(_set_caller_saved, 0) + ld8 r8=[r16] // nat (after) + add r2=40,r16 + add r3=48,r16 + ;; + mov ar.unat=r8 + mov r8=r16 + mov r9=r17 + ;; + ld8.fill r10=[r2],16 // r10 + ld8.fill r11=[r3],16 // r11 + nop 0 + ;; + ld8.fill r14=[r2],16 // r14 + ld8.fill r15=[r3],16 // r15 + nop 1 + ;; + ld8.fill r16=[r2],16 // r16 + ld8.fill r17=[r3],16 // r17 + nop 2 + ;; + ld8.fill r18=[r2],16 // r18 + ld8.fill r19=[r3],16 // r19 + nop 3 + ;; + ld8.fill r20=[r2],16 // r20 + ld8.fill r21=[r3],16 // r21 + nop 4 + ;; + ld8.fill r22=[r2],16 // r22 + ld8.fill r23=[r3],16 // r23 + nop 5 + ;; + ld8.fill r24=[r2],16 // r24 + ld8.fill r25=[r3],16 // r25 + nop 6 + ;; + ld8.fill r26=[r2],16 // r26 + ld8.fill r27=[r3],16 // r27 + nop 7 + ;; + ld8.fill r28=[r2],16 // r28 + ld8.fill r29=[r3],16 // r29 + nop 8 + ;; + ld8.fill r30=[r2],16 // r30 + ld8.fill r31=[r3],16 // r31 + bsw.0 + ;; + /* We're using register bank 0 now. */ + + ld8 r18=[r2] // unat (before) + add r16=8,r8 + add r17=16,r8 + ld8 r19=[r3] // b6 + add r20=16,r2 + add r21=16,r3 + ;; + ld8.fill r2=[r16],16 // r2 + ld8.fill r3=[r17],16 // r3 + mov rp=r9 + ;; + ld8 r16=[r20] // b7 + ld8 r17=[r21] // ccv + mov b6=r19 + ;; + ld8.fill r8=[r16] // r8 + ld8.fill r9=[r17] // r9 + mov b7=r16 + ;; + mov ar.unat=r18 + mov ar.ccv=r17 br.ret.sptk rp ;; END(_get_called_saved) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 24 11:49:28 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0306837B40C; Mon, 24 Mar 2003 11:48:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E43137B401 for ; Mon, 24 Mar 2003 11:48:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E687443F75 for ; Mon, 24 Mar 2003 11:48:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2OJms0U017769 for ; Mon, 24 Mar 2003 11:48:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2OJml6p017563 for perforce@freebsd.org; Mon, 24 Mar 2003 11:48:47 -0800 (PST) Date: Mon, 24 Mar 2003 11:48:47 -0800 (PST) Message-Id: <200303241948.h2OJml6p017563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27293 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-1.5 required=5.0 tests=X_AUTH_WARNING version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27293 Change 27293 by rwatson@rwatson_tislabs on 2003/03/24 11:47:54 Integrate TrustedBSD base branch to recent 5.x-CURRENT. Remove KerberosIV, various security fixes, etc. No MAC loopback other than removal of freebsd.mac EA name from mac.h. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#35 integrate .. //depot/projects/trustedbsd/base/README#4 integrate .. //depot/projects/trustedbsd/base/bin/chio/chio.1#3 integrate .. //depot/projects/trustedbsd/base/bin/dd/args.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ls/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#16 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#17 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.h#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#15 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#12 integrate .. //depot/projects/trustedbsd/base/bin/sh/machdep.h#3 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/README#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/arithchk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/dmisc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/dtoa.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_Qfmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g__fmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_ddfmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_dfmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_ffmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_xLfmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/g_xfmt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoa.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoa.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoaimp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/gmisc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/hd_init.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/hexnan.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/misc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/smisc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIQ.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoId.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIdd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIg.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtoIxL.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodI.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodg.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtof.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopQ.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopdd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtopxL.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorQ.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtord.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtordd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorxL.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/sum.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/Q.ou0#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/Q.ou1#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/Qtest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/README#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/d.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dI.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dIsi.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dItest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dd.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/ddsi.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/ddtest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dtest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/dtst.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/f.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/ftest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/getround.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/rtestnos#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtoIdSI.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtoIddSI.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtodISI.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtodt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtopddSI.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/strtorddSI.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/testnos#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/testnos1#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/testnos3#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/x.ou0#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/x.ou1#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xL.ou0#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xL.ou1#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xLtest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xQtest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xsum0.out#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/test/xtest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/ulp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#1 branch .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_SU.KOI8-R#2 integrate .. //depot/projects/trustedbsd/base/contrib/nvi/catalog/ru_SU.KOI8-R.base#2 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/b.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/main.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/run.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/COPYRIGHT#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/NEWS#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/PROBLEMS#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/README#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/TODO#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/acinclude.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/aclocal.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/adm_locl.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/ext_srvtab.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kdb_destroy.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kdb_edit.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kdb_init.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kdb_util.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kstash.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/afsutil/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/afsutil/aklog.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/afsutil/kstring2key.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/afsutil/pagsh.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/README.login#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/bsd_locl.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/encrypt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/forkpty.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/kcmd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/klogin.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/krcmd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/login.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/login_access.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/login_fbtab.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/osfc2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/pathnames.h_#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rcmd_util.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rcp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rcp_util.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rlogin.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rlogind.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rsh.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/rshd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/stty_default.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/su.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/sysv_default.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/sysv_default.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/sysv_environ.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/sysv_shadow.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/sysv_shadow.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/tty.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/utmp_login.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/utmpx_login.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/base64.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/base64.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/buffer.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/common.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/glob.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/glob.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/common/sockbuf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/cmds.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/cmdtab.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/domacro.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/extern.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/ftp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/ftp_var.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/globals.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/gssapi.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/kauth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/krb4.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/krb4.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/main.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/ruserpass.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/security.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/security.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/auth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/auth.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/extern.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/ftpcmd.y#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/ftpd_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/gss_userok.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/kauth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/krb4.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/krb4.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/logwtmp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/ls.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftpd/popen.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/encdata.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/kauth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/kauth.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/kauthd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/ksrvtgt.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/marshall.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/rkinit.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kauth/zrefresh#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/common.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/kip-join-network.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/kip.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/kip.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/kipd-control.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/kip/kipd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/sample.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/sample_client.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/sample_server.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/simple.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/simple_client.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/sample/simple_server.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/README.ORIG#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/arpa/telnet.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/auth-proto.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/auth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/auth.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/enc-proto.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/encrypt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/encrypt.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/genget.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/kerberos5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/misc-proto.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/misc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/misc.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/rsaencpwd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/spx.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet.state#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/authenc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/commands.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/defines.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/externs.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/main.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/network.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/ring.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/ring.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/sys_bsd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/telnet.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/telnet_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/terminal.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/types.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnet/utilities.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/authenc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/defs.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/ext.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/global.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/slc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/state.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/sys_term.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/telnetd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/termstat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/utility.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/Makefile.am.common#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/auth-modules.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/broken-glob.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/broken-snprintf.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/broken.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/c-attribute.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/c-function.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/capabilities.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-declaration.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-getpwnam_r-posix.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-man.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-netinet-ip-and-tcp.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-type-extra.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-var.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-x.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/check-xau.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/find-func-no-libs.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/find-func-no-libs2.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/find-func.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/find-if-not-broken.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/grok-type.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/have-pragma-weak.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/have-struct-field.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/have-type.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/have-types.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-find-db.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-func-getcwd-broken.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-func-getlogin.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-ipv6.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-prog-ln-s.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-prog-ranlib.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-prog-yacc.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-struct-sockaddr-sa-len.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-struct-spwd.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-struct-winsize.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-sys-aix.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-sys-nextstep.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/krb-version.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/make-proto.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/mips-abi.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/misc.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/need-proto.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/osfc2.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/proto-compat.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/shared-libs.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/test-package.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/cf/wflags.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/config.guess#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/config.sub#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/configure#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/configure.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/ack.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/dir#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/index.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/install.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/intro.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/kth-krb.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/latin1.tex#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/problems.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/setup.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/doc/whatis.texi#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/eBones-p9.README#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/README#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/default.login#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/fbtab#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/hosts.equiv#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/inetd.conf.changes#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/inetd.conf.changes.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/krb.conf#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/krb.equiv#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/krb.realms#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/login.access#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/etc/services.append#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/bits.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/config.h.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/netdb.x#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/protos.H#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/protos.hin#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/sys/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/sys/socket.x#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/win32/config.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/win32/ktypes.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/win32/roken.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/win32/version.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/include/win32/winconf.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/install-sh#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/Design.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/admin_server.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_funcs.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_locl.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_ser_wrap.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_server.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_server.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadmin.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kpasswd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kpasswd_standalone.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/ksrvutil.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/ksrvutil.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/ksrvutil_get.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/new_pwd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/pw_check.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/pw_check.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/random_password.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kuser/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kuser/kdestroy.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kuser/kinit.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kuser/klist.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kuser/kuser_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/acl/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/acl/acl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/acl/acl_files.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/acl/acl_files.doc#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/afskauthlib/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/afskauthlib/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/afskauthlib/README#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/afskauthlib/verify.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/pam/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/pam/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/pam/README#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/pam/pam.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/pam/pam.conf.add#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/README#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/krb4+c2_matrix.conf#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/krb4_matrix.conf#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/krb5+c2_matrix.conf#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/krb5_matrix.conf#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/posix_getpw.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/security.patch#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/sia.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/auth/sia/sia_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/com_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/com_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/com_right.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/compile_et.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/compile_et.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/error.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/lex.l#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/parse.y#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/com_err/roken_rename.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/check_password.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_err.et#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_locl.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_stream.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_supp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/README.dlfcn#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afskrb.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afskrb5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afsl.exp#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afslib.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afslib.exp#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afssys.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/afssysdefs.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/common.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/dlfcn.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/dlfcn.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/kafs.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kafs/kafs_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/KClient.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/KClient.def#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/KClient.dsp#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/KClient.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/KClient.mak#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/passwd_dialog.rc#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/passwd_dialog.res#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/passwd_dlg.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/passwd_dlg.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kclient/resource.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/copykey.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/kdb_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/kdc.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/krb_cache.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/krb_db.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/krb_dbm.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/krb_kdb_utils.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/krb_lib.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kdb/print_princ.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/check_time.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/cr_err_reply.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/create_auth_reply.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/create_ciph.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/create_death_packet.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/create_ticket.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/debug_decl.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/decomp_ticket.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/defaults.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/dest_tkt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/dllmain.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/encrypt_ktext.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/extra.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_ad_tkt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_cred.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_default_principal.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_host.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_in_tkt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_krbrlm.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_svc_in_tkt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_tf_fullname.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/get_tf_realm.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/getaddrs.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/getfile.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/getrealm.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/getst.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/k_getport.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/k_getsockinst.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/k_localtime.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/kdc_reply.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/klog.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/kntoln.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb-archaeology.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb-protos.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb.def#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb.dsp#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb.h#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb.mak#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb.rc#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_check_auth.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_equiv.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_err.et#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_err_txt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_get_in_tkt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_ip_realm.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_log.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_net_read.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_net_write.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/kuserok.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/lifetime.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/logging.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/lsb_addr_comp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/mk_auth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/mk_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/mk_priv.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/mk_req.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/mk_safe.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/month_sname.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/name2name.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/one.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/parse_name.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/prot.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/rd_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/rd_priv.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/rd_req.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/rd_safe.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/read_service_key.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/realm_parse.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/recvauth.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/resource.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/roken_rename.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/rw.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/save_credentials.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/send_to_kdc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/sendauth.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/sizetest.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/solaris_compat.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/stime.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/str2key.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/tf_util.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/ticket_memory.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/ticket_memory.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/time.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/tkt_string.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/unparse_name.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/verify_user.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/base64.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/base64.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/chown.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/concat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/copyhostent.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/daemon.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/emalloc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/eread.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/erealloc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/errx.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/estrdup.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/ewrite.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/fchown.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/flock.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/fnmatch.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/fnmatch.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/freehostent.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/get_default_username.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/get_window_size.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getarg.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getarg.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getarg.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getcap.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getcwd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getdtablesize.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getegid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/geteuid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getgid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/gethostname.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getipnodebyaddr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getipnodebyname.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getopt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/gettimeofday.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getuid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/getusershell.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/glob.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/glob.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/hstrerror.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/inaddr2str.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/inet_aton.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/inet_pton.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/initgroups.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/innetgr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/iruserok.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/issuid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/k_getpwnam.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/k_getpwuid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/lstat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/make-print-version.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/memmove.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/mini_inetd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/mkstemp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/net_read.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/net_write.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_bytes-test.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_bytes.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_bytes.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_time.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_time.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_units.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/parse_units.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/print_version.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/putenv.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/rcmd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/readv.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/recvmsg.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/resolve.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/resolve.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/resource.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken-common.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken.awk#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken.def#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken.dsp#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken.h.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken.mak#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken.rc#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/roken_gethostby.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/sendmsg.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/setegid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/setenv.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/seteuid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/signal.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/simple_exec.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/snprintf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/socket.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strcat_truncate.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strcollect.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strcpy_truncate.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strdup.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strerror.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strftime.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strlcat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strlcpy.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strlwr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strncasecmp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strndup.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strnlen.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strpftime-test.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strptime.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strsep.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strtok_r.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/strupr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/swab.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/tm2time.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/unsetenv.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/verify.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/verr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/verrx.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/vsyslog.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/vwarn.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/vwarnx.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/warn.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/warnerr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/warnx.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/writev.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/roken/xdbm.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/lex.l#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/make_cmds.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/make_cmds.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/parse.y#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/roken_rename.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/sl.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/sl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/sl_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/ss.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/sl/ss.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/Makefile#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/acl_check.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/afslog.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/ext_srvtab.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/ftp.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/ftpd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/ftpusers.5#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/getusershell.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kadmin.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kadmind.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kafs.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kauth.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kauthd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kdb_destroy.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kdb_edit.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kdb_init.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kdb_util.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kdestroy.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kerberos.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kerberos.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kerberos.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kinit.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/klist.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kpasswd.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kprop.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kpropd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb.conf.5#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb.equiv.5#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb.extra.5#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb.realms.5#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb_realmofhost.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb_sendauth.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/krb_set_tkt_string.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/ksrvtgt.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/ksrvutil.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kstash.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/kuserok.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/login.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/login.access.5#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/pagsh.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/rcp.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/rlogin.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/rlogind.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/rsh.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/rshd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/su.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/telnet.1#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/telnetd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/man/tf_util.3#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/server/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/server/kerberos.c#3 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/slave/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/slave/kprop.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/slave/kprop.h#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/slave/kpropd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/kerberosIV/slave/slav_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/libtelnet/kerberos5.c#4 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#23 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#2 integrate .. //depot/projects/trustedbsd/base/etc/kerberosIV/README#2 delete .. //depot/projects/trustedbsd/base/etc/kerberosIV/krb.conf#2 delete .. //depot/projects/trustedbsd/base/etc/kerberosIV/krb.realms#2 delete .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#13 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#5 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#23 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/Makefile#7 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/ftpd#6 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/gdm#5 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/imap#4 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/kde#4 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/login#9 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/other#7 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/pop3#4 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/sshd#9 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/su#7 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/telnetd#4 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/xdm#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kadmind#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kerberos#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kldxref#1 branch .. //depot/projects/trustedbsd/base/etc/rc.network#18 integrate .. //depot/projects/trustedbsd/base/etc/sysctl.conf#4 integrate .. //depot/projects/trustedbsd/base/games/caesar/caesar.6#2 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#24 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#15 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/murphy#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.sh#5 integrate .. //depot/projects/trustedbsd/base/include/rpc/xdr.h#6 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#16 integrate .. //depot/projects/trustedbsd/base/include/wchar.h#12 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/version.h#7 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libkafs5/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberos5/lib/libkrb5/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libtelnet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/hprop/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/libexec/kadmind/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kpasswdd/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/libexec/telnetd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#6 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kadmin/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kdestroy/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kinit/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/klist/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kpasswd/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/ksu/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/telnet/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/k5stash/Makefile#4 delete .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/kstash/Makefile#1 branch .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberosIV/Makefile#5 delete .. //depot/projects/trustedbsd/base/kerberosIV/Makefile.inc#5 delete .. //depot/projects/trustedbsd/base/kerberosIV/README#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/include/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/include/config.h#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/include/roken.h#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/include/version.h#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libacl/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libkadm/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libkafs/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libkdb/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libkrb/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libroken/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libsl/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/lib/libtelnet/Makefile#4 delete .. //depot/projects/trustedbsd/base/kerberosIV/libexec/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/libexec/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/libexec/kauthd/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/libexec/kipd/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/libexec/kpropd/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/libexec/telnetd/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/share/info/Makefile#4 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/kadmin/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/kauth/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/kdestroy/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/kinit/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/klist/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/ksrvtgt/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.bin/telnet/Makefile#3 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/ext_srvtab/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kadmind/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kdb_destroy/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kdb_edit/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kdb_init/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kdb_util/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kerberos/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kip/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kprop/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/ksrvutil/Makefile#2 delete .. //depot/projects/trustedbsd/base/kerberosIV/usr.sbin/kstash/Makefile#2 delete .. //depot/projects/trustedbsd/base/lib/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/arith.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/alpha/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getusershell.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/arith.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/string/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/string/wcscmp.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/string/wcslen.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/string/wmemchr.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/ia64/arith.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/ia64/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lnumeric.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstod.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstof.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstold.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/arith.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/arith.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetws.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputws.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/hcreate.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strfmon.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.c#11 delete .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strptime.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/socket.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_mem.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_sizeof.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_attr_get_np.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_condattr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_create.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_detach.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_equal.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_exit.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_getspecific.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_join.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_key_create.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_key_delete.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_kill.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutex_init.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutex_unlock.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutexattr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_once.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_schedparam.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_self.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_setspecific.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_sigmask.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_testcancel.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_destroy.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_getvalue.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_init.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_wait.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sigwait.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libcompat/4.1/cftime.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/http.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgeom/geom_stats.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 24 12: 7: 1 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0397037B404; Mon, 24 Mar 2003 12:06:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A45A637B401 for ; Mon, 24 Mar 2003 12:06:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E1B743F75 for ; Mon, 24 Mar 2003 12:06:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2OK6S0U030897 for ; Mon, 24 Mar 2003 12:06:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2OK6NXa030840 for perforce@freebsd.org; Mon, 24 Mar 2003 12:06:23 -0800 (PST) Date: Mon, 24 Mar 2003 12:06:23 -0800 (PST) Message-Id: <200303242006.h2OK6NXa030840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27296 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-1.5 required=5.0 tests=X_AUTH_WARNING version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27296 Change 27296 by rwatson@rwatson_tislabs on 2003/03/24 12:06:17 Integrate TrustedBSD MAC branch from TrustedBSD base; KerberosIV removal, security bugfixes, et al. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#36 integrate .. //depot/projects/trustedbsd/mac/README#5 integrate .. //depot/projects/trustedbsd/mac/bin/chio/chio.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/dd/args.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ls/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ls/extern.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#17 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#25 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#9 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/sh/machdep.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/parseinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/arithchk.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/dmisc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/dtoa.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_Qfmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g__fmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_ddfmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_dfmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_ffmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_xLfmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g_xfmt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoa.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoa.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoaimp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gethex.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gmisc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/hd_init.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/hexnan.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/misc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/smisc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIQ.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoId.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIdd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIg.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIx.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtoIxL.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtod.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodI.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodg.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtof.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopQ.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopdd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopx.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtopxL.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorQ.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtord.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtordd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorx.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorxL.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/sum.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/Q.ou0#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/Q.ou1#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/Qtest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/d.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dI.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dIsi.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dItest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dd.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/ddsi.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/ddtest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dtest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/dtst.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/f.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/ftest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/getround.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/rtestnos#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtoIdSI.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtoIddSI.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtodISI.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtodt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtopddSI.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/strtorddSI.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/testnos#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/testnos1#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/testnos3#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/x.ou0#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/x.ou1#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xL.ou0#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xL.ou1#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xLtest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xQtest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xsum0.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/test/xtest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/ulp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdtoa/xsum0.out#1 branch .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_SU.KOI8-R#2 integrate .. //depot/projects/trustedbsd/mac/contrib/nvi/catalog/ru_SU.KOI8-R.base#2 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/b.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/main.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/run.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/COPYRIGHT#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/NEWS#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/PROBLEMS#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/TODO#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/acconfig.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/acinclude.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/aclocal.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/adm_locl.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/ext_srvtab.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kdb_destroy.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kdb_edit.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kdb_init.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kdb_util.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kstash.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/afsutil/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/afsutil/aklog.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/afsutil/kstring2key.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/afsutil/pagsh.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/README.login#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/bsd_locl.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/encrypt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/forkpty.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/kcmd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/klogin.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/krcmd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/login.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/login_access.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/login_fbtab.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/osfc2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/pathnames.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/pathnames.h_#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rcmd_util.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rcp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rcp_util.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rlogin.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rlogind.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rsh.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/rshd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/stty_default.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/su.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/sysv_default.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/sysv_default.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/sysv_environ.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/sysv_shadow.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/sysv_shadow.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/tty.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/utmp_login.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/utmpx_login.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/base64.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/base64.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/buffer.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/common.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/glob.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/glob.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/common/sockbuf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/cmds.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/cmdtab.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/domacro.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/extern.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/ftp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/ftp_var.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/globals.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/gssapi.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/kauth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/krb4.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/krb4.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/main.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/pathnames.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/ruserpass.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/security.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/security.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/auth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/auth.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/extern.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/ftpcmd.y#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/ftpd_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/gss_userok.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/kauth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/krb4.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/krb4.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/logwtmp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/ls.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/pathnames.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftpd/popen.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/encdata.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/kauth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/kauth.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/kauthd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/ksrvtgt.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/marshall.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/rkinit.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kauth/zrefresh#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/common.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/kip-join-network.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/kip.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/kip.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/kipd-control.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/kip/kipd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/sample.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/sample_client.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/sample_server.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/simple.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/simple_client.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/sample/simple_server.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/README.ORIG#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/arpa/telnet.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/auth-proto.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/auth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/auth.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/enc-proto.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/encrypt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/encrypt.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/genget.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/kerberos5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/misc-proto.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/misc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/misc.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/rsaencpwd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/spx.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet.state#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/authenc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/commands.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/defines.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/externs.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/main.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/network.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/ring.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/ring.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/sys_bsd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/telnet.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/telnet_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/terminal.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/types.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnet/utilities.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/authenc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/defs.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/ext.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/global.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/slc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/state.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/sys_term.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/telnetd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/termstat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/utility.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/Makefile.am.common#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/auth-modules.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/broken-glob.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/broken-snprintf.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/broken.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/c-attribute.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/c-function.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/capabilities.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-declaration.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-getpwnam_r-posix.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-man.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-netinet-ip-and-tcp.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-type-extra.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-var.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-x.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/check-xau.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/find-func-no-libs.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/find-func-no-libs2.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/find-func.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/find-if-not-broken.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/grok-type.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/have-pragma-weak.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/have-struct-field.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/have-type.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/have-types.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-find-db.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-func-getcwd-broken.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-func-getlogin.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-ipv6.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-prog-ln-s.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-prog-ranlib.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-prog-yacc.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-struct-sockaddr-sa-len.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-struct-spwd.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-struct-winsize.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-sys-aix.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-sys-nextstep.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/krb-version.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/make-proto.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/mips-abi.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/misc.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/need-proto.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/osfc2.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/proto-compat.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/shared-libs.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/test-package.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/cf/wflags.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/config.guess#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/config.sub#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/configure#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/configure.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/ack.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/dir#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/index.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/install.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/intro.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/kth-krb.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/latin1.tex#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/problems.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/setup.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/doc/whatis.texi#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/eBones-p9.README#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/default.login#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/fbtab#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/hosts.equiv#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/inetd.conf.changes#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/inetd.conf.changes.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/krb.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/krb.equiv#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/krb.realms#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/login.access#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/etc/services.append#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/bits.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/config.h.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/netdb.x#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/protos.H#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/protos.hin#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/sys/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/sys/socket.x#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/win32/config.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/win32/ktypes.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/win32/roken.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/win32/version.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/include/win32/winconf.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/install-sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/Design.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/admin_server.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_funcs.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_locl.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_ser_wrap.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_server.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_server.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadmin.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kpasswd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kpasswd_standalone.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/ksrvutil.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/ksrvutil.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/ksrvutil_get.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/new_pwd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/pw_check.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/pw_check.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/random_password.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kuser/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kuser/kdestroy.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kuser/kinit.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kuser/klist.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kuser/kuser_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/acl/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/acl/acl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/acl/acl_files.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/acl/acl_files.doc#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/afskauthlib/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/afskauthlib/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/afskauthlib/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/afskauthlib/verify.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/pam/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/pam/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/pam/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/pam/pam.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/pam/pam.conf.add#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/krb4+c2_matrix.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/krb4_matrix.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/krb5+c2_matrix.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/krb5_matrix.conf#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/posix_getpw.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/security.patch#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/sia.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/auth/sia/sia_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/com_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/com_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/com_right.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/compile_et.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/compile_et.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/error.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/lex.l#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/parse.y#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/com_err/roken_rename.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/check_password.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_err.et#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_locl.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_stream.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_supp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/README.dlfcn#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afskrb.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afskrb5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afsl.exp#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afslib.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afslib.exp#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afssys.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/afssysdefs.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/common.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/dlfcn.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/dlfcn.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/kafs.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kafs/kafs_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/KClient.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/KClient.def#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/KClient.dsp#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/KClient.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/KClient.mak#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/passwd_dialog.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/passwd_dialog.res#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/passwd_dlg.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/passwd_dlg.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kclient/resource.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/copykey.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/kdb_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/kdc.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/krb_cache.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/krb_db.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/krb_dbm.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/krb_kdb_utils.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/krb_lib.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kdb/print_princ.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/check_time.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/cr_err_reply.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/create_auth_reply.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/create_ciph.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/create_death_packet.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/create_ticket.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/debug_decl.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/decomp_ticket.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/defaults.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/dest_tkt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/dllmain.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/encrypt_ktext.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/extra.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_ad_tkt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_cred.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_default_principal.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_host.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_in_tkt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_krbrlm.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_svc_in_tkt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_tf_fullname.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/get_tf_realm.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/getaddrs.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/getfile.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/getrealm.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/getst.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/k_getport.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/k_getsockinst.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/k_localtime.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/kdc_reply.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/klog.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/kntoln.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb-archaeology.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb-protos.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb.def#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb.dsp#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb.mak#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_check_auth.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_equiv.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_err.et#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_err_txt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_get_in_tkt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_ip_realm.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_log.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_net_read.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_net_write.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/kuserok.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/lifetime.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/logging.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/lsb_addr_comp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/mk_auth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/mk_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/mk_priv.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/mk_req.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/mk_safe.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/month_sname.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/name2name.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/one.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/parse_name.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/prot.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/rd_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/rd_priv.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/rd_req.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/rd_safe.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/read_service_key.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/realm_parse.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/recvauth.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/resource.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/roken_rename.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/rw.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/save_credentials.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/send_to_kdc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/sendauth.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/sizetest.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/solaris_compat.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/stime.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/str2key.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/tf_util.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/ticket_memory.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/ticket_memory.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/time.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/tkt_string.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/unparse_name.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/verify_user.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/base64.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/base64.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/chown.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/concat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/copyhostent.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/daemon.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/emalloc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/eread.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/erealloc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/errx.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/estrdup.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/ewrite.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/fchown.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/flock.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/fnmatch.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/fnmatch.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/freehostent.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/get_default_username.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/get_window_size.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getarg.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getarg.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getarg.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getcap.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getcwd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getdtablesize.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getegid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/geteuid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getgid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/gethostname.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getipnodebyaddr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getipnodebyname.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getopt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/gettimeofday.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getuid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/getusershell.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/glob.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/glob.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/hstrerror.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/inaddr2str.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/inet_aton.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/inet_pton.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/initgroups.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/innetgr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/iruserok.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/issuid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/k_getpwnam.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/k_getpwuid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/lstat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/make-print-version.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/memmove.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/mini_inetd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/mkstemp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/net_read.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/net_write.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_bytes-test.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_bytes.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_bytes.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_time.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_time.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_units.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/parse_units.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/print_version.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/putenv.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/rcmd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/readv.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/recvmsg.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/resolve.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/resolve.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/resource.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken-common.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken.awk#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken.def#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken.dsp#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken.h.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken.mak#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken.rc#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/roken_gethostby.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/sendmsg.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/setegid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/setenv.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/seteuid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/signal.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/simple_exec.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/snprintf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/socket.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strcat_truncate.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strcollect.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strcpy_truncate.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strdup.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strerror.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strftime.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strlcat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strlcpy.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strlwr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strncasecmp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strndup.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strnlen.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strpftime-test.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strptime.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strsep.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strtok_r.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/strupr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/swab.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/tm2time.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/unsetenv.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/verify.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/verr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/verrx.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/vsyslog.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/vwarn.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/vwarnx.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/warn.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/warnerr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/warnx.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/writev.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/roken/xdbm.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/lex.l#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/make_cmds.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/make_cmds.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/parse.y#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/roken_rename.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/sl.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/sl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/sl_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/ss.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/sl/ss.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/acl_check.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/afslog.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/ext_srvtab.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/ftp.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/ftpd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/ftpusers.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/getusershell.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kadmin.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kadmind.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kafs.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kauth.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kauthd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kdb_destroy.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kdb_edit.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kdb_init.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kdb_util.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kdestroy.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kerberos.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kerberos.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kerberos.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kinit.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/klist.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kpasswd.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kprop.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kpropd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb.conf.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb.equiv.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb.extra.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb.realms.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb_realmofhost.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb_sendauth.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/krb_set_tkt_string.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/ksrvtgt.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/ksrvutil.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kstash.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/kuserok.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/login.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/login.access.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/pagsh.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/rcp.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/rlogin.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/rlogind.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/rsh.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/rshd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/su.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/telnet.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/telnetd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/man/tf_util.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/server/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/server/kerberos.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/slave/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/slave/kprop.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/slave/kprop.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/slave/kpropd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/slave/slav_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_eay.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/telnet/libtelnet/kerberos5.c#4 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#24 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#2 integrate .. //depot/projects/trustedbsd/mac/etc/kerberosIV/README#2 delete .. //depot/projects/trustedbsd/mac/etc/kerberosIV/krb.conf#2 delete .. //depot/projects/trustedbsd/mac/etc/kerberosIV/krb.realms#2 delete .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#11 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#7 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#21 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/ftpd#6 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/gdm#5 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/imap#4 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/kde#4 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/login#9 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/other#7 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/pop3#4 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/sshd#9 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/su#7 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/telnetd#4 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/xdm#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kadmind#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kerberos#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kldxref#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.network#17 integrate .. //depot/projects/trustedbsd/mac/etc/sysctl.conf#4 integrate .. //depot/projects/trustedbsd/mac/games/caesar/caesar.6#2 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#23 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#15 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/murphy#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.sh#5 integrate .. //depot/projects/trustedbsd/mac/include/rpc/xdr.h#6 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#15 integrate .. //depot/projects/trustedbsd/mac/include/wchar.h#11 integrate .. //depot/projects/trustedbsd/mac/kerberos5/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/kerberos5/include/version.h#7 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libkafs5/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberos5/lib/libkrb5/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libtelnet/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/hprop/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/hpropd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/k5admind/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/libexec/k5passwdd/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kadmind/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kdc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kpasswdd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/libexec/telnetd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5admin/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5destroy/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5init/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5list/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5passwd/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5su/Makefile#6 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/kadmin/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/kdestroy/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/kinit/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/klist/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/kpasswd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/ksu/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/telnet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/k5stash/Makefile#4 delete .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/kstash/Makefile#1 branch .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/ktutil/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberosIV/Makefile#5 delete .. //depot/projects/trustedbsd/mac/kerberosIV/Makefile.inc#5 delete .. //depot/projects/trustedbsd/mac/kerberosIV/README#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/include/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/include/config.h#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/include/roken.h#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/include/version.h#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/Makefile.inc#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libacl/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libkadm/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libkafs/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libkdb/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libkrb/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libroken/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libsl/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/lib/libtelnet/Makefile#4 delete .. //depot/projects/trustedbsd/mac/kerberosIV/libexec/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/libexec/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/libexec/kauthd/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/libexec/kipd/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/libexec/kpropd/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/libexec/telnetd/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/share/info/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/kadmin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/kauth/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/kdestroy/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/kinit/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/klist/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/ksrvtgt/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.bin/telnet/Makefile#3 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/ext_srvtab/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kadmind/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kdb_destroy/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kdb_edit/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kdb_init/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kdb_util/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kerberos/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kip/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kprop/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/ksrvutil/Makefile#2 delete .. //depot/projects/trustedbsd/mac/kerberosIV/usr.sbin/kstash/Makefile#2 delete .. //depot/projects/trustedbsd/mac/lib/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/arith.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/alpha/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getusershell.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/arith.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/string/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/string/wcscmp.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/string/wcslen.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/string/wmemchr.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/ia64/arith.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/ia64/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lnumeric.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstod.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstof.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstold.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/arith.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/arith.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/stdlib/gdtoa.mk#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetws.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputws.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/hcreate.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strfmon.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#11 delete .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strptime.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/open.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigaction.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/socket.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_mem.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_sizeof.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_attr_get_np.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_condattr.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_create.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_detach.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_equal.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_exit.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_getspecific.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_join.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_key_create.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_key_delete.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_kill.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutex_init.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutex_unlock.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutexattr.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_once.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_schedparam.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_self.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_setspecific.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_sigmask.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_testcancel.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sem_destroy.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sem_getvalue.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sem_init.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sem_wait.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sigwait.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libcompat/4.1/cftime.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/devstat.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#22 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/ftp.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/http.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libgeom/geom_stats.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_set_policy.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm.3#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 24 13:39: 2 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7293537B404; Mon, 24 Mar 2003 13:38:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E52637B401 for ; Mon, 24 Mar 2003 13:38:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04FE243FA3 for ; Mon, 24 Mar 2003 13:38:33 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2OLcW0U054584 for ; Mon, 24 Mar 2003 13:38:32 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2OLcVY0054580 for perforce@freebsd.org; Mon, 24 Mar 2003 13:38:31 -0800 (PST) Date: Mon, 24 Mar 2003 13:38:31 -0800 (PST) Message-Id: <200303242138.h2OLcVY0054580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 27305 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-3.7 required=5.0 tests=AWL,LARGE_COLLECTION,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27305 Change 27305 by jhb@jhb_laptop on 2003/03/24 13:38:25 IFC @27302. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#11 integrate .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#11 integrate .. //depot/projects/smpng/sys/conf/NOTES#39 integrate .. //depot/projects/smpng/sys/conf/files.i386#37 integrate .. //depot/projects/smpng/sys/conf/files.pc98#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#33 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/em/LICENSE#2 integrate .. //depot/projects/smpng/sys/dev/em/README#6 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#17 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#12 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#10 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/md/md.c#31 integrate .. //depot/projects/smpng/sys/dev/syscons/apm/apm_saver.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#47 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#21 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#15 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#6 integrate .. //depot/projects/smpng/sys/geom/geom.h#21 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.h#1 branch .. //depot/projects/smpng/sys/geom/geom_dev.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_ext.h#1 branch .. //depot/projects/smpng/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#8 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/smpng/sys/geom/notes#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/smpng/sys/i386/apm/apm.c#9 delete .. //depot/projects/smpng/sys/i386/apm/apm.h#2 delete .. //depot/projects/smpng/sys/i386/bios/apm.c#1 branch .. //depot/projects/smpng/sys/i386/bios/apm.h#1 branch .. //depot/projects/smpng/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/smpng/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/smpng/sys/i386/bios/smapi.c#1 branch .. //depot/projects/smpng/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/smpng/sys/i386/bios/smbios.c#1 branch .. //depot/projects/smpng/sys/i386/bios/vpd.c#1 branch .. //depot/projects/smpng/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#15 integrate .. //depot/projects/smpng/sys/i386/include/smapi.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#23 integrate .. //depot/projects/smpng/sys/i386/isa/if_le.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.c#18 integrate .. //depot/projects/smpng/sys/i386/isa/mca_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/spkr.c#11 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#28 integrate .. //depot/projects/smpng/sys/i386/smapi/smapi.c#3 delete .. //depot/projects/smpng/sys/i386/smapi/smapi_bios.S#2 delete .. //depot/projects/smpng/sys/i386/smapi/smapi_isa.c#2 delete .. //depot/projects/smpng/sys/i386/smapi/smapi_var.h#2 delete .. //depot/projects/smpng/sys/ia64/conf/GENERIC#29 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#11 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#66 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#95 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#35 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/smpng/sys/modules/apm/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/smapi/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#23 integrate .. //depot/projects/smpng/sys/net/if_arp.h#3 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#17 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.h#5 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#31 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#15 integrate .. //depot/projects/smpng/sys/pc98/pc98/spkr.c#9 delete .. //depot/projects/smpng/sys/pci/if_dc.c#27 integrate .. //depot/projects/smpng/sys/pci/if_de.c#8 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#26 integrate .. //depot/projects/smpng/sys/sys/ata.h#12 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#17 integrate .. //depot/projects/smpng/sys/sys/mac.h#13 integrate .. //depot/projects/smpng/sys/sys/mutex.h#35 integrate .. //depot/projects/smpng/sys/sys/systm.h#39 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#27 (text+ko) ==== @@ -18,13 +18,12 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.156 2003/02/13 22:24:43 obrien Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.157 2003/03/22 14:18:22 ru Exp $ machine alpha cpu EV4 cpu EV5 ident GENERIC -maxusers 0 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#11 (text+ko) ==== @@ -25,7 +25,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/sys/alpha/linux/linux_sysvec.c,v 1.84 2002/09/01 21:41:22 jake Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.85 2003/03/21 19:49:33 jhb Exp $ */ /* XXX we use functions that might not exist. */ @@ -75,25 +75,26 @@ void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); -static int elf_linux_fixup(long **stack_base, +static int elf_linux_fixup(register_t **stack_base, struct image_params *iparams); static int exec_linux_imgact_try(struct image_params *iparams); static int -elf_linux_fixup(long **stack_base, struct image_params *imgp) +elf_linux_fixup(register_t **stack_base, struct image_params *imgp) { - long *pos; Elf64_Auxargs *args; + register_t *pos; + KASSERT(curthread->td_proc == imgp->proc && + (curthread->td_proc->p_flag & P_THREADED) == 0, + ("unsafe elf_linux_fixup(), should be curproc")); args = (Elf64_Auxargs *)imgp->auxargs; pos = *stack_base + (imgp->argc + imgp->envc + 2); - if (args->trace) { + if (args->trace) AUXARGS_ENTRY(pos, AT_DEBUG, 1); - } - if (args->execfd != -1) { + if (args->execfd != -1) AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); - } AUXARGS_ENTRY(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY(pos, AT_PHENT, args->phent); AUXARGS_ENTRY(pos, AT_PHNUM, args->phnum); @@ -101,19 +102,17 @@ AUXARGS_ENTRY(pos, AT_FLAGS, args->flags); AUXARGS_ENTRY(pos, AT_ENTRY, args->entry); AUXARGS_ENTRY(pos, AT_BASE, args->base); - PROC_LOCK(imgp->proc); AUXARGS_ENTRY(pos, AT_UID, imgp->proc->p_ucred->cr_ruid); AUXARGS_ENTRY(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid); AUXARGS_ENTRY(pos, AT_GID, imgp->proc->p_ucred->cr_rgid); AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid); - PROC_UNLOCK(imgp->proc); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); imgp->auxargs = NULL; (*stack_base)--; - **stack_base = (long)imgp->argc; + **stack_base = (register_t)imgp->argc; return 0; } ==== //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#9 (text+ko) ==== @@ -30,7 +30,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/sys/alpha/osf1/imgact_osf1.c,v 1.17 2003/02/19 05:46:56 imp Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.18 2003/03/21 21:49:52 jhb Exp $ */ #include @@ -96,12 +96,14 @@ vm_offset_t tsize; struct nameidata *ndp; Osf_Auxargs *osf_auxargs; + struct thread *td; GIANT_REQUIRED; execp = (const struct ecoff_exechdr*)imgp->image_header; eap = &execp->a; ndp = NULL; + td = FIRST_THREAD_IN_PROC(imgp->proc); /* check to make sure we have an alpha ecoff executable */ if (ECOFF_BADMAG(execp)) @@ -137,14 +139,15 @@ ndp = (struct nameidata *)malloc(sizeof(struct nameidata), M_TEMP, M_WAITOK); NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME, UIO_SYSSPACE, - "/compat/osf1/sbin/loader", - FIRST_THREAD_IN_PROC(imgp->proc)); + "/compat/osf1/sbin/loader", td); error = namei(ndp); if (error) { uprintf("imgact_osf1: can't read /compat/osf1/sbin/loader\n"); free(imgp->auxargs, M_TEMP); + free(ndp, M_TEMP); return(error); - } + } + NDFREE(ndp, NDF_ONLY_PNBUF); if (imgp->vp) { vput(imgp->vp); /* leaking in the nameizone ??? XXX */ @@ -192,7 +195,7 @@ VM_PROT_READ|VM_PROT_EXECUTE, VM_PROT_ALL, MAP_FIXED|MAP_COPY, (caddr_t)imgp->vp, ECOFF_TXTOFF(execp)))) { DPRINTF(("%s(%d): error = %d\n", __FILE__, __LINE__, error)); - return error; + goto bail; } /* .. data .. */ if ((error = vm_mmap(&vmspace->vm_map, &daddr, dsize, @@ -238,9 +241,9 @@ bail: free(imgp->auxargs, M_TEMP); if (ndp) { - VOP_CLOSE(ndp->ni_vp, FREAD, imgp->proc->p_ucred, - FIRST_THREAD_IN_PROC(imgp->proc)); + VOP_CLOSE(ndp->ni_vp, FREAD, td->td_ucred, td); vrele(ndp->ni_vp); + free(ndp, M_TEMP); } return(error); } ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#11 (text+ko) ==== @@ -27,7 +27,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/sys/compat/svr4/svr4_sysvec.c,v 1.29 2003/02/19 05:46:59 imp Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.30 2003/03/21 19:49:34 jhb Exp $ */ /* XXX we use functions that might not exist. */ @@ -206,17 +206,19 @@ static int svr4_fixup(register_t **stack_base, struct image_params *imgp) { - Elf32_Auxargs *args = (Elf32_Auxargs *)imgp->auxargs; + Elf32_Auxargs *args; register_t *pos; + KASSERT(curthread->td_proc == imgp->proc && + (curthread->td_proc->p_flag & P_THREADED) == 0, + ("unsafe svr4_fixup(), should be curproc")); + args = (Elf32_Auxargs *)imgp->auxargs; pos = *stack_base + (imgp->argc + imgp->envc + 2); - if (args->trace) { + if (args->trace) AUXARGS_ENTRY(pos, AT_DEBUG, 1); - } - if (args->execfd != -1) { + if (args->execfd != -1) AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); - } AUXARGS_ENTRY(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY(pos, AT_PHENT, args->phent); AUXARGS_ENTRY(pos, AT_PHNUM, args->phnum); @@ -224,19 +226,17 @@ AUXARGS_ENTRY(pos, AT_FLAGS, args->flags); AUXARGS_ENTRY(pos, AT_ENTRY, args->entry); AUXARGS_ENTRY(pos, AT_BASE, args->base); - PROC_LOCK(imgp->proc); AUXARGS_ENTRY(pos, AT_UID, imgp->proc->p_ucred->cr_ruid); AUXARGS_ENTRY(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid); AUXARGS_ENTRY(pos, AT_GID, imgp->proc->p_ucred->cr_rgid); AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid); - PROC_UNLOCK(imgp->proc); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); imgp->auxargs = NULL; (*stack_base)--; - **stack_base = (int)imgp->argc; + **stack_base = (register_t)imgp->argc; return 0; } ==== //depot/projects/smpng/sys/conf/NOTES#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1139 2003/03/11 22:47:05 sam Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1140 2003/03/22 14:18:21 ru Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -44,9 +44,9 @@ # # The `maxusers' parameter controls the static sizing of a number of -# internal system tables by a formula defined in subr_param.c. Setting -# maxusers to 0 will cause the system to auto-size based on physical -# memory. +# internal system tables by a formula defined in subr_param.c. +# Omitting this parameter or setting it to 0 will cause the system to +# auto-size based on physical memory. # maxusers 10 ==== //depot/projects/smpng/sys/conf/files.i386#37 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.438 2003/02/28 21:59:13 ru Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.441 2003/03/24 19:40:54 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,7 +189,12 @@ no-obj no-implicit-rule before-depend \ clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin" # -i386/apm/apm.c optional apm +i386/bios/apm.c optional apm +i386/bios/mca_machdep.c optional mca +i386/bios/smapi.c optional smapi +i386/bios/smapi_bios.S optional smapi +i386/bios/smbios.c optional smbios +i386/bios/vpd.c optional vpd i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard @@ -271,7 +276,6 @@ i386/isa/isa_dma.c optional isa i386/isa/istallion.c optional stli nowerror i386/isa/loran.c optional loran -i386/isa/mca_machdep.c optional mca i386/isa/mse.c optional mse i386/isa/npx.c optional npx i386/isa/pcaudio.c optional pca @@ -301,9 +305,6 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_cfgreg.c optional pci i386/pci/pci_bus.c optional pci -i386/smapi/smapi.c optional smapi isa -i386/smapi/smapi_isa.c optional smapi isa -i386/smapi/smapi_bios.S optional smapi isa i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" ==== //depot/projects/smpng/sys/conf/files.pc98#37 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.265 2003/02/28 21:59:13 ru Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.266 2003/03/24 21:01:53 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -239,6 +239,7 @@ i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine +i386/isa/spkr.c optional speaker i386/isa/spigot.c count spigot i386/isa/stallion.c optional stl nowerror i386/isa/tw.c count tw @@ -379,7 +380,6 @@ pc98/pc98/scvtbpc98.c optional sc pc98/pc98/sio.c optional sio pc98/pc98/sio_cbus.c optional sio isa -pc98/pc98/spkr.c optional speaker pc98/pc98/syscons.c optional sc pc98/pc98/syscons_pc98.c optional sc pc98/pc98/wd.c count wdc ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#33 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/ata-all.c,v 1.172 2003/03/18 08:45:20 phk Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.173 2003/03/22 12:18:20 mux Exp $ */ #include "opt_ata.h" @@ -304,6 +304,11 @@ if (cmd != IOCATA) return ENOTTY; + if (iocmd->cmd == ATAGMAXCHANNEL) { + iocmd->u.maxchan = devclass_get_maxunit(ata_devclass); + return 0; + } + if (iocmd->channel < -1 || iocmd->device < -1 || iocmd->device > SLAVE) return ENXIO; ==== //depot/projects/smpng/sys/dev/awi/if_awi_pccard.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/sys/dev/awi/if_awi_pccard.c,v 1.8 2002/11/14 23:54:49 sam Exp $ + * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.9 2003/03/21 22:02:58 ru Exp $ */ #include @@ -281,3 +281,4 @@ extern devclass_t awi_devclass; DRIVER_MODULE(awi, pccard, awi_pccard_driver, awi_devclass, 0, 0); +MODULE_DEPEND(awi, rc4, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/em/LICENSE#2 (text+ko) ==== @@ -1,5 +1,5 @@ -$FreeBSD: src/sys/dev/em/LICENSE,v 1.1 2003/01/07 19:36:00 pdeuskar Exp $ -Copyright (c) 2001-2002, Intel Corporation +$FreeBSD: src/sys/dev/em/LICENSE,v 1.2 2003/03/21 21:47:30 pdeuskar Exp $ +Copyright (c) 2001-2003, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without ==== //depot/projects/smpng/sys/dev/em/README#6 (text+ko) ==== @@ -1,14 +1,14 @@ -$FreeBSD: src/sys/dev/em/README,v 1.5 2002/12/23 19:11:23 pdeuskar Exp $ +$FreeBSD: src/sys/dev/em/README,v 1.6 2003/03/21 21:47:30 pdeuskar Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ -November 12, 2002 +February 5, 2003 Contents ======== -- In This Release +- Overview - Supported Adapters - Building and Installation - Speed and Duplex Configuration @@ -18,17 +18,12 @@ - License -In This Release -=============== +Overview +======== -This file describes the FreeBSD* driver, version 1.4.x, for the Intel(R) +This file describes the FreeBSD* driver, version 1.5.x, for the Intel(R) PRO/1000 Family of Adapters. This driver has been developed for use with -FreeBSD, version 4.7. As a new feature for this release, the driver is now -compiled by default into the FreeBSD 4.7 kernel. - -The driver supports Transmit/Receive Checksum Offload and Jumbo Frames on -all but the 82542-based adapters. For specific adapters, refer to the -Supported Adapters section below. +FreeBSD, version 4.7. For questions related to hardware requirements, refer to the documentation supplied with your Intel PRO/1000 adapter. All hardware requirements listed @@ -56,8 +51,9 @@ 82544 PRO/1000 XF Server Adapter A50484-xxx 82544 PRO/1000 T Desktop Adapter A62947-xxx - - 82540 PRO/1000 MT Desktop Adapter A78708-xxx + + 82540 PRO/1000 MT Desktop Adapter A78408-xxx + 82541 C91016-xxx 82545 PRO/1000 MT Server Adapter A92165-xxx @@ -70,6 +66,7 @@ 82546 PRO/1000 MF Dual Port Server Adapter A91620-xxx + To verify your Intel adapter is supported, find the board ID number on the adapter. Look for a label that has a barcode and a number in the format of 123456-001 (six digits hyphen three digits). Match this to the list of @@ -88,77 +85,90 @@ Building and Installation ========================= -NOTE: You must have kernel sources installed in order to compile the driver - module. +NOTE: The driver can be installed as a dynamic loadable kernel module or + compiled into the kernel. You must have kernel sources installed in + order to compile the driver module. - In the instructions below, x.x.x is the driver version as indicated in - the name of the driver tar. - +In the instructions below, x.x.x is the driver version as indicated in the +name of the driver tar file. 1. Move the base driver tar file to the directory of your choice. For example, use /home/username/em or /usr/local/src/em. 2. Untar/unzip the archive: - tar xfz em-x.x.x.tar.gz + tar xvfz em-x.x.x.tar.gz + + This will create an em-x.x.x directory. + +3. To create a loadable module, perform the following steps. + NOTE: To compile the driver into the kernel, go directly to step 4. + + a. To compile the module + + cd em-x.x.x + make + + b. To install the compiled module in system directory: + + make install + + c. If you want the driver to load automatically when the system is booted: -3. To load the driver onto a running system: + 1. Follow steps a, and b above to compile and install the module + 2. Edit /boot/loader.conf, and add the following line: - cd em-x.x.x/modules - kldload ./if_em.ko + if_em_load="YES" -4. To assign an IP address to the interface, enter the following: +4. To compile the driver into the kernel: - ifconfig em + cd em-x.x.x/src -5. Verify that the interface works. Enter the following, where - is the IP address for another machine on the same subnet as the interface - that is being tested: + cp if_em* /usr/src/sys/dev/em - ping + cp Makefile /usr/src/sys/modules/em -6. If you want the driver to load automatically when the system is booted: + Edit the /usr/src/sys/conf/files.i386 file, and add the following lines: - cd em-x.x.x/modules - cp if_em.ko /modules - - Edit /boot/loader.conf, and add the following line: - - if_em_load="YES" + dev/em/if_em.c optional em - OR + dev/em/if_em_hw.c optional em - compile the driver into the kernel (see item 7). + Remove the following lines from the /usr/src/sys/conf/files.i386 file, + if they exist: + dev/em/if_em_fxhw.c optional em + dev/em/if_em_phy.c optional em - Edit /etc/rc.conf, and create the appropriate ifconfig_em - entry: + Edit the kernel configuration file (i.e., GENERIC or MYKERNEL) in + /usr/src/sys/i386/conf, and ensure the following line is present: - ifconfig_em="" + device em - Example usage: + Compile and install the kernel. The system must be rebooted for the kernel + updates to take effect. For additional information on compiling the + kernel, consult the FreeBSD operating system documentation. - ifconfig_em0="inet 192.168.10.1 netmask 255.255.255.0" +5. To assign an IP address to the interface, enter the following: - NOTE: For assistance, see the ifconfig man page. + ifconfig em -7. If you want to compile the driver into the kernel, enter: +6. Verify that the interface works. Enter the following, where + is the IP address for another machine on the same subnet as the interface + that is being tested: - cd em-x.x.x/src - cp if_em* /usr/src/sys/dev/em - cp Makefile /usr/src/sys/modules/em + ping - Edit the /usr/src/sys/conf/files.i386 file, and add the following line: +7. To configure the IP address to remain after reboot, edit /etc/rc.conf, + and create the appropriate ifconfig_em entry: - dev/em/if_em_hw.c optional em + ifconfig_em="" - Remove the following lines from the /usr/src/sys/conf/files.i386 file, if - they exist: + Example usage: - /dev/em/if_em_fx_hw.c optional em - /dev/em/if_em_phy.c optional em + ifconfig_em0="inet 192.168.10.1 netmask 255.255.255.0" - Compile and install the kernel. + NOTE: For assistance, see the ifconfig man page. Speed and Duplex Configuration @@ -198,47 +208,79 @@ Additional Configurations ========================= +The driver supports Transmit/Receive Checksum Offload and Jumbo Frames on +all but the 82542-based adapters. For specific adapters, refer to the +Supported Adapters section. + Jumbo Frames ------------ - To enable Jumbo Frames, use the ifconfig utility to increase the MTU beyond 1500 bytes. - NOTE: Only enable Jumbo Frames if your network infrastructure supports - them. + NOTES: Only enable Jumbo Frames if your network infrastructure supports + them. + + The Jumbo Frames setting on the switch must be set to at least + 22 bytes larger than that of the adapter. + + The Jumbo Frames MTU range for Intel Adapters is 1500 to 16114. The default + MTU range is 1500. To modify the setting, enter the following: + + ifconfig em mtu 9000 - The MTU range for Jumbo Frames is 1500 to 16114. For example, enter the - following: + To confirm an interface's MTU value, use the ifconfig command. To confirm + the MTU used between two specific devices, use: - ifconfig em mtu 9000 + route get VLANs ----- + To create a new VLAN pseudo-interface: + + ifconfig create + + To associate the VLAN pseudo-interface with a physical interface and + assign a VLAN ID, IP address, and netmask: + + ifconfig netmask vlan + vlandev + + Example: + + ifconfig vlan10 10.0.0.1 netmask 255.255.255.0 vlan10 vlandev em0 + + In this example, all packets will be marked on egress with 802.1Q VLAN + tags, specifying a VLAN ID of 10. - To enable VLANs in the kernel, modify the config file as follows: + To remove a VLAN pseudo-interface: + + ifconfig destroy - pseudo-device vlan + Polling + ------- + To enable polling in the driver, add the following options to the kernel + configuration, and then recompile the kernel: - Then, recompile the kernel and reboot. + options DEVICE_POLLING + options HZ=1000 - To see the VLAN device entries, use ifconfig. + At runtime, use the following command to turn on polling mode. Similarly, + turn off polling mode by setting the variable to 0: - To attach a VLAN to the driver enter the following: + sysctl kern.polling.enable=1 - ifconfig vlan0 inet 10.0.0.1 netmask 255.255.255.0 vlan 1 vlandev - em0 mtu 1500 up - Also, bring the driver up by entering: + NOTES: DEVICE POLLING is only valid for non-SMP kernels. - ifconfig em0 up + The driver has to be built into the kernel for DEVICE POLLING to be + enabled in the driver. Known Limitations ================= -There are known performance problems with this driver when running UDP -traffic with Jumbo Frames. Intel recommends not using Jumbo Frames for UDP -traffic. +There are known performance issues with this driver when running UDP traffic +with Jumbo Frames. Intel recommends not using Jumbo Frames for UDP traffic. Support ==== //depot/projects/smpng/sys/dev/em/if_em.c#17 (text+ko) ==== @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2001-2002, Intel Corporation +Copyright (c) 2001-2003, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.19 2003/02/19 05:47:03 imp Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.20 2003/03/21 21:47:30 pdeuskar Exp $*/ #include @@ -51,7 +51,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "1.4.10"; +char em_driver_version[] = "1.5.31"; /********************************************************************* @@ -63,6 +63,7 @@ * * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, String Index } *********************************************************************/ + static em_vendor_info_t em_vendor_info_array[] = { /* Intel(R) PRO/1000 Network Connection */ @@ -78,10 +79,15 @@ { 0x8086, 0x1010, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1011, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x1013, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x1014, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1015, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1016, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1017, PCI_ANY_ID, PCI_ANY_ID, 0}, - { 0x8086, 0x101E, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x1018, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x1019, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x101A, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x101E, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} }; @@ -103,7 +109,7 @@ static int em_shutdown(device_t); static void em_intr(void *); static void em_start(struct ifnet *); -static int em_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t); +static int em_ioctl(struct ifnet *, u_long, caddr_t); static void em_watchdog(struct ifnet *); static void em_init(void *); static void em_stop(void *); @@ -129,7 +135,7 @@ static int em_allocate_transmit_structures(struct adapter *); static void em_process_receive_interrupts(struct adapter *, int); static void em_receive_checksum(struct adapter *, - struct em_rx_desc * rx_desc, + struct em_rx_desc *, struct mbuf *); static void em_transmit_checksum_setup(struct adapter *, struct mbuf *, @@ -142,8 +148,13 @@ static void em_print_link_status(struct adapter *); static int em_get_buf(int i, struct adapter *, struct mbuf *); -static void em_enable_vlans(struct adapter *adapter); -static int em_encap(struct adapter *adapter, struct mbuf *m_head); +static void em_enable_vlans(struct adapter *); +static int em_encap(struct adapter *, struct mbuf *); +static void em_smartspeed(struct adapter *); +static int em_82547_fifo_workaround(struct adapter *, int); +static void em_82547_update_fifo_head(struct adapter *, int); +static int em_82547_tx_fifo_reset(struct adapter *); +static void em_82547_move_tail(void *arg); /********************************************************************* * FreeBSD Device Interface Entry Points @@ -254,6 +265,7 @@ em_adapter_list = adapter; callout_handle_init(&adapter->timer_handle); + callout_handle_init(&adapter->tx_fifo_timer_handle); /* Determine hardware revision */ em_identify_hardware(adapter); @@ -271,30 +283,33 @@ adapter->hw.tbi_compatibility_en = TRUE; adapter->rx_buffer_len = EM_RXBUFFER_2048; + /* These parameters control the automatic generation(Tx) and + * response(Rx) to Ethernet PAUSE frames. + */ adapter->hw.fc_high_water = FC_DEFAULT_HI_THRESH; adapter->hw.fc_low_water = FC_DEFAULT_LO_THRESH; adapter->hw.fc_pause_time = FC_DEFAULT_TX_TIMER; adapter->hw.fc_send_xon = TRUE; adapter->hw.fc = em_fc_full; + adapter->hw.phy_init_script = 1; - /* Set the max frame size assuming standard ethernet sized frames */ + /* + * Set the max frame size assuming standard ethernet + * sized frames + */ adapter->hw.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; adapter->hw.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; - /* This controls when hardware reports transmit completion status. */ - if ((EM_REPORT_TX_EARLY == 0) || (EM_REPORT_TX_EARLY == 1)) { - adapter->hw.report_tx_early = EM_REPORT_TX_EARLY; - } else { - if (adapter->hw.mac_type < em_82543) { - adapter->hw.report_tx_early = 0; - } else { - adapter->hw.report_tx_early = 1; - } - } + /* + * This controls when hardware reports transmit completion + * status. + */ + adapter->hw.report_tx_early = 1; + if (em_allocate_pci_resources(adapter)) { printf("em%d: Allocation of PCI resources failed\n", @@ -305,6 +320,9 @@ } + /* Initialize eeprom parameters */ + em_init_eeprom_params(&adapter->hw); + tsize = EM_ROUNDUP(adapter->num_tx_desc * sizeof(struct em_tx_desc), 4096); @@ -347,11 +365,15 @@ if (em_read_mac_addr(&adapter->hw) < 0) { printf("em%d: EEPROM read error while reading mac address\n", adapter->unit); + em_free_pci_resources(adapter); + contigfree(adapter->tx_desc_base, tsize, M_DEVBUF); + contigfree(adapter->rx_desc_base, rsize, M_DEVBUF); + splx(s); return(EIO); } - memcpy(adapter->interface_data.ac_enaddr, adapter->hw.mac_addr, - ETH_LENGTH_OF_ADDRESS); + bcopy(adapter->hw.mac_addr, adapter->interface_data.ac_enaddr, + ETHER_ADDR_LEN); /* Setup OS specific network interface */ em_setup_interface(dev, adapter); @@ -373,7 +395,6 @@ } else printf("em%d: Speed:N/A Duplex:N/A\n", adapter->unit); - INIT_DEBUGOUT("em_attach: end"); splx(s); return(0); @@ -403,9 +424,9 @@ em_stop(adapter); em_phy_hw_reset(&adapter->hw); #if __FreeBSD_version < 500000 - ether_ifdetach(&adapter->interface_data.ac_if, ETHER_BPF_SUPPORTED); + ether_ifdetach(&adapter->interface_data.ac_if, ETHER_BPF_SUPPORTED); #else - ether_ifdetach(&adapter->interface_data.ac_if); + ether_ifdetach(&adapter->interface_data.ac_if); #endif em_free_pci_resources(adapter); @@ -470,10 +491,10 @@ static void em_start(struct ifnet *ifp) { - int s; + int s; struct mbuf *m_head; struct adapter *adapter = ifp->if_softc; - + if (!adapter->link_active) return; @@ -484,14 +505,13 @@ if (m_head == NULL) break; - if (em_encap(adapter, m_head)) { - ifp->if_flags |= IFF_OACTIVE; - IF_PREPEND(&ifp->if_snd, m_head); - break; + if (em_encap(adapter, m_head)) { + ifp->if_flags |= IFF_OACTIVE; + IF_PREPEND(&ifp->if_snd, m_head); + break; } - - /* Send a copy of the frame to the BPF listener */ + /* Send a copy of the frame to the BPF listener */ #if __FreeBSD_version < 500000 if (ifp->if_bpf) bpf_mtap(ifp, m_head); @@ -517,7 +537,7 @@ **********************************************************************/ static int -em_ioctl(struct ifnet *ifp, IOCTL_CMD_TYPE command, caddr_t data) +em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { int s, mask, error = 0; struct ifreq *ifr = (struct ifreq *) data; @@ -541,20 +561,20 @@ em_init(adapter); } break; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 24 13:45:50 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63DC537B405; Mon, 24 Mar 2003 13:45:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 421DD37B407 for ; Mon, 24 Mar 2003 13:45:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1B2F43FBD for ; Mon, 24 Mar 2003 13:45:45 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2OLjj0U055307 for ; Mon, 24 Mar 2003 13:45:45 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2OLjjmn055304 for perforce@freebsd.org; Mon, 24 Mar 2003 13:45:45 -0800 (PST) Date: Mon, 24 Mar 2003 13:45:45 -0800 (PST) Message-Id: <200303242145.h2OLjjmn055304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 27309 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-3.4 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,UPPERCASE_25_50,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27309 Change 27309 by jhb@jhb_laptop on 2003/03/24 13:44:58 IFC @23704. Affected files ... .. //depot/projects/smpng/sys/sys/eventhandler.h#18 integrate Differences ... ==== //depot/projects/smpng/sys/sys/eventhandler.h#18 (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/sys/eventhandler.h,v 1.28 2003/03/24 21:15:35 jhb Exp $ + * $FreeBSD: src/sys/sys/eventhandler.h,v 1.29 2003/03/24 21:24:37 jhb Exp $ */ #ifndef SYS_EVENTHANDLER_H @@ -190,7 +190,7 @@ #define SHUTDOWN_PRI_FIRST EVENTHANDLER_PRI_FIRST #define SHUTDOWN_PRI_DEFAULT EVENTHANDLER_PRI_ANY -#define SHUTDOWN_PRI_LAST EVENTHANDLER_PRI_FIRST +#define SHUTDOWN_PRI_LAST EVENTHANDLER_PRI_LAST EVENTHANDLER_DECLARE(shutdown_pre_sync, shutdown_fn); /* before fs sync */ EVENTHANDLER_DECLARE(shutdown_post_sync, shutdown_fn); /* after fs sync */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 24 19:24:23 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A8ED37B43B; Mon, 24 Mar 2003 19:23:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E671A37B43A for ; Mon, 24 Mar 2003 19:23:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9883A43F85 for ; Mon, 24 Mar 2003 19:23:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2P3Nr0U089578 for ; Mon, 24 Mar 2003 19:23:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2P3NqpP089575 for perforce@freebsd.org; Mon, 24 Mar 2003 19:23:52 -0800 (PST) Date: Mon, 24 Mar 2003 19:23:52 -0800 (PST) Message-Id: <200303250323.h2P3NqpP089575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27332 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BODY_8BITS,HTML_00_10,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27332 Change 27332 by rwatson@rwatson_tislabs on 2003/03/24 19:23:33 Loop back various changes by integrating the TrustedBSD base branch from the TrustedBSD MAC branch, including a number of entry point synchronizations for the various MAC policy modules. Affected files ... .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#2 integrate .. //depot/projects/trustedbsd/base/etc/mail/aliases#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#7 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#20 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#15 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/_types.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/_types.h#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/fb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/fbreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/vga.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/gfb/gfb_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vncache.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_apple.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#24 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#23 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mirror.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi_isa.c#2 delete .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/i386/bios/smbios.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/bios/vpd.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mem.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm86.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/_types.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/param.h#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/smapi.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/isa_dma.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spigot.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spkr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mem.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/_types.h#4 integrate .. //depot/projects/trustedbsd/base/sys/isa/vga_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_devstat.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_xxx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_cow.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_jumbo.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#29 integrate .. //depot/projects/trustedbsd/base/sys/modules/smapi/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/pc98gdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/spkr.c#9 delete .. //depot/projects/trustedbsd/base/sys/pc98/pc98/syscons.c#13 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/meteor.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/xrpu.c#5 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/_types.h#4 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#25 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#23 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/eventhandler.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/jumbo.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/malloc.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/types.h#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/device_pager.c#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#15 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_extern.h#9 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#23 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#29 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#33 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#7 integrate .. //depot/projects/trustedbsd/base/sys/x86_64/include/_types.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/tftp/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cdcontrol/cdcontrol.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kgmon/kgmon.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/info.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/perform.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/pkg_info.1#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/chflags/chflags.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.15 2003/02/18 19:51:59 obrien Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.16 2003/03/24 20:15:58 johan Exp $ .\" -.Dd May 2, 1995 +.Dd Mar 24, 2003 .Dt CHFLAGS 1 .Os .Sh NAME @@ -110,11 +110,16 @@ .Pp Putting the letters .Dq Ar no -before an option causes the flag to be turned off. +before or removing the letters +.Dq Ar no +from a keyword causes the flag to be cleared. For example: -.Bl -tag -offset indent -width "nouchg" +.Pp +.Bl -tag -offset indent -width "nouchg" -compact .It Ar nouchg -the immutable bit should be cleared +clear the user immutable flag (owner or super-user only) +.It Ar dump +clear the nodump flag (owner or super-user only) .El .Pp Symbolic links do not have flags, so unless the ==== //depot/projects/trustedbsd/base/etc/mail/aliases#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.16 2003/02/08 19:00:12 gshapiro Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -66,7 +66,7 @@ # www: webmaster # NOTE: /var/msgs and /var/msgs/bounds must be owned by sendmail's -# DefaultUser (defaults to mailnull) for the msgs alias to work. +# DefaultUser (defaults to mailnull) for the msgs alias to work. # # msgs: "| /usr/bin/msgs -s" ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.21 2003/03/19 18:21:42 eivind Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.24 2003/03/24 18:59:00 eivind Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -2220,21 +2220,6 @@ % 10 Reasons Why a Beer is Better Than a Man: - 1. A beer will never invite friends home for dinner without calling. - 2. A beer won't think less of you if you can't name the Steelers' - quarterback. - 3. A beer won't even act amazed if you can. - 4. You don't have to let a beer win. - 5. Just because you have dinner with a beer doesn't mean you have to - sleep with it, too. - 6. A beer helps with the housework. - 7. A beer will never fumble with your bra. - 8. A beer will never take the newspaper apart before you've read it. - 9. A beer doesn't want you to raise its children. -10. A beer wouldn't mind if you wanted it to wear a condom. -% -10 Reasons Why a Beer is Better Than a Man: - 1. Having a beer can't make you pregnant. 2. A beer doesn't wouldn't trade you in on a sports car. 3. If a beer did have a sports car, it wouldn't love it more than you. @@ -2408,12 +2393,6 @@ And, unless I am wrong, You expected this line to be lewd. % -A bather whose clothing was strewed -By breezes that left her quite nude, - Saw a man come along - And, unless I'm quite wrong, -You expected this line to be lewd. -% A beachcomber of 25 had been shipwrecked on a desert island since the age of six. One day, while in search of food, he stumbled across a beautifully sensuous female lying on the beach nearly naked; she'd been washed ashore from @@ -2434,12 +2413,6 @@ A beat schizophrenic said, "Me? I am not I, I'm a tree." But another, more sane, - Shouted, "I'm a great dane " -And covered his pants leg with pee. -% -A beat schizophrenic said, "Me? -I am not I, I'm a tree." - But another, more sane, Shouted, "I'm a Great Dane!" And covered his pants leg with pee. % @@ -2534,12 +2507,6 @@ Was diddling a collie- But I got a nice price for the pups." % -A broken-down harlot named Tupps -Was heard to confess in her cups: - "The height of my folly - Was fucking a collie -- -But I got a nice price for the pups." -% A burlesque dancer, a pip Named Virginia, could peel in a zip; But she read science fiction @@ -2677,12 +2644,6 @@ The fuckin' thing broke And beat both his balls to a creame. % -A clever young man named Eugene -Invented a jack-off machine. - On the twenty-third stroke - The goddam thing broke -And beat both his balls to a creame. -% A clitoris is a lot like Antarctica; most men know it's there, but few really care. % @@ -2822,12 +2783,6 @@ Wrote his thesis on cunts and on fucking'em. But a dropout from paree Taught him Gamahuchee -- so he added a footnote on sucking 'em. -% -A doctoral student from Buckingham -Wrote his thesis on cunts and on fucking'em. - But a dropout from paree - Taught him Gamahuchee So he added a footnote on sucking 'em. % A do-it-yourselfer named Alice, @@ -2849,13 +2804,6 @@ Through exuberance, tightness, and malice. % A dreary young bank clerk named Fennis -Wished to foster an aura of menace; - To make people afraid - He wore gloves of grey suede -And white footgear intended for tennis. - -- Edward Gorey -% -A dreary young bank clerk named Fennis Wished to foster an aura of menace. To make people afraid He wore gloves of grey suede @@ -2996,12 +2944,6 @@ And other odd mammals, And gives them a go at mama. % -A habit obscene and unsavory, -Holds a CS professor in slavery. - With maniacal howls, - He deflowers young owls, -That he keeps in an underground aviary. -% A hacker who screwed a mag tape Was caught and convicted of rape. To jail he did go, @@ -3491,20 +3433,6 @@ attempting to explain the lack of female interest in pornography. % -A nubile female virtually never experiences difficulty in finding willing -sexual partners, and in a natural habitat nubile females are probably always -married. The basic female "strategy" is to obtain the best possible husband, -to be fertilized by the fittest available male (always, of course, taking -risk into account), and to maximize the returns on sexual favors bestowed: -to be sexually aroused by the sight of males would promote random matings, -thus undermining all of these aims, and would also waste time and energy -that could be spent in economically significant activities and in nurturing -children. A female's reproductive success would be seriously compromised -by the propensity to be sexually aroused by the sight of males. - -- Donald Symons, "The Evolution of Human Sexuality", - attempting to explain the lack of female interest in - pornography. -% A nuclear family is out golfing one day, when it becomes clear that Dad isn't going to win any trophies, at least on this course. On the 3rd hole, after two miserable bogies, he misses a two foot put and exclaims, "Shit!" @@ -5096,8 +5024,6 @@ COCAINE: The thinking man's Dristan. % -Cocaine -- the thinking man's Dristan. -% Cocaine is nature's way of telling you you have too much money. % Cocaine isn't habit forming. I should know -- I've been using it for years. @@ -5779,11 +5705,6 @@ and at least a pint of ether. -- Hunter S. Thompson, "Fear and Loathing in Las Vegas" % -Every now and then when your life gets complicated and the weasels start -closing in, the only real cure is to load up on heinous chemicals and then -drive like a bastard from Hollywood to Las Vegas. - -- Hunter S. Thompson -% Every time you masturbate, God kills a kitten. Please, think of the kittens. @@ -5987,10 +5908,6 @@ For her were all duds, Now she's out with the leg of a table. % -For a gay time, call 632-9483. Ask for Brucie. -% -For a good time, call 632-9484. Ask for Cathy. -% For a good time, call 632-9485. Ask for Michael. % For a house-to-house salesman named Moore, @@ -6162,17 +6079,6 @@ daughter and get her number. (d) Turn red and slink off into the men's room. % -FORTUNE TESTS THE GREAT MANAGERS: #7 -You have just returned from a trip to Green Bay, Wisconsin in January -and tell your boss that nobody but whores and football players live -there. He mentions that his wife is from Green Bay. You: - - (a) Pretend you are suffering from amnesia and don't remember your - name. - (b) Ask what position she played. - (c) Pull a pair of lacey underwear from your pocket and ask if - he recognizes the label. -% FORTUNE TESTS THE GREAT MANAGERS: #9 You are making a sales presentation to a group of corporate executives @@ -6949,10 +6855,6 @@ next morning found she was six months pregnant? % Hear about... - the farmer who couldn't keep his - hands off his wife so he fired them? -% -Hear about... the farmer who couldn't keep his hands off his wife, so he fired them? % @@ -7017,10 +6919,6 @@ his ball bearings. % Hear about... - the guy who couldn't find his way to the orgy -- you might say he - lost his ball bearings? -% -Hear about... the guy who had his vasectomy done by Sears? Every time he gets a hard-on, the garage door goes up. % @@ -7054,10 +6952,6 @@ with young housewives who aren't adequately covered? % Hear about... - the little boy that found a fifty cent - piece, so he went home for some money? -% -Hear about... the little boy that found a fifty cent piece, so he went home for some money? % @@ -7070,10 +6964,6 @@ York to California and discovered that he still had the same milkman? % Hear about... - the man who took a course in exotic lovemaking and announced that - he'd never be able to face his girl again? -% -Hear about... the mother of 12 who was called upon to use her diaphragm so often that she kept it tacked to the headboard of her bed? % @@ -7090,10 +6980,6 @@ Los Angeles single bars? It's called Bang Americard. % Hear about... - the new instrument of credit especially designed for use in - single bars -- BANG AMERICARD? -% -Hear about... the new rule at the girls' school? Lights out by ten, candles by eleven. % @@ -7156,10 +7042,6 @@ feel like a new man? % Hear about... - the woman who says two martinis usually make her feel like a - new man? -% -Hear about... the young lady attacked in San Francisco? By two men, one held her down while the other one did her hair. % @@ -7677,9 +7559,6 @@ I never trust a man unless I've got his pecker in my pocket. -- Lyndon Baines Johnson % -I never trust a man unless I've got his pecker in my pocket. - -- Lyndon Johnson -% I once had the wife of a Dean Seven times while the Dean was out skiin'. She remarked with some gaiety, @@ -7731,13 +7610,7 @@ I think any man in business would be foolish to fool around with his secretary. If it's somebody else's secretary, fine. -- Barry Goldwater - -I think every good Christian ought to kick Falwell right in the ass. - -- Barry Goldwater % -I think every good Christian ought to kick Falwell right in the ass. - -- Barry Goldwater -% I think every good Christian ought to kick Falwell's ass. -- Senator Barry Goldwater, commenting on Jerry Falwell's suggestion that all good Christians should be against @@ -7825,13 +7698,6 @@ Is getting to be quite a bore! -- Gelett Burgess % -I wish that my room had a floor; -I don't so much care for a door, - But this walking around - Without touching the ground -Is getting to be quite a bore! - -- Gelett Burgess -% I wonder what my wife will want tonight; Wonder if the wife will fuss and fight? I wonder can she tell @@ -8824,9 +8690,6 @@ Just go with the flow control, roll with the crunches, and, when you get a prompt, type like hell. % -Just go with the flow control, roll with the -crunches, and, when you get a prompt, type like hell. -% Just once I would like to persuade the audience not to wear any article of blue denim. If only they could see themselves in a pair of brown corduroys like mine instead of this awful, boring blue denim. I don't enjoy the sky @@ -9150,8 +9013,6 @@ -- Samuel Goldwyn % Love comes in spurts. -% -Love comes in spurts. --Devo, "Please Please" % Love is blind but desire doesn't give a good goddam. @@ -9256,6 +9117,9 @@ -- Professor Irwin Corey % Mary had a little lamb, +boy was the doctor surprised! +% +Mary had a little lamb, It's fleece as white as snow. It followed her to school one day, And got fucked by a big black dog. @@ -9627,20 +9491,13 @@ They nearly knocked me down to be the first in town To get their Elephant Shit On Rye! % -`My trip? It was vile. Balaclava +"My trip? It was vile. Balaclava I loathed. Etna was crawling with lava. The ship was all white But it creaked in the night, And the band, they did not know la java." -- Edward Gorey % -`My trip? It was vile. Balaclava -I loathed. Etna was crawling with lava. - The ship was all white - But it creaked in the night, -And the band, they did not know la java." - -- Edward Gorey -% My wife and I only smoke after sex. I've had the same pack since 1967. She's up to three packs a day. -- Rodney Dangerfield @@ -9831,8 +9688,6 @@ their commanders not allowing them to write "fuck" on their airplanes because it's obscene. % -Obscenity is a crutch for lazy Motherfuckers. -% Obscenity is the crutch of inarticulate motherfuckers. % Oden the bardling averred @@ -9901,12 +9756,6 @@ Tore his testes away - - An example of animal huma. % -Oh pity the prince, Montezuma -He tried to make love to a puma. - Seems the puma, in play, - Tore his testes away -- -An example of animal huma. -% Oh what a tangled web we weave when first we practice to conceive. -- Don Herold % @@ -9929,12 +9778,6 @@ Warning: Avoid contact with eyes and open cuts. Keep away from open naked flames -- both old and new. % -Old King Cole was a merry old soul, -A merry old soul was he. -He called for his pipe, -And he called for his drums, -And he fiddled with his call girls three. -% Old King Cole Was a merry old soul, A merry old soul was he! @@ -10039,12 +9882,6 @@ For the sake of the blind, Was the same information -- in Braille. % -On the breasts of a harlot from Yale -Was tattooed the price of her tail - And on her behind, - For the sake of the blind, -Was the same information in Braille. -% On the porch of a dude named Horatio, His girl got a yen for fellatio. As she sucked on his dingus @@ -10326,12 +10163,6 @@ With an actress, a whore and a poetess. When asked what position He used for coition, -He answered serenely, "the loetus." -% -One evening a guru had coitus -With an actress, a whore and a poetess. - When asked what position - He used for coition, He answered serenely, "the lotus." % One fall day, two men were out in the woods hunting. Feeling a sudden need @@ -10496,31 +10327,6 @@ There's no stopping it -- For short trips, two poots take you far. % -Our team usually puts the other woman at second base, where the maximum -possible number of males can get there on short notice to help out in case -of emergency. As far as I can tell, our second basewoman is a pretty good -baseball player, better than I am, anyway, but there's no way to know for -sure because if the ball gets anywhere near her, a male comes barging over -from, say, right field, to deal with it. She's been on the team for three -seasons now, but the males still don't trust her. They know, deep in their -souls, that if she had to choose between catching a fly ball and saving an -infant's life, she probably would elect to save the infant's life, without -ever considering whether there were men on base. - -- Dave Barry, "Sports is a Drag" -% -Our team usually puts the other woman at second base, where the maximum -possible number of males can get there on short notice to help out in -case of emergency. As far as I can tell, our second basewoman is a -pretty good baseball player, better than I am, anyway, but there's no -way to know for sure because if the ball gets anywhere near her, a male -comes barging over from, say, right field, to deal with it. She's been -on the team for three seasons now, but the males still don't trust -her. They know, deep in their souls, that if she had to choose between -catching a fly ball and saving an infant's life, she probably would -elect to save the infant's life, without ever considering whether there -were men on base. - -- Dave Barry, "Sports is a Drag" -% Our universe itself keeps on expanding and expanding, In all of the directions it can whiz; As fast as it can go, that's the speed of light, you know, @@ -11917,7 +11723,6 @@ It's Commode Huggin' Time In The Valley If You Want to Keep the Beer Real Cold, Put It Next to My Ex-wife's Heart If You Get the Feeling That I Don't Love You, Feel Again -I'm Ashamed To Be Here, But Not Ashamed Enough To Leave It's the Bottle Against the Bible in the Battle For Daddy's Soul My Wife Ran Off With My Best Friend, And I Sure Miss Him Don't Cut Any More Wood, Baby, 'Cause I'll Be Comin' Home With A Load @@ -12703,7 +12508,7 @@ % The honest female orgasm is three to fifteen rhythmic contractions of the outer third of the vagina at .8 second intervals, which is approximately -the beat of Surfing Safari" by the Beach Boys. Unless these contractions +the beat of "Surfing Safari" by the Beach Boys. Unless these contractions occur, you can regard her groaning, moaning, clawing, kicking, begging for mercy, and shouting filthy religious epithets as bargain-basement histrionics. -- John Hughes, National Lampoon @@ -15092,10 +14897,6 @@ Why is it that there are so many more horses' asses than there are horses? -- G. Gordon Liddy % -Why is it that there are so many more -horses' asses than there are horses? - -- G. Gordon Liddy -% Why is Mrs. Carter always on top when she and Jimmy make love? Because all Jimmy Carter can do is fuck up. % ==== //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#20 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ FreeBSD ¥×¥í¥¸¥§¥¯¥È - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.82 2003/03/22 05:47:29 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.83 2003/03/24 21:42:53 hrs Exp $ 2000 ==== //depot/projects/trustedbsd/base/sbin/mount_nfs/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # -# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.12 2001/12/04 02:19:51 obrien Exp $ +# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.13 2003/03/25 00:16:41 mdodd Exp $ PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c mounttab.c @@ -9,7 +9,7 @@ MOUNT= ${.CURDIR}/../mount UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL} -WARNS= 0 +WARNS= 2 .PATH: ${MOUNT} ${UMNTALL} ==== //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.8#7 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" -.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.36 2003/01/27 20:12:32 dillon Exp $ +.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.37 2003/03/25 01:25:30 mdodd Exp $ .\"" .Dd March 29, 1995 .Dt MOUNT_NFS 8 @@ -227,6 +227,10 @@ for regular files, and 30 -> 60 seconds for directories. The algorithm to calculate the timeout is based on the age of the file. The older the file, the longer the cache is considered valid, subject to the limits above. +.It noinet4 +.It noinet6 +Disables AF_INET or AF_INET6 connections. Useful for hosts that have +both an A record and an AAAA record for the same name. .El .Pp .Bl -tag -width "dumbtimerXX" ==== //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#9 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.57 2002/09/14 15:14:29 mux Exp $"; + "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.59 2003/03/25 01:25:30 mdodd Exp $"; #endif /* not lint */ #include @@ -72,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -97,6 +98,8 @@ #define ALTF_ACDIRMIN 0x20000 #define ALTF_ACDIRMAX 0x40000 #define ALTF_NOLOCKD 0x80000 +#define ALTF_NOINET4 0x100000 +#define ALTF_NOINET6 0x200000 struct mntopt mopts[] = { MOPT_STDOPTS, @@ -120,6 +123,8 @@ { "acdirmin=", 0, ALTF_ACDIRMIN, 1 }, { "acdirmax=", 0, ALTF_ACDIRMAX, 1 }, { "lockd", 1, ALTF_NOLOCKD, 1 }, + { "inet4", 1, ALTF_NOINET4, 1 }, + { "inet6", 1, ALTF_NOINET6, 1 }, { NULL } }; @@ -171,6 +176,8 @@ }; #define BGRND 1 #define ISBGRND 2 +#define OF_NOINET4 4 +#define OF_NOINET6 8 int retrycnt = -1; int opflags = 0; int nfsproto = IPPROTO_UDP; @@ -248,7 +255,7 @@ int c; struct nfs_args *nfsargsp; struct nfs_args nfsargs; - int mntflags, altflags, nfssvc_flag, num; + int mntflags, altflags, num; char *name, *p, *spec; char mntpath[MAXPATHLEN]; @@ -332,6 +339,10 @@ */ if (altflags & ALTF_BG) opflags |= BGRND; + if (altflags & ALTF_NOINET4) + opflags |= OF_NOINET4; + if (altflags & ALTF_NOINET6) + opflags |= OF_NOINET6; if (altflags & ALTF_MNTUDP) mnttcp_ok = 0; if (altflags & ALTF_TCP) { @@ -528,6 +539,12 @@ */ remoteerr = 0; for (ai = ai_nfs; ai != NULL; ai = ai->ai_next) { + if ((ai->ai_family == AF_INET6) && + (opflags & OF_NOINET6)) + continue; + if ((ai->ai_family == AF_INET) && + (opflags & OF_NOINET4)) + continue; ret = nfs_tryproto(nfsargsp, ai, hostp, spec, &errstr); if (ret == TRYRET_SUCCESS) break; @@ -690,7 +707,8 @@ try.tv_sec = 10; try.tv_usec = 0; - stat = clnt_call(clp, NFSPROC_NULL, xdr_void, NULL, xdr_void, NULL, + stat = clnt_call(clp, NFSPROC_NULL, (xdrproc_t)xdr_void, NULL, + (xdrproc_t)xdr_void, NULL, try); if (stat != RPC_SUCCESS) { if (stat == RPC_PROGVERSMISMATCH && trymntmode == ANY) { @@ -719,7 +737,8 @@ clp->cl_auth = authsys_create_default(); nfhret.auth = RPCAUTH_UNIX; nfhret.vers = mntvers; - stat = clnt_call(clp, RPCMNT_MOUNT, xdr_dir, spec, xdr_fh, &nfhret, + stat = clnt_call(clp, RPCMNT_MOUNT, (xdrproc_t)xdr_dir, spec, + (xdrproc_t)xdr_fh, &nfhret, try); auth_destroy(clp->cl_auth); if (stat != RPC_SUCCESS) { ==== //depot/projects/trustedbsd/base/sbin/ping/ping.c#15 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping/ping.c,v 1.89 2003/03/24 11:26:08 bde Exp $"; + "$FreeBSD: src/sbin/ping/ping.c,v 1.90 2003/03/24 23:48:36 mdodd Exp $"; #endif /* not lint */ /* @@ -167,7 +167,6 @@ int uid; /* cached uid for micro-optimization */ u_char icmp_type = ICMP_ECHO; u_char icmp_type_rsp = ICMP_ECHOREPLY; -int timeoffset = 0; int phdr_len = 0; /* counters */ @@ -439,31 +438,33 @@ usage(); target = argv[optind]; - maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN; - if (options & F_MASK) { + switch (options & (F_MASK|F_TIME)) { + case 0: break; + case F_MASK: icmp_type = ICMP_MASKREQ; icmp_type_rsp = ICMP_MASKREPLY; - timeoffset = MASK_LEN; - datalen -= MASK_LEN; - phdr_len += MASK_LEN; + phdr_len = MASK_LEN; if (!(options & F_QUIET)) (void)printf("ICMP_MASKREQ\n"); - } - if (options & F_TIME) { + break; + case F_TIME: icmp_type = ICMP_TSTAMP; icmp_type_rsp = ICMP_TSTAMPREPLY; - timeoffset = TS_LEN; - datalen -= TS_LEN; - phdr_len += TS_LEN; + phdr_len = TS_LEN; if (!(options & F_QUIET)) (void)printf("ICMP_TSTAMP\n"); + break; + default: + errx(EX_USAGE, "ICMP_TSTAMP and ICMP_MASKREQ are exclusive."); + break; } + maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN - phdr_len; if (options & F_RROUTE) maxpayload -= MAX_IPOPTLEN; if (datalen > maxpayload) errx(EX_USAGE, "packet size too large: %d > %d", datalen, maxpayload); - datap = &outpack[MINICMPLEN + phdr_len]; + datap = &outpack[MINICMPLEN + phdr_len + TIMEVAL_LEN]; if (options & F_PINGFILLED) { fill((char *)datap, payload); } @@ -524,16 +525,13 @@ errx(EX_USAGE, "-I, -L, -T flags cannot be used with unicast destination"); - if (datalen - TIMEVAL_LEN >= TIMEVAL_LEN) { /* can we time transfer */ - datalen -= TIMEVAL_LEN; - phdr_len += TIMEVAL_LEN; + if (datalen >= TIMEVAL_LEN) /* can we time transfer */ timing = 1; - } packlen = MAXIPLEN + MAXICMPLEN + datalen; packlen = packlen > IP_MAXPACKET ? IP_MAXPACKET : packlen; if (!(options & F_PINGFILLED)) - for (i = phdr_len; i < datalen; ++i) + for (i = TIMEVAL_LEN; i < datalen; ++i) *datap++ = i; ident = getpid() & 0xFFFF; @@ -869,11 +867,12 @@ icp->icmp_otime = htonl((now.tv_sec % (24*60*60)) * 1000 + now.tv_usec / 1000); if (timing) - bcopy((void *)&now, (void *)&outpack[MINICMPLEN + timeoffset], - sizeof(struct timeval)); + bcopy((void *)&now, + (void *)&outpack[MINICMPLEN + phdr_len], + sizeof(struct timeval)); } - cc = MINICMPLEN + datalen + timeoffset; + cc = MINICMPLEN + phdr_len + datalen; /* compute ICMP checksum here */ icp->icmp_cksum = in_cksum((u_short *)icp, cc); @@ -954,7 +953,7 @@ #else tp = icp->icmp_data; #endif - tp+=timeoffset; + tp += phdr_len; /* Copy to avoid alignment problems: */ memcpy(&tv1, tp, sizeof(tv1)); @@ -1565,7 +1564,7 @@ &pat[13], &pat[14], &pat[15]); if (ii > 0) - for (kk = 0; kk <= maxpayload - (phdr_len + ii); kk += ii) + for (kk = 0; kk <= maxpayload - (TIMEVAL_LEN + ii); kk += ii) for (jj = 0; jj < ii; ++jj) bp[jj + kk] = pat[jj]; if (!(options & F_QUIET)) { ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.43 2003/03/03 12:15:38 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.44 2003/03/25 00:06:59 jake Exp $ */ /* @@ -218,7 +218,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this ==== //depot/projects/trustedbsd/base/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.3 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -89,6 +89,7 @@ typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; ==== //depot/projects/trustedbsd/base/sys/arm/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.2 2002/08/23 16:49:04 mike Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -95,6 +95,7 @@ typedef __uint32_t __u_register_t; typedef __uint32_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint32_t __vm_paddr_t; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 24 20:15:30 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9239937B401; Mon, 24 Mar 2003 20:15:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2939937B401 for ; Mon, 24 Mar 2003 20:15:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC0E043F85 for ; Mon, 24 Mar 2003 20:14:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2P4Ex0U094925 for ; Mon, 24 Mar 2003 20:14:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2P4EwTh094922 for perforce@freebsd.org; Mon, 24 Mar 2003 20:14:58 -0800 (PST) Date: Mon, 24 Mar 2003 20:14:58 -0800 (PST) Message-Id: <200303250414.h2P4EwTh094922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27335 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BODY_8BITS,HTML_00_10,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27335 Change 27335 by rwatson@rwatson_tislabs on 2003/03/24 20:14:00 Integrate the TrustedBSD MAC branch from the TrustedBSD base branch: loop back the entry point additions from the main tree. The main FreeBSD tree policy modules and the local branch policy modules are now in sync from the perspective of the entry points they implement. There are still differences, including a number of policy and parsing fixes in Biba, the more extensive test handling for thread_userret in mac_test, and a number of fixes in mac_lomac that need to be merged relating to label updated for processes. Affected files ... .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#2 integrate .. //depot/projects/trustedbsd/mac/etc/mail/aliases#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#7 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#18 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/_types.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/_types.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#26 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_os.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/fb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/fbreg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gfb/gfb_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_aes.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_apple.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_gpt.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mirror.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_sunlabel.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakeup.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi_isa.c#2 delete .. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/i386/bios/smbios.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/bios/vpd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mem.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm86.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/_types.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/md_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/param.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/smapi.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/isa_dma.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/spigot.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/spkr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mem.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/_types.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/isa/vga_isa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#58 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_devstat.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_xxx.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_jumbo.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/modules/smapi/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/pc98gdc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/spkr.c#9 delete .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/syscons.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/pci/meteor.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pci/xrpu.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/_types.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#199 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#158 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#117 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#94 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/eventhandler.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/jumbo.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/malloc.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/systm.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/sys/types.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/device_pager.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_extern.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageq.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/x86_64/include/_types.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tftp/main.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cdcontrol/cdcontrol.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/kgmon/kgmon.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/info.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/perform.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/pkg_info.1#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/show.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.15 2003/02/18 19:51:59 obrien Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.16 2003/03/24 20:15:58 johan Exp $ .\" -.Dd May 2, 1995 +.Dd Mar 24, 2003 .Dt CHFLAGS 1 .Os .Sh NAME @@ -110,11 +110,16 @@ .Pp Putting the letters .Dq Ar no -before an option causes the flag to be turned off. +before or removing the letters +.Dq Ar no +from a keyword causes the flag to be cleared. For example: -.Bl -tag -offset indent -width "nouchg" +.Pp +.Bl -tag -offset indent -width "nouchg" -compact .It Ar nouchg -the immutable bit should be cleared +clear the user immutable flag (owner or super-user only) +.It Ar dump +clear the nodump flag (owner or super-user only) .El .Pp Symbolic links do not have flags, so unless the ==== //depot/projects/trustedbsd/mac/etc/mail/aliases#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.16 2003/02/08 19:00:12 gshapiro Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -66,7 +66,7 @@ # www: webmaster # NOTE: /var/msgs and /var/msgs/bounds must be owned by sendmail's -# DefaultUser (defaults to mailnull) for the msgs alias to work. +# DefaultUser (defaults to mailnull) for the msgs alias to work. # # msgs: "| /usr/bin/msgs -s" ==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.21 2003/03/19 18:21:42 eivind Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.24 2003/03/24 18:59:00 eivind Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -2220,21 +2220,6 @@ % 10 Reasons Why a Beer is Better Than a Man: - 1. A beer will never invite friends home for dinner without calling. - 2. A beer won't think less of you if you can't name the Steelers' - quarterback. - 3. A beer won't even act amazed if you can. - 4. You don't have to let a beer win. - 5. Just because you have dinner with a beer doesn't mean you have to - sleep with it, too. - 6. A beer helps with the housework. - 7. A beer will never fumble with your bra. - 8. A beer will never take the newspaper apart before you've read it. - 9. A beer doesn't want you to raise its children. -10. A beer wouldn't mind if you wanted it to wear a condom. -% -10 Reasons Why a Beer is Better Than a Man: - 1. Having a beer can't make you pregnant. 2. A beer doesn't wouldn't trade you in on a sports car. 3. If a beer did have a sports car, it wouldn't love it more than you. @@ -2408,12 +2393,6 @@ And, unless I am wrong, You expected this line to be lewd. % -A bather whose clothing was strewed -By breezes that left her quite nude, - Saw a man come along - And, unless I'm quite wrong, -You expected this line to be lewd. -% A beachcomber of 25 had been shipwrecked on a desert island since the age of six. One day, while in search of food, he stumbled across a beautifully sensuous female lying on the beach nearly naked; she'd been washed ashore from @@ -2434,12 +2413,6 @@ A beat schizophrenic said, "Me? I am not I, I'm a tree." But another, more sane, - Shouted, "I'm a great dane " -And covered his pants leg with pee. -% -A beat schizophrenic said, "Me? -I am not I, I'm a tree." - But another, more sane, Shouted, "I'm a Great Dane!" And covered his pants leg with pee. % @@ -2534,12 +2507,6 @@ Was diddling a collie- But I got a nice price for the pups." % -A broken-down harlot named Tupps -Was heard to confess in her cups: - "The height of my folly - Was fucking a collie -- -But I got a nice price for the pups." -% A burlesque dancer, a pip Named Virginia, could peel in a zip; But she read science fiction @@ -2677,12 +2644,6 @@ The fuckin' thing broke And beat both his balls to a creame. % -A clever young man named Eugene -Invented a jack-off machine. - On the twenty-third stroke - The goddam thing broke -And beat both his balls to a creame. -% A clitoris is a lot like Antarctica; most men know it's there, but few really care. % @@ -2822,12 +2783,6 @@ Wrote his thesis on cunts and on fucking'em. But a dropout from paree Taught him Gamahuchee -- so he added a footnote on sucking 'em. -% -A doctoral student from Buckingham -Wrote his thesis on cunts and on fucking'em. - But a dropout from paree - Taught him Gamahuchee So he added a footnote on sucking 'em. % A do-it-yourselfer named Alice, @@ -2849,13 +2804,6 @@ Through exuberance, tightness, and malice. % A dreary young bank clerk named Fennis -Wished to foster an aura of menace; - To make people afraid - He wore gloves of grey suede -And white footgear intended for tennis. - -- Edward Gorey -% -A dreary young bank clerk named Fennis Wished to foster an aura of menace. To make people afraid He wore gloves of grey suede @@ -2996,12 +2944,6 @@ And other odd mammals, And gives them a go at mama. % -A habit obscene and unsavory, -Holds a CS professor in slavery. - With maniacal howls, - He deflowers young owls, -That he keeps in an underground aviary. -% A hacker who screwed a mag tape Was caught and convicted of rape. To jail he did go, @@ -3491,20 +3433,6 @@ attempting to explain the lack of female interest in pornography. % -A nubile female virtually never experiences difficulty in finding willing -sexual partners, and in a natural habitat nubile females are probably always -married. The basic female "strategy" is to obtain the best possible husband, -to be fertilized by the fittest available male (always, of course, taking -risk into account), and to maximize the returns on sexual favors bestowed: -to be sexually aroused by the sight of males would promote random matings, -thus undermining all of these aims, and would also waste time and energy -that could be spent in economically significant activities and in nurturing -children. A female's reproductive success would be seriously compromised -by the propensity to be sexually aroused by the sight of males. - -- Donald Symons, "The Evolution of Human Sexuality", - attempting to explain the lack of female interest in - pornography. -% A nuclear family is out golfing one day, when it becomes clear that Dad isn't going to win any trophies, at least on this course. On the 3rd hole, after two miserable bogies, he misses a two foot put and exclaims, "Shit!" @@ -5096,8 +5024,6 @@ COCAINE: The thinking man's Dristan. % -Cocaine -- the thinking man's Dristan. -% Cocaine is nature's way of telling you you have too much money. % Cocaine isn't habit forming. I should know -- I've been using it for years. @@ -5779,11 +5705,6 @@ and at least a pint of ether. -- Hunter S. Thompson, "Fear and Loathing in Las Vegas" % -Every now and then when your life gets complicated and the weasels start -closing in, the only real cure is to load up on heinous chemicals and then -drive like a bastard from Hollywood to Las Vegas. - -- Hunter S. Thompson -% Every time you masturbate, God kills a kitten. Please, think of the kittens. @@ -5987,10 +5908,6 @@ For her were all duds, Now she's out with the leg of a table. % -For a gay time, call 632-9483. Ask for Brucie. -% -For a good time, call 632-9484. Ask for Cathy. -% For a good time, call 632-9485. Ask for Michael. % For a house-to-house salesman named Moore, @@ -6162,17 +6079,6 @@ daughter and get her number. (d) Turn red and slink off into the men's room. % -FORTUNE TESTS THE GREAT MANAGERS: #7 -You have just returned from a trip to Green Bay, Wisconsin in January -and tell your boss that nobody but whores and football players live -there. He mentions that his wife is from Green Bay. You: - - (a) Pretend you are suffering from amnesia and don't remember your - name. - (b) Ask what position she played. - (c) Pull a pair of lacey underwear from your pocket and ask if - he recognizes the label. -% FORTUNE TESTS THE GREAT MANAGERS: #9 You are making a sales presentation to a group of corporate executives @@ -6949,10 +6855,6 @@ next morning found she was six months pregnant? % Hear about... - the farmer who couldn't keep his - hands off his wife so he fired them? -% -Hear about... the farmer who couldn't keep his hands off his wife, so he fired them? % @@ -7017,10 +6919,6 @@ his ball bearings. % Hear about... - the guy who couldn't find his way to the orgy -- you might say he - lost his ball bearings? -% -Hear about... the guy who had his vasectomy done by Sears? Every time he gets a hard-on, the garage door goes up. % @@ -7054,10 +6952,6 @@ with young housewives who aren't adequately covered? % Hear about... - the little boy that found a fifty cent - piece, so he went home for some money? -% -Hear about... the little boy that found a fifty cent piece, so he went home for some money? % @@ -7070,10 +6964,6 @@ York to California and discovered that he still had the same milkman? % Hear about... - the man who took a course in exotic lovemaking and announced that - he'd never be able to face his girl again? -% -Hear about... the mother of 12 who was called upon to use her diaphragm so often that she kept it tacked to the headboard of her bed? % @@ -7090,10 +6980,6 @@ Los Angeles single bars? It's called Bang Americard. % Hear about... - the new instrument of credit especially designed for use in - single bars -- BANG AMERICARD? -% -Hear about... the new rule at the girls' school? Lights out by ten, candles by eleven. % @@ -7156,10 +7042,6 @@ feel like a new man? % Hear about... - the woman who says two martinis usually make her feel like a - new man? -% -Hear about... the young lady attacked in San Francisco? By two men, one held her down while the other one did her hair. % @@ -7677,9 +7559,6 @@ I never trust a man unless I've got his pecker in my pocket. -- Lyndon Baines Johnson % -I never trust a man unless I've got his pecker in my pocket. - -- Lyndon Johnson -% I once had the wife of a Dean Seven times while the Dean was out skiin'. She remarked with some gaiety, @@ -7731,13 +7610,7 @@ I think any man in business would be foolish to fool around with his secretary. If it's somebody else's secretary, fine. -- Barry Goldwater - -I think every good Christian ought to kick Falwell right in the ass. - -- Barry Goldwater % -I think every good Christian ought to kick Falwell right in the ass. - -- Barry Goldwater -% I think every good Christian ought to kick Falwell's ass. -- Senator Barry Goldwater, commenting on Jerry Falwell's suggestion that all good Christians should be against @@ -7825,13 +7698,6 @@ Is getting to be quite a bore! -- Gelett Burgess % -I wish that my room had a floor; -I don't so much care for a door, - But this walking around - Without touching the ground -Is getting to be quite a bore! - -- Gelett Burgess -% I wonder what my wife will want tonight; Wonder if the wife will fuss and fight? I wonder can she tell @@ -8824,9 +8690,6 @@ Just go with the flow control, roll with the crunches, and, when you get a prompt, type like hell. % -Just go with the flow control, roll with the -crunches, and, when you get a prompt, type like hell. -% Just once I would like to persuade the audience not to wear any article of blue denim. If only they could see themselves in a pair of brown corduroys like mine instead of this awful, boring blue denim. I don't enjoy the sky @@ -9150,8 +9013,6 @@ -- Samuel Goldwyn % Love comes in spurts. -% -Love comes in spurts. --Devo, "Please Please" % Love is blind but desire doesn't give a good goddam. @@ -9256,6 +9117,9 @@ -- Professor Irwin Corey % Mary had a little lamb, +boy was the doctor surprised! +% +Mary had a little lamb, It's fleece as white as snow. It followed her to school one day, And got fucked by a big black dog. @@ -9627,20 +9491,13 @@ They nearly knocked me down to be the first in town To get their Elephant Shit On Rye! % -`My trip? It was vile. Balaclava +"My trip? It was vile. Balaclava I loathed. Etna was crawling with lava. The ship was all white But it creaked in the night, And the band, they did not know la java." -- Edward Gorey % -`My trip? It was vile. Balaclava -I loathed. Etna was crawling with lava. - The ship was all white - But it creaked in the night, -And the band, they did not know la java." - -- Edward Gorey -% My wife and I only smoke after sex. I've had the same pack since 1967. She's up to three packs a day. -- Rodney Dangerfield @@ -9831,8 +9688,6 @@ their commanders not allowing them to write "fuck" on their airplanes because it's obscene. % -Obscenity is a crutch for lazy Motherfuckers. -% Obscenity is the crutch of inarticulate motherfuckers. % Oden the bardling averred @@ -9901,12 +9756,6 @@ Tore his testes away - - An example of animal huma. % -Oh pity the prince, Montezuma -He tried to make love to a puma. - Seems the puma, in play, - Tore his testes away -- -An example of animal huma. -% Oh what a tangled web we weave when first we practice to conceive. -- Don Herold % @@ -9929,12 +9778,6 @@ Warning: Avoid contact with eyes and open cuts. Keep away from open naked flames -- both old and new. % -Old King Cole was a merry old soul, -A merry old soul was he. -He called for his pipe, -And he called for his drums, -And he fiddled with his call girls three. -% Old King Cole Was a merry old soul, A merry old soul was he! @@ -10039,12 +9882,6 @@ For the sake of the blind, Was the same information -- in Braille. % -On the breasts of a harlot from Yale -Was tattooed the price of her tail - And on her behind, - For the sake of the blind, -Was the same information in Braille. -% On the porch of a dude named Horatio, His girl got a yen for fellatio. As she sucked on his dingus @@ -10326,12 +10163,6 @@ With an actress, a whore and a poetess. When asked what position He used for coition, -He answered serenely, "the loetus." -% -One evening a guru had coitus -With an actress, a whore and a poetess. - When asked what position - He used for coition, He answered serenely, "the lotus." % One fall day, two men were out in the woods hunting. Feeling a sudden need @@ -10496,31 +10327,6 @@ There's no stopping it -- For short trips, two poots take you far. % -Our team usually puts the other woman at second base, where the maximum -possible number of males can get there on short notice to help out in case -of emergency. As far as I can tell, our second basewoman is a pretty good -baseball player, better than I am, anyway, but there's no way to know for -sure because if the ball gets anywhere near her, a male comes barging over -from, say, right field, to deal with it. She's been on the team for three -seasons now, but the males still don't trust her. They know, deep in their -souls, that if she had to choose between catching a fly ball and saving an -infant's life, she probably would elect to save the infant's life, without -ever considering whether there were men on base. - -- Dave Barry, "Sports is a Drag" -% -Our team usually puts the other woman at second base, where the maximum -possible number of males can get there on short notice to help out in -case of emergency. As far as I can tell, our second basewoman is a -pretty good baseball player, better than I am, anyway, but there's no -way to know for sure because if the ball gets anywhere near her, a male -comes barging over from, say, right field, to deal with it. She's been -on the team for three seasons now, but the males still don't trust -her. They know, deep in their souls, that if she had to choose between -catching a fly ball and saving an infant's life, she probably would -elect to save the infant's life, without ever considering whether there -were men on base. - -- Dave Barry, "Sports is a Drag" -% Our universe itself keeps on expanding and expanding, In all of the directions it can whiz; As fast as it can go, that's the speed of light, you know, @@ -11917,7 +11723,6 @@ It's Commode Huggin' Time In The Valley If You Want to Keep the Beer Real Cold, Put It Next to My Ex-wife's Heart If You Get the Feeling That I Don't Love You, Feel Again -I'm Ashamed To Be Here, But Not Ashamed Enough To Leave It's the Bottle Against the Bible in the Battle For Daddy's Soul My Wife Ran Off With My Best Friend, And I Sure Miss Him Don't Cut Any More Wood, Baby, 'Cause I'll Be Comin' Home With A Load @@ -12703,7 +12508,7 @@ % The honest female orgasm is three to fifteen rhythmic contractions of the outer third of the vagina at .8 second intervals, which is approximately -the beat of Surfing Safari" by the Beach Boys. Unless these contractions +the beat of "Surfing Safari" by the Beach Boys. Unless these contractions occur, you can regard her groaning, moaning, clawing, kicking, begging for mercy, and shouting filthy religious epithets as bargain-basement histrionics. -- John Hughes, National Lampoon @@ -15092,10 +14897,6 @@ Why is it that there are so many more horses' asses than there are horses? -- G. Gordon Liddy % -Why is it that there are so many more -horses' asses than there are horses? - -- G. Gordon Liddy -% Why is Mrs. Carter always on top when she and Jimmy make love? Because all Jimmy Carter can do is fuck up. % ==== //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#18 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ FreeBSD ¥×¥í¥¸¥§¥¯¥È - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.82 2003/03/22 05:47:29 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.83 2003/03/24 21:42:53 hrs Exp $ 2000 ==== //depot/projects/trustedbsd/mac/sbin/mount_nfs/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # -# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.12 2001/12/04 02:19:51 obrien Exp $ +# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.13 2003/03/25 00:16:41 mdodd Exp $ PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c mounttab.c @@ -9,7 +9,7 @@ MOUNT= ${.CURDIR}/../mount UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL} -WARNS= 0 +WARNS= 2 .PATH: ${MOUNT} ${UMNTALL} ==== //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.8#6 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" -.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.36 2003/01/27 20:12:32 dillon Exp $ +.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.37 2003/03/25 01:25:30 mdodd Exp $ .\"" .Dd March 29, 1995 .Dt MOUNT_NFS 8 @@ -227,6 +227,10 @@ for regular files, and 30 -> 60 seconds for directories. The algorithm to calculate the timeout is based on the age of the file. The older the file, the longer the cache is considered valid, subject to the limits above. +.It noinet4 +.It noinet6 +Disables AF_INET or AF_INET6 connections. Useful for hosts that have +both an A record and an AAAA record for the same name. .El .Pp .Bl -tag -width "dumbtimerXX" ==== //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#7 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.57 2002/09/14 15:14:29 mux Exp $"; + "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.59 2003/03/25 01:25:30 mdodd Exp $"; #endif /* not lint */ #include @@ -72,6 +72,7 @@ #include #include #include +#include #include #include #include @@ -97,6 +98,8 @@ #define ALTF_ACDIRMIN 0x20000 #define ALTF_ACDIRMAX 0x40000 #define ALTF_NOLOCKD 0x80000 +#define ALTF_NOINET4 0x100000 +#define ALTF_NOINET6 0x200000 struct mntopt mopts[] = { MOPT_STDOPTS, @@ -120,6 +123,8 @@ { "acdirmin=", 0, ALTF_ACDIRMIN, 1 }, { "acdirmax=", 0, ALTF_ACDIRMAX, 1 }, { "lockd", 1, ALTF_NOLOCKD, 1 }, + { "inet4", 1, ALTF_NOINET4, 1 }, + { "inet6", 1, ALTF_NOINET6, 1 }, { NULL } }; @@ -171,6 +176,8 @@ }; #define BGRND 1 #define ISBGRND 2 +#define OF_NOINET4 4 +#define OF_NOINET6 8 int retrycnt = -1; int opflags = 0; int nfsproto = IPPROTO_UDP; @@ -248,7 +255,7 @@ int c; struct nfs_args *nfsargsp; struct nfs_args nfsargs; - int mntflags, altflags, nfssvc_flag, num; + int mntflags, altflags, num; char *name, *p, *spec; char mntpath[MAXPATHLEN]; @@ -332,6 +339,10 @@ */ if (altflags & ALTF_BG) opflags |= BGRND; + if (altflags & ALTF_NOINET4) + opflags |= OF_NOINET4; + if (altflags & ALTF_NOINET6) + opflags |= OF_NOINET6; if (altflags & ALTF_MNTUDP) mnttcp_ok = 0; if (altflags & ALTF_TCP) { @@ -528,6 +539,12 @@ */ remoteerr = 0; for (ai = ai_nfs; ai != NULL; ai = ai->ai_next) { + if ((ai->ai_family == AF_INET6) && + (opflags & OF_NOINET6)) + continue; + if ((ai->ai_family == AF_INET) && + (opflags & OF_NOINET4)) + continue; ret = nfs_tryproto(nfsargsp, ai, hostp, spec, &errstr); if (ret == TRYRET_SUCCESS) break; @@ -690,7 +707,8 @@ try.tv_sec = 10; try.tv_usec = 0; - stat = clnt_call(clp, NFSPROC_NULL, xdr_void, NULL, xdr_void, NULL, + stat = clnt_call(clp, NFSPROC_NULL, (xdrproc_t)xdr_void, NULL, + (xdrproc_t)xdr_void, NULL, try); if (stat != RPC_SUCCESS) { if (stat == RPC_PROGVERSMISMATCH && trymntmode == ANY) { @@ -719,7 +737,8 @@ clp->cl_auth = authsys_create_default(); nfhret.auth = RPCAUTH_UNIX; nfhret.vers = mntvers; - stat = clnt_call(clp, RPCMNT_MOUNT, xdr_dir, spec, xdr_fh, &nfhret, + stat = clnt_call(clp, RPCMNT_MOUNT, (xdrproc_t)xdr_dir, spec, + (xdrproc_t)xdr_fh, &nfhret, try); auth_destroy(clp->cl_auth); if (stat != RPC_SUCCESS) { ==== //depot/projects/trustedbsd/mac/sbin/ping/ping.c#15 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping/ping.c,v 1.89 2003/03/24 11:26:08 bde Exp $"; + "$FreeBSD: src/sbin/ping/ping.c,v 1.90 2003/03/24 23:48:36 mdodd Exp $"; #endif /* not lint */ /* @@ -167,7 +167,6 @@ int uid; /* cached uid for micro-optimization */ u_char icmp_type = ICMP_ECHO; u_char icmp_type_rsp = ICMP_ECHOREPLY; -int timeoffset = 0; int phdr_len = 0; /* counters */ @@ -439,31 +438,33 @@ usage(); target = argv[optind]; - maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN; - if (options & F_MASK) { + switch (options & (F_MASK|F_TIME)) { + case 0: break; + case F_MASK: icmp_type = ICMP_MASKREQ; icmp_type_rsp = ICMP_MASKREPLY; - timeoffset = MASK_LEN; - datalen -= MASK_LEN; - phdr_len += MASK_LEN; + phdr_len = MASK_LEN; if (!(options & F_QUIET)) (void)printf("ICMP_MASKREQ\n"); - } - if (options & F_TIME) { + break; + case F_TIME: icmp_type = ICMP_TSTAMP; icmp_type_rsp = ICMP_TSTAMPREPLY; - timeoffset = TS_LEN; - datalen -= TS_LEN; - phdr_len += TS_LEN; + phdr_len = TS_LEN; if (!(options & F_QUIET)) (void)printf("ICMP_TSTAMP\n"); + break; + default: + errx(EX_USAGE, "ICMP_TSTAMP and ICMP_MASKREQ are exclusive."); + break; } + maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN - phdr_len; if (options & F_RROUTE) maxpayload -= MAX_IPOPTLEN; if (datalen > maxpayload) errx(EX_USAGE, "packet size too large: %d > %d", datalen, maxpayload); - datap = &outpack[MINICMPLEN + phdr_len]; + datap = &outpack[MINICMPLEN + phdr_len + TIMEVAL_LEN]; if (options & F_PINGFILLED) { fill((char *)datap, payload); } @@ -524,16 +525,13 @@ errx(EX_USAGE, "-I, -L, -T flags cannot be used with unicast destination"); - if (datalen - TIMEVAL_LEN >= TIMEVAL_LEN) { /* can we time transfer */ - datalen -= TIMEVAL_LEN; - phdr_len += TIMEVAL_LEN; + if (datalen >= TIMEVAL_LEN) /* can we time transfer */ timing = 1; - } packlen = MAXIPLEN + MAXICMPLEN + datalen; packlen = packlen > IP_MAXPACKET ? IP_MAXPACKET : packlen; if (!(options & F_PINGFILLED)) - for (i = phdr_len; i < datalen; ++i) + for (i = TIMEVAL_LEN; i < datalen; ++i) *datap++ = i; ident = getpid() & 0xFFFF; @@ -869,11 +867,12 @@ icp->icmp_otime = htonl((now.tv_sec % (24*60*60)) * 1000 + now.tv_usec / 1000); if (timing) - bcopy((void *)&now, (void *)&outpack[MINICMPLEN + timeoffset], - sizeof(struct timeval)); + bcopy((void *)&now, + (void *)&outpack[MINICMPLEN + phdr_len], + sizeof(struct timeval)); } - cc = MINICMPLEN + datalen + timeoffset; + cc = MINICMPLEN + phdr_len + datalen; /* compute ICMP checksum here */ icp->icmp_cksum = in_cksum((u_short *)icp, cc); @@ -954,7 +953,7 @@ #else tp = icp->icmp_data; #endif - tp+=timeoffset; + tp += phdr_len; /* Copy to avoid alignment problems: */ memcpy(&tv1, tp, sizeof(tv1)); @@ -1565,7 +1564,7 @@ &pat[13], &pat[14], &pat[15]); if (ii > 0) - for (kk = 0; kk <= maxpayload - (phdr_len + ii); kk += ii) + for (kk = 0; kk <= maxpayload - (TIMEVAL_LEN + ii); kk += ii) for (jj = 0; jj < ii; ++jj) bp[jj + kk] = pat[jj]; if (!(options & F_QUIET)) { ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.43 2003/03/03 12:15:38 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.44 2003/03/25 00:06:59 jake Exp $ */ /* @@ -218,7 +218,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this ==== //depot/projects/trustedbsd/mac/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.3 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -89,6 +89,7 @@ typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; ==== //depot/projects/trustedbsd/mac/sys/arm/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.2 2002/08/23 16:49:04 mike Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 9:53:11 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A03BA37B404; Tue, 25 Mar 2003 09:52:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 397DE37B401 for ; Tue, 25 Mar 2003 09:52:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9336C43FA3 for ; Tue, 25 Mar 2003 09:52:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PHqf0U082322 for ; Tue, 25 Mar 2003 09:52:41 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PHqc26082319 for perforce@freebsd.org; Tue, 25 Mar 2003 09:52:38 -0800 (PST) Date: Tue, 25 Mar 2003 09:52:38 -0800 (PST) Message-Id: <200303251752.h2PHqc26082319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27360 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-16.7 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27360 Change 27360 by jmallett@jmallett_dalek on 2003/03/25 09:52:08 IFC. Affected files ... .. //depot/projects/mips/bin/chflags/chflags.1#2 integrate .. //depot/projects/mips/bin/chio/chio.1#3 integrate .. //depot/projects/mips/bin/dd/args.c#3 integrate .. //depot/projects/mips/bin/ls/Makefile#3 integrate .. //depot/projects/mips/bin/ls/cmp.c#2 integrate .. //depot/projects/mips/bin/ls/extern.h#3 integrate .. //depot/projects/mips/bin/ls/ls.1#6 integrate .. //depot/projects/mips/bin/ls/ls.c#6 integrate .. //depot/projects/mips/bin/ls/ls.h#3 integrate .. //depot/projects/mips/bin/ls/print.c#6 integrate .. //depot/projects/mips/bin/ls/util.c#2 integrate .. //depot/projects/mips/bin/sh/expand.c#4 integrate .. //depot/projects/mips/bin/sh/jobs.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/sysv4.h#3 integrate .. //depot/projects/mips/contrib/gdtoa/README#2 integrate .. //depot/projects/mips/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/mips/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/mips/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/mips/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/mips/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/mips/contrib/isc-dhcp/client/dhclient.8#3 integrate .. //depot/projects/mips/contrib/isc-dhcp/client/dhclient.c#3 integrate .. //depot/projects/mips/contrib/one-true-awk/FIXES#3 integrate .. //depot/projects/mips/contrib/one-true-awk/README#3 integrate .. //depot/projects/mips/contrib/one-true-awk/b.c#3 integrate .. //depot/projects/mips/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/mips/contrib/one-true-awk/main.c#3 integrate .. //depot/projects/mips/contrib/one-true-awk/makefile#3 integrate .. //depot/projects/mips/contrib/one-true-awk/run.c#3 integrate .. //depot/projects/mips/crypto/openssl/crypto/rsa/rsa_eay.c#4 integrate .. //depot/projects/mips/crypto/openssl/crypto/rsa/rsa_lib.c#4 integrate .. //depot/projects/mips/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/mips/etc/defaults/rc.conf#10 integrate .. //depot/projects/mips/etc/mail/aliases#3 integrate .. //depot/projects/mips/etc/mtree/BSD.local.dist#6 integrate .. //depot/projects/mips/etc/pam.d/Makefile#3 integrate .. //depot/projects/mips/etc/rc.d/Makefile#4 integrate .. //depot/projects/mips/etc/rc.d/ipfilter#5 integrate .. //depot/projects/mips/etc/rc.d/kldxref#1 branch .. //depot/projects/mips/games/caesar/caesar.6#2 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2-o#3 integrate .. //depot/projects/mips/games/fortune/datfiles/murphy#3 integrate .. //depot/projects/mips/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/mips/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/Makefile#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/mips/gnu/usr.bin/send-pr/send-pr.sh#2 integrate .. //depot/projects/mips/lib/libatm/Makefile#2 integrate .. //depot/projects/mips/lib/libatm/atm_addr.c#2 integrate .. //depot/projects/mips/lib/libatm/cache_key.c#2 integrate .. //depot/projects/mips/lib/libatm/ip_addr.c#2 integrate .. //depot/projects/mips/lib/libatm/libatm.h#2 integrate .. //depot/projects/mips/lib/libatm/timer.c#2 integrate .. //depot/projects/mips/lib/libc/alpha/_fpmath.h#2 integrate .. //depot/projects/mips/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/mips/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/mips/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/mips/lib/libc/i386/string/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/i386/string/wcslen.S#1 branch .. //depot/projects/mips/lib/libc/locale/lnumeric.c#2 integrate .. //depot/projects/mips/lib/libc/locale/setlocale.3#3 integrate .. //depot/projects/mips/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/mips/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/mips/lib/libc/stdlib/strfmon.c#4 integrate .. //depot/projects/mips/lib/libc/stdlib/strtod.c#3 delete .. //depot/projects/mips/lib/libc/sys/open.2#3 integrate .. //depot/projects/mips/lib/libc/sys/sigaction.2#6 integrate .. //depot/projects/mips/lib/libc/sys/socket.2#4 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_attr_get_np.3#6 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_condattr.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_create.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_detach.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_equal.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_exit.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_getspecific.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_join.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_key_create.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_key_delete.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_kill.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_destroy.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_init.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_lock.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_trylock.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutex_unlock.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_mutexattr.3#3 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_once.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_rwlockattr_setpshared.3#3 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_schedparam.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_self.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_setspecific.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_sigmask.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/pthread_testcancel.3#2 integrate .. //depot/projects/mips/lib/libc_r/man/sem_destroy.3#3 integrate .. //depot/projects/mips/lib/libc_r/man/sem_getvalue.3#3 integrate .. //depot/projects/mips/lib/libc_r/man/sem_init.3#3 integrate .. //depot/projects/mips/lib/libc_r/man/sem_wait.3#3 integrate .. //depot/projects/mips/lib/libc_r/man/sigwait.3#2 integrate .. //depot/projects/mips/lib/libcompat/4.1/cftime.3#2 integrate .. //depot/projects/mips/lib/libcompat/4.4/cuserid.3#2 integrate .. //depot/projects/mips/lib/libdevstat/Makefile#2 integrate .. //depot/projects/mips/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/mips/lib/libdevstat/devstat.c#3 integrate .. //depot/projects/mips/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/mips/lib/libdisk/disk.c#11 integrate .. //depot/projects/mips/lib/libdisk/libdisk.3#5 integrate .. //depot/projects/mips/lib/libfetch/ftp.c#6 integrate .. //depot/projects/mips/lib/libgeom/Makefile#4 integrate .. //depot/projects/mips/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/mips/lib/libgeom/geom_stats.c#3 integrate .. //depot/projects/mips/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/mips/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/mips/lib/libipsec/ipsec_set_policy.3#4 integrate .. //depot/projects/mips/lib/libkvm/kvm.3#4 integrate .. //depot/projects/mips/lib/libkvm/kvm_getfiles.3#2 integrate .. //depot/projects/mips/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/mips/lib/libkvm/kvm_nlist.3#2 integrate .. //depot/projects/mips/lib/libkvm/kvm_open.3#3 integrate .. //depot/projects/mips/lib/libmd/mdX.3#2 integrate .. //depot/projects/mips/lib/libmd/ripemd.3#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_rwlock.c#2 integrate .. //depot/projects/mips/lib/libstand/libstand.3#4 integrate .. //depot/projects/mips/lib/libutil/_secure_path.3#2 integrate .. //depot/projects/mips/lib/libutil/login_cap.3#3 integrate .. //depot/projects/mips/lib/libutil/login_class.3#2 integrate .. //depot/projects/mips/lib/libutil/login_ok.3#2 integrate .. //depot/projects/mips/lib/libutil/login_times.3#2 integrate .. //depot/projects/mips/lib/libutil/login_tty.3#2 integrate .. //depot/projects/mips/lib/libutil/logout.3#2 integrate .. //depot/projects/mips/lib/libutil/property.3#2 integrate .. //depot/projects/mips/lib/libutil/pty.3#2 integrate .. //depot/projects/mips/lib/libutil/pw_util.c#3 integrate .. //depot/projects/mips/lib/libutil/realhostname.3#2 integrate .. //depot/projects/mips/lib/libutil/realhostname_sa.3#4 integrate .. //depot/projects/mips/lib/libutil/trimdomain.3#2 integrate .. //depot/projects/mips/lib/libz/gzio.c#2 integrate .. //depot/projects/mips/libexec/rpc.rstatd/rstat_proc.c#3 integrate .. //depot/projects/mips/libexec/rtld-elf/alpha/reloc.c#3 integrate .. //depot/projects/mips/libexec/rtld-elf/i386/reloc.c#3 integrate .. //depot/projects/mips/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/mips/libexec/rtld-elf/map_object.c#4 integrate .. //depot/projects/mips/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/sparc64/reloc.c#4 integrate .. //depot/projects/mips/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/mips/release/Makefile#16 integrate .. //depot/projects/mips/release/alpha/dokern.sh#6 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#7 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#5 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#7 integrate .. //depot/projects/mips/release/i386/dokern.sh#8 integrate .. //depot/projects/mips/release/i386/drivers.conf#11 integrate .. //depot/projects/mips/release/ia64/doFS.sh#2 integrate .. //depot/projects/mips/release/pc98/dokern.sh#9 integrate .. //depot/projects/mips/release/pc98/drivers.conf#7 integrate .. //depot/projects/mips/release/scripts/doFS.sh#5 integrate .. //depot/projects/mips/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/mips/sbin/camcontrol/modeedit.c#3 integrate .. //depot/projects/mips/sbin/dhclient/Makefile#2 integrate .. //depot/projects/mips/sbin/dhclient/Makefile.inc#2 integrate .. //depot/projects/mips/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/mips/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/mips/sbin/disklabel/disklabel.8#7 integrate .. //depot/projects/mips/sbin/disklabel/disklabel.c#8 integrate .. //depot/projects/mips/sbin/ip6fw/ip6fw.c#2 integrate .. //depot/projects/mips/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/mips/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/mips/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/mips/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/mips/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/mips/sbin/ping/ping.c#8 integrate .. //depot/projects/mips/sbin/vinum/commands.c#4 integrate .. //depot/projects/mips/sbin/vinum/list.c#4 integrate .. //depot/projects/mips/secure/usr.bin/bdes/bdes.1#2 integrate .. //depot/projects/mips/share/examples/ppp/ppp.conf.sample#3 integrate .. //depot/projects/mips/share/man/man4/ahc.4#2 integrate .. //depot/projects/mips/share/man/man4/ccd.4#3 integrate .. //depot/projects/mips/share/man/man4/icmp.4#2 integrate .. //depot/projects/mips/share/man/man4/inet.4#3 integrate .. //depot/projects/mips/share/man/man4/intro.4#3 integrate .. //depot/projects/mips/share/man/man4/kld.4#3 integrate .. //depot/projects/mips/share/man/man4/pcm.4#3 integrate .. //depot/projects/mips/share/man/man4/tap.4#3 integrate .. //depot/projects/mips/share/man/man4/tcp.4#5 integrate .. //depot/projects/mips/share/man/man4/tun.4#2 integrate .. //depot/projects/mips/share/man/man4/ukbd.4#4 integrate .. //depot/projects/mips/share/man/man4/urio.4#2 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/mips/share/man/man7/release.7#7 integrate .. //depot/projects/mips/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/mips/share/man/man8/Makefile#3 integrate .. //depot/projects/mips/share/man/man8/man8.alpha/MAKEDEV.8#2 delete .. //depot/projects/mips/share/man/man8/man8.alpha/Makefile#2 delete .. //depot/projects/mips/share/man/man8/man8.i386/MAKEDEV.8#2 delete .. //depot/projects/mips/share/man/man8/man8.i386/Makefile#2 delete .. //depot/projects/mips/share/man/man9/Makefile#6 integrate .. //depot/projects/mips/share/man/man9/at_exit.9#2 delete .. //depot/projects/mips/share/man/man9/at_fork.9#2 delete .. //depot/projects/mips/share/man/man9/ifnet.9#3 integrate .. //depot/projects/mips/share/man/man9/style.9#5 integrate .. //depot/projects/mips/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/mips/sys/alpha/alpha/busdma_machdep.c#7 integrate .. //depot/projects/mips/sys/alpha/alpha/mem.c#5 integrate .. //depot/projects/mips/sys/alpha/conf/GENERIC#8 integrate .. //depot/projects/mips/sys/alpha/include/_types.h#3 integrate .. //depot/projects/mips/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/mips/sys/alpha/osf1/imgact_osf1.c#4 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_mount.c#3 integrate .. //depot/projects/mips/sys/arm/include/_types.h#2 integrate .. //depot/projects/mips/sys/cam/cam_periph.c#5 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/mips/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/mips/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/mips/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/mips/sys/conf/NOTES#15 integrate .. //depot/projects/mips/sys/conf/files#19 integrate .. //depot/projects/mips/sys/conf/files.i386#11 integrate .. //depot/projects/mips/sys/conf/files.pc98#11 integrate .. //depot/projects/mips/sys/conf/files.sparc64#8 integrate .. //depot/projects/mips/sys/conf/options#17 integrate .. //depot/projects/mips/sys/contrib/dev/fla/fla.c#6 integrate .. //depot/projects/mips/sys/contrib/dev/oltr/if_oltr.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/mips/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/mips/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/mips/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/mips/sys/dev/ccd/ccd.c#7 integrate .. //depot/projects/mips/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/mips/sys/dev/drm/drm_fops.h#3 integrate .. //depot/projects/mips/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/mips/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/mips/sys/dev/em/LICENSE#2 integrate .. //depot/projects/mips/sys/dev/em/README#4 integrate .. //depot/projects/mips/sys/dev/em/if_em.c#7 integrate .. //depot/projects/mips/sys/dev/em/if_em.h#5 integrate .. //depot/projects/mips/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/mips/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/mips/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/mips/sys/dev/fb/fb.c#5 integrate .. //depot/projects/mips/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/mips/sys/dev/fb/vga.c#5 integrate .. //depot/projects/mips/sys/dev/firewire/firewire.c#13 integrate .. //depot/projects/mips/sys/dev/firewire/fwmem.c#7 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci.c#12 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#10 integrate .. //depot/projects/mips/sys/dev/firewire/if_fwe.c#9 integrate .. //depot/projects/mips/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/mips/sys/dev/ida/ida.c#5 integrate .. //depot/projects/mips/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/mips/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/mips/sys/dev/md/md.c#11 integrate .. //depot/projects/mips/sys/dev/musycc/musycc.c#5 integrate .. //depot/projects/mips/sys/dev/pccard/pccard.c#7 integrate .. //depot/projects/mips/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#8 integrate .. //depot/projects/mips/sys/dev/pdq/pdq_freebsd.h#4 integrate .. //depot/projects/mips/sys/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/mips/sys/dev/puc/puc.c#4 integrate .. //depot/projects/mips/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/mips/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/mips/sys/dev/raidframe/rf_threadstuff.h#2 integrate .. //depot/projects/mips/sys/dev/sio/sio.c#7 integrate .. //depot/projects/mips/sys/dev/sio/sioreg.h#2 integrate .. //depot/projects/mips/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/mips/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/mips/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/mips/sys/dev/syscons/apm/apm_saver.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/mips/sys/dev/tdfx/tdfx_pci.c#6 integrate .. //depot/projects/mips/sys/dev/twe/twe_compat.h#5 integrate .. //depot/projects/mips/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/mips/sys/dev/ubsec/ubsec.c#9 integrate .. //depot/projects/mips/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/mips/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#8 integrate .. //depot/projects/mips/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/mips/sys/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/mips/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/mips/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/mips/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/mips/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/mips/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/mips/sys/geom/bde/g_bde.c#7 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_crypt.c#6 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_lock.c#7 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/mips/sys/geom/geom.h#12 integrate .. //depot/projects/mips/sys/geom/geom_aes.c#5 integrate .. //depot/projects/mips/sys/geom/geom_apple.c#3 integrate .. //depot/projects/mips/sys/geom/geom_bsd.c#10 integrate .. //depot/projects/mips/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/mips/sys/geom/geom_ctl.h#1 branch .. //depot/projects/mips/sys/geom/geom_dev.c#12 integrate .. //depot/projects/mips/sys/geom/geom_disk.c#11 integrate .. //depot/projects/mips/sys/geom/geom_dump.c#9 integrate .. //depot/projects/mips/sys/geom/geom_event.c#6 integrate .. //depot/projects/mips/sys/geom/geom_ext.h#1 branch .. //depot/projects/mips/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/mips/sys/geom/geom_int.h#5 integrate .. //depot/projects/mips/sys/geom/geom_io.c#11 integrate .. //depot/projects/mips/sys/geom/geom_kern.c#9 integrate .. //depot/projects/mips/sys/geom/geom_mbr.c#7 integrate .. //depot/projects/mips/sys/geom/geom_mirror.c#3 integrate .. //depot/projects/mips/sys/geom/geom_pc98.c#7 integrate .. //depot/projects/mips/sys/geom/geom_slice.c#9 integrate .. //depot/projects/mips/sys/geom/geom_stats.c#5 delete .. //depot/projects/mips/sys/geom/geom_stats.h#3 delete .. //depot/projects/mips/sys/geom/geom_subr.c#11 integrate .. //depot/projects/mips/sys/geom/geom_sunlabel.c#6 integrate .. //depot/projects/mips/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/mips/sys/geom/notes#3 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/mips/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/mips/sys/i386/apm/apm.c#4 delete .. //depot/projects/mips/sys/i386/apm/apm.h#2 delete .. //depot/projects/mips/sys/i386/bios/apm.c#1 branch .. //depot/projects/mips/sys/i386/bios/apm.h#1 branch .. //depot/projects/mips/sys/i386/bios/mca_machdep.c#1 branch .. //depot/projects/mips/sys/i386/bios/mca_machdep.h#1 branch .. //depot/projects/mips/sys/i386/bios/smapi.c#1 branch .. //depot/projects/mips/sys/i386/bios/smapi_bios.S#1 branch .. //depot/projects/mips/sys/i386/bios/smbios.c#1 branch .. //depot/projects/mips/sys/i386/bios/vpd.c#1 branch .. //depot/projects/mips/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/mips/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/mips/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/mips/sys/i386/i386/elan-mmcr.c#5 integrate .. //depot/projects/mips/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/mips/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/mips/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/mips/sys/i386/i386/mem.c#6 integrate .. //depot/projects/mips/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/mips/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/mips/sys/i386/i386/vm86.c#6 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/mips/sys/i386/include/_types.h#3 integrate .. //depot/projects/mips/sys/i386/include/apic.h#3 integrate .. //depot/projects/mips/sys/i386/include/md_var.h#4 integrate .. //depot/projects/mips/sys/i386/include/param.h#3 integrate .. //depot/projects/mips/sys/i386/include/pmap.h#3 integrate .. //depot/projects/mips/sys/i386/include/smapi.h#2 integrate .. //depot/projects/mips/sys/i386/isa/clock.c#6 integrate .. //depot/projects/mips/sys/i386/isa/if_le.c#6 integrate .. //depot/projects/mips/sys/i386/isa/intr_machdep.c#3 integrate .. //depot/projects/mips/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/mips/sys/i386/isa/mca_machdep.c#2 integrate .. //depot/projects/mips/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/mips/sys/i386/isa/spigot.c#4 integrate .. //depot/projects/mips/sys/i386/isa/spkr.c#7 integrate .. //depot/projects/mips/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/mips/sys/i386/smapi/smapi.c#3 delete .. //depot/projects/mips/sys/i386/smapi/smapi_bios.S#2 delete .. //depot/projects/mips/sys/i386/smapi/smapi_isa.c#2 delete .. //depot/projects/mips/sys/i386/smapi/smapi_var.h#2 delete .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/mips/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/mips/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/mips/sys/ia64/conf/SKI#7 integrate .. //depot/projects/mips/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/mips/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/mips/sys/ia64/include/_types.h#4 integrate .. //depot/projects/mips/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/mips/sys/isa/fd.c#5 integrate .. //depot/projects/mips/sys/isa/orm.c#2 integrate .. //depot/projects/mips/sys/isa/vga_isa.c#4 integrate .. //depot/projects/mips/sys/kern/bus_if.m#3 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#13 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#12 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#13 integrate .. //depot/projects/mips/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/mips/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/mips/sys/kern/kern_switch.c#10 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#11 integrate .. //depot/projects/mips/sys/kern/kern_tc.c#7 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#14 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/mips/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/mips/sys/kern/subr_disk.c#9 integrate .. //depot/projects/mips/sys/kern/subr_prf.c#8 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#13 integrate .. //depot/projects/mips/sys/kern/subr_xxx.c#4 integrate .. //depot/projects/mips/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/mips/sys/kern/sys_process.c#3 integrate .. //depot/projects/mips/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/mips/sys/kern/uipc_cow.c#4 integrate .. //depot/projects/mips/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/mips/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/mips/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/mips/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/mips/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/mips/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/mips/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/mips/sys/modules/apm/Makefile#3 integrate .. //depot/projects/mips/sys/modules/oltr/Makefile#2 integrate .. //depot/projects/mips/sys/modules/smapi/Makefile#2 integrate .. //depot/projects/mips/sys/net/bpf.c#8 integrate .. //depot/projects/mips/sys/net/if.c#6 integrate .. //depot/projects/mips/sys/net/if_arp.h#2 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/mips/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/mips/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/mips/sys/net/iso88025.h#2 integrate .. //depot/projects/mips/sys/netatalk/aarp.c#5 integrate .. //depot/projects/mips/sys/netinet/ip.h#3 integrate .. //depot/projects/mips/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/mips/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/mips/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/mips/sys/netinet/ip_icmp.h#3 integrate .. //depot/projects/mips/sys/netinet/ip_output.c#10 integrate .. //depot/projects/mips/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/mips/sys/netncp/ncp_subr.c#4 integrate .. //depot/projects/mips/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/mips/sys/pc98/apm/apm.c#4 delete .. //depot/projects/mips/sys/pc98/apm/apm.h#2 delete .. //depot/projects/mips/sys/pc98/conf/GENERIC#11 integrate .. //depot/projects/mips/sys/pc98/i386/machdep.c#11 integrate .. //depot/projects/mips/sys/pc98/pc98/clock.c#5 integrate .. //depot/projects/mips/sys/pc98/pc98/fd.c#6 integrate .. //depot/projects/mips/sys/pc98/pc98/pc98gdc.c#4 integrate .. //depot/projects/mips/sys/pc98/pc98/spkr.c#7 delete .. //depot/projects/mips/sys/pc98/pc98/syscons.c#6 integrate .. //depot/projects/mips/sys/pci/agp.c#7 integrate .. //depot/projects/mips/sys/pci/if_dc.c#10 integrate .. //depot/projects/mips/sys/pci/if_de.c#5 integrate .. //depot/projects/mips/sys/pci/if_rl.c#8 integrate .. //depot/projects/mips/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/mips/sys/pci/if_xl.c#8 integrate .. //depot/projects/mips/sys/pci/if_xlreg.h#6 integrate .. //depot/projects/mips/sys/pci/meteor.c#4 integrate .. //depot/projects/mips/sys/pci/xrpu.c#5 integrate .. //depot/projects/mips/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/mips/sys/powerpc/include/_types.h#4 integrate .. //depot/projects/mips/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/mips/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/mips/sys/powerpc/powerpc/busdma_machdep.c#7 integrate .. //depot/projects/mips/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#8 integrate .. //depot/projects/mips/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/mips/sys/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/mips/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/mips/sys/security/mac_mls/mac_mls.c#10 integrate .. //depot/projects/mips/sys/security/mac_none/mac_none.c#8 integrate .. //depot/projects/mips/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/mips/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/mips/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/mips/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/mips/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/mips/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/mips/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/mips/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/bus_machdep.c#7 integrate .. //depot/projects/mips/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/cheetah.c#1 branch .. //depot/projects/mips/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/mips/sys/sparc64/sparc64/identcpu.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/mips/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/mips/sys/sparc64/sparc64/mem.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/mips/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/mips/sys/sparc64/sparc64/spitfire.c#1 branch .. //depot/projects/mips/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/sys/ata.h#3 integrate .. //depot/projects/mips/sys/sys/conf.h#8 integrate .. //depot/projects/mips/sys/sys/devicestat.h#3 integrate .. //depot/projects/mips/sys/sys/eventhandler.h#4 integrate .. //depot/projects/mips/sys/sys/jumbo.h#2 integrate .. //depot/projects/mips/sys/sys/kse.h#4 integrate .. //depot/projects/mips/sys/sys/mac.h#9 integrate .. //depot/projects/mips/sys/sys/malloc.h#6 integrate .. //depot/projects/mips/sys/sys/mutex.h#4 integrate .. //depot/projects/mips/sys/sys/param.h#8 integrate .. //depot/projects/mips/sys/sys/proc.h#15 integrate .. //depot/projects/mips/sys/sys/stat.h#5 integrate .. //depot/projects/mips/sys/sys/systm.h#5 integrate .. //depot/projects/mips/sys/sys/types.h#7 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_subr.c#3 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/mips/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/mips/sys/vm/device_pager.c#4 integrate .. //depot/projects/mips/sys/vm/pmap.h#6 integrate .. //depot/projects/mips/sys/vm/vm_contig.c#3 integrate .. //depot/projects/mips/sys/vm/vm_extern.h#3 integrate .. //depot/projects/mips/sys/vm/vm_fault.c#7 integrate .. //depot/projects/mips/sys/vm/vm_map.c#11 integrate .. //depot/projects/mips/sys/vm/vm_object.c#13 integrate .. //depot/projects/mips/sys/vm/vm_page.c#14 integrate .. //depot/projects/mips/sys/vm/vm_page.h#7 integrate .. //depot/projects/mips/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/mips/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/mips/sys/x86_64/include/_types.h#2 integrate .. //depot/projects/mips/tools/KSE/rr/rr.c#2 integrate .. //depot/projects/mips/tools/tools/crypto/Makefile#3 integrate .. //depot/projects/mips/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/mips/tools/tools/crypto/hifnstats.c#1 branch .. //depot/projects/mips/tools/tools/crypto/ipsecstats.c#1 branch .. //depot/projects/mips/tools/tools/crypto/ubsecstats.c#2 integrate .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/mips/tools/tools/tinderbox/tinderbox.pl#4 integrate .. //depot/projects/mips/usr.bin/awk/Makefile#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.birthday#5 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.history#4 integrate .. //depot/projects/mips/usr.bin/ipcs/ipcs.1#2 integrate .. //depot/projects/mips/usr.bin/ipcs/ipcs.c#2 integrate .. //depot/projects/mips/usr.bin/systat/iostat.c#3 integrate .. //depot/projects/mips/usr.bin/systat/vmstat.c#4 integrate .. //depot/projects/mips/usr.bin/tftp/main.c#2 integrate .. //depot/projects/mips/usr.bin/uudecode/uudecode.c#5 integrate .. //depot/projects/mips/usr.bin/uuencode/uuencode.1#4 integrate .. //depot/projects/mips/usr.bin/uuidgen/uuidgen.1#3 integrate .. //depot/projects/mips/usr.bin/uuidgen/uuidgen.c#3 integrate .. //depot/projects/mips/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/mips/usr.bin/whois/whois.c#5 integrate .. //depot/projects/mips/usr.bin/window/window.1#2 integrate .. //depot/projects/mips/usr.bin/xargs/xargs.1#5 integrate .. //depot/projects/mips/usr.bin/xargs/xargs.c#5 integrate .. //depot/projects/mips/usr.sbin/Makefile#9 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.8#6 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/mips/usr.sbin/cdcontrol/cdcontrol.c#4 integrate .. //depot/projects/mips/usr.sbin/gstat/Makefile#1 branch .. //depot/projects/mips/usr.sbin/gstat/gstat.8#1 branch .. //depot/projects/mips/usr.sbin/gstat/gstat.c#1 branch .. //depot/projects/mips/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/mips/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/mips/usr.sbin/kgmon/kgmon.8#2 integrate .. //depot/projects/mips/usr.sbin/mtree/mtree.c#3 integrate .. //depot/projects/mips/usr.sbin/ofwdump/ofw_util.c#2 integrate .. //depot/projects/mips/usr.sbin/pccard/pccardd/readcis.c#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/info/info.h#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/info/perform.c#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/info/show.c#4 integrate .. //depot/projects/mips/usr.sbin/ppp/ipv6cp.c#2 integrate .. //depot/projects/mips/usr.sbin/ppp/route.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/menus.c#9 integrate .. //depot/projects/mips/usr.sbin/ypserv/Makefile.yp#2 integrate Differences ... ==== //depot/projects/mips/bin/chflags/chflags.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.15 2003/02/18 19:51:59 obrien Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.16 2003/03/24 20:15:58 johan Exp $ .\" -.Dd May 2, 1995 +.Dd Mar 24, 2003 .Dt CHFLAGS 1 .Os .Sh NAME @@ -110,11 +110,16 @@ .Pp Putting the letters .Dq Ar no -before an option causes the flag to be turned off. +before or removing the letters +.Dq Ar no +from a keyword causes the flag to be cleared. For example: -.Bl -tag -offset indent -width "nouchg" +.Pp +.Bl -tag -offset indent -width "nouchg" -compact .It Ar nouchg -the immutable bit should be cleared +clear the user immutable flag (owner or super-user only) +.It Ar dump +clear the nodump flag (owner or super-user only) .El .Pp Symbolic links do not have flags, so unless the ==== //depot/projects/mips/bin/chio/chio.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/chio/chio.1,v 1.22 2003/01/01 18:48:38 schweikh Exp $ +.\" $FreeBSD: src/bin/chio/chio.1,v 1.23 2003/03/24 16:08:13 charnier Exp $ .\" .Dd May 14, 1998 .Dt CHIO 1 @@ -47,9 +47,10 @@ .Ar arg2 .Op Ar arg3 Op ... .Sh DESCRIPTION +The .Nm -is used to control the operation of medium changers, such as those found -in tape and optical disk jukeboxes. +utility is used to control the operation of medium changers, such as those +found in tape and optical disk jukeboxes. .Pp The options are as follows: .Bl -tag -width indent ==== //depot/projects/mips/bin/dd/args.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.34 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.36 2003/03/15 13:34:48 ru Exp $"); #include @@ -189,7 +189,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "bs must be between 1 and %d", SSIZE_MAX); + errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX); in.dbsz = out.dbsz = (size_t)res; } @@ -200,7 +200,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "cbs must be between 1 and %d", SSIZE_MAX); + errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX); cbsz = (size_t)res; } @@ -235,7 +235,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %zd", SSIZE_MAX); + errx(1, "ibs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -255,7 +256,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %zd", SSIZE_MAX); + errx(1, "obs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); out.dbsz = (size_t)res; } } ==== //depot/projects/mips/bin/ls/Makefile#3 (text+ko) ==== ==== //depot/projects/mips/bin/ls/cmp.c#2 (text+ko) ==== ==== //depot/projects/mips/bin/ls/extern.h#3 (text+ko) ==== ==== //depot/projects/mips/bin/ls/ls.1#6 (text+ko) ==== ==== //depot/projects/mips/bin/ls/ls.c#6 (text+ko) ==== ==== //depot/projects/mips/bin/ls/ls.h#3 (text+ko) ==== ==== //depot/projects/mips/bin/ls/print.c#6 (text+ko) ==== ==== //depot/projects/mips/bin/ls/util.c#2 (text+ko) ==== ==== //depot/projects/mips/bin/sh/expand.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.41 2003/01/08 10:50:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.42 2003/03/15 07:56:59 ru Exp $"); #include #include @@ -531,7 +531,7 @@ outfmt(&errout, "%s\n", startp); error((char *)NULL); } - error("%.*s: parameter %snot set", p - str - 1, + error("%.*s: parameter %snot set", (int)(p - str - 1), str, (varflags & VSNUL) ? "null or " : nullstr); return 0; @@ -666,7 +666,8 @@ case VSTRIMRIGHT: case VSTRIMRIGHTMAX: case VSLENGTH: - error("%.*s: parameter not set", p - var - 1, var); + error("%.*s: parameter not set", (int)(p - var - 1), + var); } } if (set && subtype != VSPLUS) { ==== //depot/projects/mips/bin/sh/jobs.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.62 2003/01/27 07:41:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.63 2003/03/17 11:28:56 tjr Exp $"); #include #include @@ -740,6 +740,7 @@ TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n, mode)); INTOFF; + flushall(); pid = fork(); if (pid == -1) { TRACE(("Fork failed, errno=%d\n", errno)); ==== //depot/projects/mips/contrib/cvs/src/parseinfo.c#3 (text+ko) ==== @@ -4,6 +4,8 @@ * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. + * + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.2 2003/03/20 11:05:48 des Exp $ */ #include "cvs.h" @@ -340,6 +342,25 @@ goto error_return; } } + else if (strcmp (line, "tag") == 0) { + RCS_setlocalid(p); + } + else if (strcmp (line, "umask") == 0) { + cvsumask = (mode_t)(strtol(p, NULL, 8) & 0777); + } + else if (strcmp (line, "dlimit") == 0) { +#ifdef BSD +#include + struct rlimit rl; + + if (getrlimit(RLIMIT_DATA, &rl) != -1) { + rl.rlim_cur = atoi(p); + rl.rlim_cur *= 1024; + + (void) setrlimit(RLIMIT_DATA, &rl); + } +#endif /* BSD */ + } else if (strcmp (line, "PreservePermissions") == 0) { if (strcmp (p, "no") == 0) ==== //depot/projects/mips/contrib/gcc/config/rs6000/sysv4.h#3 (text+ko) ==== @@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/rs6000/sysv4.h,v 1.5 2003/02/10 06:05:38 kan Exp $ */ - /* Yes! We are ELF. */ #define TARGET_OBJECT_FORMAT OBJECT_ELF @@ -1209,7 +1207,7 @@ /* FreeBSD support. */ #define CPP_OS_FREEBSD_SPEC "\ - -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ -D__ELF__ \ + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ -Acpu=powerpc -Amachine=powerpc" #define STARTFILE_FREEBSD_SPEC FBSD_STARTFILE_SPEC ==== //depot/projects/mips/contrib/gdtoa/README#2 (text+ko) ==== @@ -313,6 +313,10 @@ exponent = fpi->emin. Strtodg provides distinct return values for normals and denormals; see gdtoa.h. +Compiling g__fmt.c, strtod.c, and strtodg.c with -DUSE_LOCALE causes +the decimal-point character to be taken from the current locale; otherwise +it is '.'. + Please send comments to David M. Gay ==== //depot/projects/mips/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -37,6 +37,10 @@ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + char * #ifdef KR_headers g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign; @@ -46,13 +50,17 @@ { int i, j, k; char *s0 = s; - +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (sign) *b++ = '-'; if (decpt <= -4 || decpt > se - s + 5) { *b++ = *s++; if (*s) { - *b++ = '.'; + *b++ = decimalpoint; while((*b = *s++) !=0) b++; } @@ -76,7 +84,7 @@ *b = 0; } else if (decpt <= 0) { - *b++ = '.'; + *b++ = decimalpoint; for(; decpt < 0; decpt++) *b++ = '0'; while((*b = *s++) !=0) @@ -86,7 +94,7 @@ while((*b = *s++) !=0) { b++; if (--decpt == 0 && *s) - *b++ = '.'; + *b++ = decimalpoint; } for(; decpt > 0; decpt--) *b++ = '0'; ==== //depot/projects/mips/contrib/gdtoa/gdtoaimp.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.2 2003/03/12 20:20:22 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.3 2003/03/19 20:25:45 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -203,6 +203,7 @@ #endif #define INFNAN_CHECK +#define USE_LOCALE #undef IEEE_Arith #undef Avoid_Underflow ==== //depot/projects/mips/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -85,9 +85,6 @@ #ifdef Honor_FLT_ROUNDS int rounding; #endif -#ifdef USE_LOCALE - CONST char *s2; -#endif sign = nz0 = nz = 0; dval(rv) = 0.; @@ -150,25 +147,11 @@ z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE - s1 = localeconv()->decimal_point; - if (c == *s1) { - c = '.'; - if (*++s1) { - s2 = s; - for(;;) { - if (*++s2 != *s1) { - c = 0; - break; - } - if (!*++s1) { - s = s2; - break; - } - } - } - } + if (c == *localeconv()->decimal_point) +#else + if (c == '.') #endif - if (c == '.') { + { c = *++s; if (!nd) { for(; c == '0'; c = *++s) ==== //depot/projects/mips/contrib/gdtoa/strtodg.c#2 (text+ko) ==== @@ -59,9 +59,6 @@ { ULong *x, *xe; Bigint *b1; -#ifdef USE_LOCALE - CONST char *s2; -#endif #ifdef Pack_16 ULong carry = 1, y; #endif @@ -399,25 +396,11 @@ z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE - s1 = localeconv()->decimal_point; - if (c == *s1) { - c = '.'; - if (*++s1) { - s2 = s; - for(;;) { - if (*++s2 != *s1) { - c = 0; - break; - } - if (!*++s1) { - s = s2; - break; - } - } - } - } + if (c == *localeconv()->decimal_point) +#else + if (c == '.') #endif - if (c == '.') { + { c = *++s; if (!nd) { for(; c == '0'; c = *++s) ==== //depot/projects/mips/contrib/gdtoa/xsum0.out#2 (text+ko) ==== @@ -1,9 +1,9 @@ -README 10a65619 13093 +README 7150e50 13249 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 9:55:49 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB9F737B405; Tue, 25 Mar 2003 09:55:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8ADDB37B401 for ; Tue, 25 Mar 2003 09:55:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32C6C43F85 for ; Tue, 25 Mar 2003 09:55:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PHtj0U082465 for ; Tue, 25 Mar 2003 09:55:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PHtjBv082462 for perforce@freebsd.org; Tue, 25 Mar 2003 09:55:45 -0800 (PST) Date: Tue, 25 Mar 2003 09:55:45 -0800 (PST) Message-Id: <200303251755.h2PHtjBv082462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27361 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-11.4 required=5.0 tests=AWL,X_AUTH_WARNING version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27361 Change 27361 by jmallett@jmallett_dalek on 2003/03/25 09:55:36 These files are dead to the world... Going baseless with them. Affected files ... .. //depot/projects/mips/contrib/binutils/bfd/coff-mips.c#3 delete .. //depot/projects/mips/contrib/binutils/bfd/cpu-mips.c#3 delete .. //depot/projects/mips/contrib/binutils/bfd/elf32-mips.c#3 delete .. //depot/projects/mips/contrib/binutils/bfd/elf64-mips.c#3 delete .. //depot/projects/mips/contrib/binutils/bfd/pe-mips.c#3 delete .. //depot/projects/mips/contrib/binutils/include/opcode/mips.h#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmip.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmipn32.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bsmip.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32ebmip.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32elmip.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lmip.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lsmip.sh#3 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf64bmip.sh#3 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 9:56:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ABD937B404; Tue, 25 Mar 2003 09:56:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F9BC37B401 for ; Tue, 25 Mar 2003 09:56:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4723B43F75 for ; Tue, 25 Mar 2003 09:56:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PHum0U082484 for ; Tue, 25 Mar 2003 09:56:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PHul4H082481 for perforce@freebsd.org; Tue, 25 Mar 2003 09:56:47 -0800 (PST) Date: Tue, 25 Mar 2003 09:56:47 -0800 (PST) Message-Id: <200303251756.h2PHul4H082481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27362 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-9.4 required=5.0 tests=AWL,X_AUTH_WARNING version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27362 Change 27362 by jmallett@jmallett_dalek on 2003/03/25 09:56:18 Back from the dead, and baseless. Affected files ... .. //depot/projects/mips/contrib/binutils/bfd/coff-mips.c#4 add .. //depot/projects/mips/contrib/binutils/bfd/cpu-mips.c#4 add .. //depot/projects/mips/contrib/binutils/bfd/elf32-mips.c#4 add .. //depot/projects/mips/contrib/binutils/bfd/elf64-mips.c#4 add .. //depot/projects/mips/contrib/binutils/bfd/pe-mips.c#4 add .. //depot/projects/mips/contrib/binutils/include/opcode/mips.h#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmip.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmipn32.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bsmip.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32ebmip.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32elmip.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lmip.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lsmip.sh#4 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf64bmip.sh#4 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 11:17:33 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A38DC37B404; Tue, 25 Mar 2003 11:17:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5438737B401 for ; Tue, 25 Mar 2003 11:17:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D72AC43FCB for ; Tue, 25 Mar 2003 11:17:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PJHR0U089640 for ; Tue, 25 Mar 2003 11:17:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PJHRph089637 for perforce@freebsd.org; Tue, 25 Mar 2003 11:17:27 -0800 (PST) Date: Tue, 25 Mar 2003 11:17:27 -0800 (PST) Message-Id: <200303251917.h2PJHRph089637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27366 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27366 Change 27366 by rwatson@rwatson_tislabs on 2003/03/25 11:16:37 Don't rely on namespace pollution to get access to struct sx. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#9 (text+ko) ==== @@ -20,6 +20,7 @@ #include #include #include +#include #else /* _KERNEL */ #include #endif /* _KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 11:30:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C2BE37B404; Tue, 25 Mar 2003 11:30:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D95B737B401 for ; Tue, 25 Mar 2003 11:30:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F95843FBD for ; Tue, 25 Mar 2003 11:30:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PJUi0U090556 for ; Tue, 25 Mar 2003 11:30:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PJUiAT090550 for perforce@freebsd.org; Tue, 25 Mar 2003 11:30:44 -0800 (PST) Date: Tue, 25 Mar 2003 11:30:44 -0800 (PST) Message-Id: <200303251930.h2PJUiAT090550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27367 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27367 Change 27367 by rwatson@rwatson_tislabs on 2003/03/25 11:29:53 Conversion macro to turn mbuf allocation flags into malloc allocation flags for MAC purposes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#24 (text+ko) ==== @@ -272,6 +272,7 @@ #define M_DONTWAIT 0x4 /* don't conflict with M_NOWAIT */ #define M_TRYWAIT 0x8 /* or M_WAITOK */ #define M_WAIT M_TRYWAIT /* XXX: Deprecated. */ +#define MBUF_TO_MALLOC(how) ((how) == M_TRYWAIT ? M_WAITOK : M_NOWAIT) #ifdef _KERNEL /*- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 11:56:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64F0037B404; Tue, 25 Mar 2003 11:56:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 024EF37B401 for ; Tue, 25 Mar 2003 11:56:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92A2E43FB1 for ; Tue, 25 Mar 2003 11:56:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PJuG0U092273 for ; Tue, 25 Mar 2003 11:56:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PJuGSW092270 for perforce@freebsd.org; Tue, 25 Mar 2003 11:56:16 -0800 (PST) Date: Tue, 25 Mar 2003 11:56:16 -0800 (PST) Message-Id: <200303251956.h2PJuGSW092270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27369 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27369 Change 27369 by rwatson@rwatson_tislabs on 2003/03/25 11:56:02 Make sure to pass in only malloc() flags to MAC allocation interfaces for labels, not mbuf allocation "how" arguments. Should clear up several Witness warnings involving blocking in the netisr path. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#29 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#29 (text+ko) ==== @@ -1306,7 +1306,7 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(mb, how) != 0) { + if (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) != 0) { m_free(mb); return NULL; } @@ -1355,7 +1355,7 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(mb, how) != 0) { + if (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) != 0) { m_free(mb); return NULL; } @@ -1502,7 +1502,8 @@ _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } #ifdef MAC - if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, how) != 0)) { + if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) + != 0)) { m_free(mb); return NULL; } ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#19 (text+ko) ==== @@ -89,7 +89,7 @@ to->m_data = to->m_pktdat; to->m_pkthdr = from->m_pkthdr; /* especially tags */ #ifdef MAC - mac_init_mbuf(to, 1); /* XXXMAC no way to fail */ + mac_init_mbuf(to, M_WAITOK); /* XXXMAC no way to fail */ mac_create_mbuf_from_mbuf(from, to); #endif SLIST_INIT(&from->m_pkthdr.tags); /* purge tags from src */ @@ -125,7 +125,7 @@ to->m_data = to->m_pktdat; to->m_pkthdr = from->m_pkthdr; #ifdef MAC - mac_init_mbuf(to, 1); /* XXXMAC no way to fail */ + mac_init_mbuf(to, M_WAITOK); /* XXXMAC no way to fail */ mac_create_mbuf_from_mbuf(from, to); #endif SLIST_INIT(&to->m_pkthdr.tags); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 11:58:28 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF46337B401; Tue, 25 Mar 2003 11:58:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E9D137B404 for ; Tue, 25 Mar 2003 11:58:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E51F643FBF for ; Tue, 25 Mar 2003 11:58:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PJwJ0U092367 for ; Tue, 25 Mar 2003 11:58:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PJwJ6e092364 for perforce@freebsd.org; Tue, 25 Mar 2003 11:58:19 -0800 (PST) Date: Tue, 25 Mar 2003 11:58:19 -0800 (PST) Message-Id: <200303251958.h2PJwJ6e092364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27370 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27370 Change 27370 by rwatson@rwatson_tislabs on 2003/03/25 11:57:55 Move the IP Fragment Reassembly Queue interfaces to the class of entry points that accepts a malloc() flags argument to determine whether or not blocking is permitted (and hence whether or not failure is permitted). Move us towards addressing some more netisr Witness warnings from th advent of network stack locking. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#377 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#27 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#200 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#55 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#159 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#118 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#95 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#231 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#183 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#377 (text+ko) ==== @@ -697,15 +697,23 @@ mac_init_ifnet_label(&ifp->if_label); } -void -mac_init_ipq(struct ipq *ipq) +int +mac_init_ipq(struct ipq *ipq, int flag) { + int error; mac_init_label(&ipq->ipq_label); - MAC_PERFORM(init_ipq_label, &ipq->ipq_label); + + MAC_CHECK(init_ipq_label, &ipq->ipq_label, flag); + if (error) { + MAC_PERFORM(destroy_ipq_label, &ipq->ipq_label); + mac_destroy_label(&ipq->ipq_label); + } #ifdef MAC_DEBUG - atomic_add_int(&nmacipqs, 1); + if (error == 0) + atomic_add_int(&nmacipqs, 1); #endif + return (error); } int ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#27 (text+ko) ==== @@ -983,7 +983,10 @@ goto dropfrag; fp = mtod(t, struct ipq *); #ifdef MAC - mac_init_ipq(fp); + if (mac_init_ipq(fp, M_NOWAIT) != 0) { + m_free(t); + goto dropfrag; + } mac_create_ipq(m, fp); #endif TAILQ_INSERT_HEAD(head, fp, ipq_list); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#200 (text+ko) ==== @@ -2640,7 +2640,7 @@ .mpo_init_cred_label = mac_biba_init_label, .mpo_init_devfsdirent_label = mac_biba_init_label, .mpo_init_ifnet_label = mac_biba_init_label, - .mpo_init_ipq_label = mac_biba_init_label, + .mpo_init_ipq_label = mac_biba_init_label_waitcheck, .mpo_init_mbuf_label = mac_biba_init_label_waitcheck, .mpo_init_mount_label = mac_biba_init_label, .mpo_init_mount_fs_label = mac_biba_init_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#55 (text+ko) ==== @@ -2645,7 +2645,7 @@ .mpo_init_cred_label = mac_lomac_init_label, .mpo_init_devfsdirent_label = mac_lomac_init_label, .mpo_init_ifnet_label = mac_lomac_init_label, - .mpo_init_ipq_label = mac_lomac_init_label, + .mpo_init_ipq_label = mac_lomac_init_label_waitcheck, .mpo_init_mbuf_label = mac_lomac_init_label_waitcheck, .mpo_init_mount_label = mac_lomac_init_label, .mpo_init_mount_fs_label = mac_lomac_init_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#159 (text+ko) ==== @@ -2413,7 +2413,7 @@ .mpo_init_cred_label = mac_mls_init_label, .mpo_init_devfsdirent_label = mac_mls_init_label, .mpo_init_ifnet_label = mac_mls_init_label, - .mpo_init_ipq_label = mac_mls_init_label, + .mpo_init_ipq_label = mac_mls_init_label_waitcheck, .mpo_init_mbuf_label = mac_mls_init_label_waitcheck, .mpo_init_mount_label = mac_mls_init_label, .mpo_init_mount_fs_label = mac_mls_init_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#118 (text+ko) ==== @@ -976,7 +976,7 @@ .mpo_init_cred_label = mac_none_init_label, .mpo_init_devfsdirent_label = mac_none_init_label, .mpo_init_ifnet_label = mac_none_init_label, - .mpo_init_ipq_label = mac_none_init_label, + .mpo_init_ipq_label = mac_none_init_label_waitcheck, .mpo_init_mbuf_label = mac_none_init_label_waitcheck, .mpo_init_mount_label = mac_none_init_label, .mpo_init_mount_fs_label = mac_none_init_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#95 (text+ko) ==== @@ -242,12 +242,13 @@ atomic_add_int(&init_count_ifnet, 1); } -static void -mac_test_init_ipq_label(struct label *label) +static int +mac_test_init_ipq_label(struct label *label, int flag) { SLOT(label) = IPQMAGIC; atomic_add_int(&init_count_ipq, 1); + return (0); } static int ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#231 (text+ko) ==== @@ -133,7 +133,7 @@ void mac_init_cred(struct ucred *); void mac_init_devfsdirent(struct devfs_dirent *); void mac_init_ifnet(struct ifnet *); -void mac_init_ipq(struct ipq *); +int mac_init_ipq(struct ipq *, int flag); int mac_init_socket(struct socket *, int flag); void mac_init_pipe(struct pipe *); int mac_init_mbuf(struct mbuf *m, int flag); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#183 (text+ko) ==== @@ -73,7 +73,7 @@ void (*mpo_init_cred_label)(struct label *label); void (*mpo_init_devfsdirent_label)(struct label *label); void (*mpo_init_ifnet_label)(struct label *label); - void (*mpo_init_ipq_label)(struct label *label); + int (*mpo_init_ipq_label)(struct label *label, int flag); int (*mpo_init_mbuf_label)(struct label *label, int flag); void (*mpo_init_mount_label)(struct label *label); void (*mpo_init_mount_fs_label)(struct label *label); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 5:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A659137B401; Tue, 25 Mar 2003 12:05:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CAC137B405 for ; Tue, 25 Mar 2003 12:05:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D59F43FCB for ; Tue, 25 Mar 2003 12:05:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PK5T0U094052 for ; Tue, 25 Mar 2003 12:05:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PK5S87094048 for perforce@freebsd.org; Tue, 25 Mar 2003 12:05:28 -0800 (PST) Date: Tue, 25 Mar 2003 12:05:28 -0800 (PST) Message-Id: <200303252005.h2PK5S87094048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27371 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-11.1 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27371 Change 27371 by jmallett@jmallett_dalek on 2003/03/25 12:04:36 Catch up with C99 initialisers. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#10 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#10 (text+ko) ==== @@ -205,9 +205,8 @@ } static struct g_class g_fx_class = { - FX_CLASS_NAME, - g_fx_taste, - NULL, + .name = FX_CLASS_NAME, + .taste = g_fx_taste, G_CLASS_INITIALIZER }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 5:40 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 112E037B40C; Tue, 25 Mar 2003 12:05:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F5D237B404 for ; Tue, 25 Mar 2003 12:05:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D25D443F3F for ; Tue, 25 Mar 2003 12:05:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PK5U0U094073 for ; Tue, 25 Mar 2003 12:05:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PK5UHx094070 for perforce@freebsd.org; Tue, 25 Mar 2003 12:05:30 -0800 (PST) Date: Tue, 25 Mar 2003 12:05:30 -0800 (PST) Message-Id: <200303252005.h2PK5UHx094070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27373 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-10.6 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27373 Change 27373 by jmallett@jmallett_dalek on 2003/03/25 12:05:24 Match SPARC64, in use of Elf64 + Elf32. Affected files ... .. //depot/projects/mips/sys/mips/include/elf.h#5 edit Differences ... ==== //depot/projects/mips/sys/mips/include/elf.h#5 (text+ko) ==== @@ -33,13 +33,12 @@ /* * EABI ELF definitions for the MIPS architecture. - * - * For now, this is 32-bit. */ #include /* Definitions common to all 32 bit architectures. */ +#include /* Definitions common to all 32 bit architectures. */ -#define __ELF_WORD_SIZE 32 /* Used by */ +#define __ELF_WORD_SIZE 64 /* Used by */ #include /* ELF_ARCH */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 5:42 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0A1637B43E; Tue, 25 Mar 2003 12:05:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5801037B407 for ; Tue, 25 Mar 2003 12:05:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D6A843FDF for ; Tue, 25 Mar 2003 12:05:30 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PK5T0U094067 for ; Tue, 25 Mar 2003 12:05:29 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PK5TZ0094064 for perforce@freebsd.org; Tue, 25 Mar 2003 12:05:29 -0800 (PST) Date: Tue, 25 Mar 2003 12:05:29 -0800 (PST) Message-Id: <200303252005.h2PK5TZ0094064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27372 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-10.2 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27372 Change 27372 by jmallett@jmallett_dalek on 2003/03/25 12:04:53 Add vm_paddr_t. Affected files ... .. //depot/projects/mips/sys/mips/include/_types.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/_types.h#3 (text+ko) ==== @@ -89,6 +89,7 @@ typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 6:38 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CD0D37B404; Tue, 25 Mar 2003 12:06:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E138837B401 for ; Tue, 25 Mar 2003 12:06:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C87B43F3F for ; Tue, 25 Mar 2003 12:06:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PK6X0U094171 for ; Tue, 25 Mar 2003 12:06:33 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PK6W80094167 for perforce@freebsd.org; Tue, 25 Mar 2003 12:06:32 -0800 (PST) Date: Tue, 25 Mar 2003 12:06:32 -0800 (PST) Message-Id: <200303252006.h2PK6W80094167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27375 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-9.9 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27375 Change 27375 by jmallett@jmallett_dalek on 2003/03/25 12:06:04 Use the appropriate type for pages and the like. Affected files ... .. //depot/projects/mips/sys/mips/include/param.h#9 edit Differences ... ==== //depot/projects/mips/sys/mips/include/param.h#9 (text+ko) ==== @@ -111,7 +111,7 @@ /* * Mach derived conversion macros */ -#define round_page(x) ((((unsigned)(x)) + NBPG - 1) & ~(NBPG-1)) -#define trunc_page(x) ((unsigned)(x) & ~(NBPG-1)) -#define btop(x) ((unsigned)(x) >> PGSHIFT) -#define ptob(x) ((unsigned)(x) << PGSHIFT) +#define round_page(x) ((((unsigned long)(x)) + NBPG - 1) & ~(NBPG-1)) +#define trunc_page(x) ((unsigned long)(x) & ~(NBPG-1)) +#define btop(x) ((unsigned long)(x) >> PGSHIFT) +#define ptob(x) ((unsigned long)(x) << PGSHIFT) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 7:40 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A907A37B401; Tue, 25 Mar 2003 12:07:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54EC137B401 for ; Tue, 25 Mar 2003 12:07:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76BE443F93 for ; Tue, 25 Mar 2003 12:07:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PK7Z0U094213 for ; Tue, 25 Mar 2003 12:07:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PK7ZSe094210 for perforce@freebsd.org; Tue, 25 Mar 2003 12:07:35 -0800 (PST) Date: Tue, 25 Mar 2003 12:07:35 -0800 (PST) Message-Id: <200303252007.h2PK7ZSe094210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27376 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-9.7 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27376 Change 27376 by jmallett@jmallett_dalek on 2003/03/25 12:06:41 Add headers for prototypes. Return from a function which returns a value. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#7 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#7 (text+ko) ==== @@ -29,8 +29,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -137,4 +139,5 @@ int savectx(struct pcb *pcb) { + return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 7:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ED5637B41A; Tue, 25 Mar 2003 12:07:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 804A037B405 for ; Tue, 25 Mar 2003 12:07:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE72943F75 for ; Tue, 25 Mar 2003 12:07:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PK7Z0U094219 for ; Tue, 25 Mar 2003 12:07:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PK7ZvH094216 for perforce@freebsd.org; Tue, 25 Mar 2003 12:07:35 -0800 (PST) Date: Tue, 25 Mar 2003 12:07:35 -0800 (PST) Message-Id: <200303252007.h2PK7ZvH094216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27377 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-9.5 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27377 Change 27377 by jmallett@jmallett_dalek on 2003/03/25 12:07:03 Remove defunct pmap_phys_address. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#4 edit .. //depot/projects/mips/sys/mips/mips/support.S#6 edit .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#5 edit .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#4 (text+ko) ==== @@ -183,12 +183,6 @@ { } -vm_offset_t -pmap_phys_address(int p) -{ - return (0); -} - void pmap_pinit(pmap_t pmap) { ==== //depot/projects/mips/sys/mips/mips/support.S#6 (text+ko) ==== @@ -153,6 +153,16 @@ END(suword32) /* + * suword64(9) + * int suword64(void *addr, long word) + */ +ENTRY(suword64) + li v0, -1 + jr ra + nop +END(suword64) + +/* * Stubs for fetch(9) XXX fubyte() Fetches a byte of data from the user-space address base. ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#5 (text+ko) ==== @@ -27,14 +27,17 @@ */ #include +#include #include #include #include #include +#include #include #include #include +#include #include #include @@ -69,6 +72,7 @@ void cpu_throw(void) { + panic("cpu_throw: called.\n"); } void @@ -102,7 +106,7 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse *ke) +cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { } ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#5 (text+ko) ==== @@ -27,6 +27,7 @@ */ #include +#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12: 9:33 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC8F137B404; Tue, 25 Mar 2003 12:09:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id 8DBFA37B401; Tue, 25 Mar 2003 12:09:27 -0800 (PST) Date: Tue, 25 Mar 2003 14:09:27 -0600 From: Juli Mallett To: Perforce Change Reviews Subject: Re: PERFORCE change 27377 for review Message-ID: <20030325140927.A77141@FreeBSD.org> References: <200303252007.h2PK7ZvH094216@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200303252007.h2PK7ZvH094216@repoman.freebsd.org>; from jmallett@FreeBSD.org on Tue, Mar 25, 2003 at 12:07:35PM -0800 Organisation: The FreeBSD Project X-Alternate-Addresses: , , , , X-Towel: Yes X-Negacore: Yes X-Title: Code Maven X-Spam-Status: No, hits=-26.6 required=5.0 tests=IN_REP_TO,QUOTED_EMAIL_TEXT,QUOTE_TWICE_1,REFERENCES, REPLY_WITH_QUOTES,USER_AGENT_MUTT autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG * De: Juli Mallett [ Data: 2003-03-25 ] [ Subjecte: PERFORCE change 27377 for review ] > http://perforce.freebsd.org/chv.cgi?CH=27377 > > Change 27377 by jmallett@jmallett_dalek on 2003/03/25 12:07:03 > > Remove defunct pmap_phys_address. Oops, hasty submit. Other changes noted below > Affected files ... > > .. //depot/projects/mips/sys/mips/mips/support.S#6 edit > .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#5 edit > .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#5 edit > > ==== //depot/projects/mips/sys/mips/mips/support.S#6 (text+ko) ==== > > @@ -153,6 +153,16 @@ > END(suword32) > > /* > + * suword64(9) > + * int suword64(void *addr, long word) > + */ > +ENTRY(suword64) > + li v0, -1 > + jr ra > + nop > +END(suword64) > + > +/* > * Stubs for fetch(9) XXX > fubyte() Fetches a byte of data from the user-space address base. > Add suword64 for ELF64 stuff. > ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#5 (text+ko) ==== > > @@ -27,14 +27,17 @@ > */ > > #include > +#include > #include > #include > #include > #include > +#include > #include Missing headers for prototypes of functions used/declared herein. > #include > #include > +#include > > #include > #include > @@ -69,6 +72,7 @@ > void > cpu_throw(void) > { > + panic("cpu_throw: called.\n"); Make cpu_throw not return. > } > > void > @@ -102,7 +106,7 @@ > } > > void > -cpu_set_upcall_kse(struct thread *td, struct kse *ke) > +cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) Catch up with KSE API changes. > { > } > > > ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#5 (text+ko) ==== > > @@ -27,6 +27,7 @@ > */ > > #include > +#include Add missing header for prototype of printf. > > #include > #include -- juli mallett. email: jmallett@freebsd.org; aim: bsdflata; efnet: juli; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 12:16:53 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CE6737B405; Tue, 25 Mar 2003 12:16:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5C9037B404 for ; Tue, 25 Mar 2003 12:16:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6731A43F3F for ; Tue, 25 Mar 2003 12:16:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PKGm0U094894 for ; Tue, 25 Mar 2003 12:16:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PKGloa094891 for perforce@freebsd.org; Tue, 25 Mar 2003 12:16:47 -0800 (PST) Date: Tue, 25 Mar 2003 12:16:47 -0800 (PST) Message-Id: <200303252016.h2PKGloa094891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27379 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,UPPERCASE_25_50,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27379 Change 27379 by rwatson@rwatson_tislabs on 2003/03/25 12:16:37 Rename MBUF_TO_MALLOC() to MBTOM(), which is substantially more compact. Suggested by: sam Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#30 edit .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#30 (text+ko) ==== @@ -1306,7 +1306,7 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) != 0) { + if (mac_init_mbuf(mb, MBTOM(how)) != 0) { m_free(mb); return NULL; } @@ -1355,7 +1355,7 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) != 0) { + if (mac_init_mbuf(mb, MBTOM(how)) != 0) { m_free(mb); return NULL; } @@ -1502,7 +1502,7 @@ _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } #ifdef MAC - if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) + if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, MBTOM(how)) != 0)) { m_free(mb); return NULL; ==== //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#25 (text+ko) ==== @@ -272,7 +272,7 @@ #define M_DONTWAIT 0x4 /* don't conflict with M_NOWAIT */ #define M_TRYWAIT 0x8 /* or M_WAITOK */ #define M_WAIT M_TRYWAIT /* XXX: Deprecated. */ -#define MBUF_TO_MALLOC(how) ((how) == M_TRYWAIT ? M_WAITOK : M_NOWAIT) +#define MBTOM(how) ((how) == M_TRYWAIT ? M_WAITOK : M_NOWAIT) #ifdef _KERNEL /*- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 13:53: 9 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC60937B404; Tue, 25 Mar 2003 13:52:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7170737B401 for ; Tue, 25 Mar 2003 13:52:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BEFD43FCB for ; Tue, 25 Mar 2003 13:52:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PLqj0U007424 for ; Tue, 25 Mar 2003 13:52:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PLqi5I007421 for perforce@freebsd.org; Tue, 25 Mar 2003 13:52:44 -0800 (PST) Date: Tue, 25 Mar 2003 13:52:44 -0800 (PST) Message-Id: <200303252152.h2PLqi5I007421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27381 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-8.7 required=5.0 tests=AWL,HTML_00_10,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27381 Change 27381 by jmallett@jmallett_dalek on 2003/03/25 13:51:51 IFC. Affected files ... .. //depot/projects/mips/contrib/gdtoa/README#3 integrate .. //depot/projects/mips/contrib/gdtoa/g__fmt.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/mips/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/mips/etc/printcap#2 integrate .. //depot/projects/mips/lib/libatm/Makefile#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/mips/sbin/atm/ilmid/ilmid.c#4 integrate .. //depot/projects/mips/sbin/mknod/mknod.8#3 integrate .. //depot/projects/mips/share/man/man4/bge.4#3 integrate .. //depot/projects/mips/share/man/man4/iir.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/mips/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/mips/share/man/man9/style.9#6 integrate .. //depot/projects/mips/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/mips/sys/kern/kern_subr.c#7 integrate Differences ... ==== //depot/projects/mips/contrib/gdtoa/README#3 (text+ko) ==== @@ -320,7 +320,4 @@ Please send comments to David M. Gay - Bell Labs, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636, U.S.A. - dmg@research.bell-labs.com + dmg@acm.org ==== //depot/projects/mips/contrib/gdtoa/g__fmt.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/mips/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -28,15 +28,15 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + int #ifdef KR_headers gethex(sp, fpi, exp, bp, sign) @@ -50,6 +50,11 @@ int esign, havedig, irv, k, n, nbits, up; ULong L, lostbits, *x; Long e, e1; +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (!hexdig['0']) hexdig_init_D2A(); @@ -61,7 +66,7 @@ s = s0; decpt = 0; if (!hexdig[*s]) { - if (*s == '.') { + if (*s == decimalpoint) { decpt = ++s; if (!hexdig[*s]) goto ret0; @@ -80,7 +85,7 @@ } while(hexdig[*s]) s++; - if (*s == '.' && !decpt) { + if (*s == decimalpoint && !decpt) { decpt = ++s; while(hexdig[*s]) s++; @@ -120,7 +125,7 @@ n = 0; L = 0; while(s1 > s0) { - if (*--s1 == '.') + if (*--s1 == decimalpoint) continue; if (n == 32) { *x++ = L; ==== //depot/projects/mips/contrib/gdtoa/strtod.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" @@ -118,7 +114,7 @@ switch(s[1]) { case 'x': case 'X': - switch(gethex(&s, &fpi, &exp, &bb, sign)) { + switch(i = gethex(&s, &fpi, &exp, &bb, sign)) { case STRTOG_NoNumber: s = s00; sign = 0; ==== //depot/projects/mips/contrib/gdtoa/strtodg.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/mips/contrib/gdtoa/xsum0.out#3 (text+ko) ==== @@ -1,9 +1,9 @@ -README 7150e50 13249 +README c9c34c1 13153 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 -g__fmt.c e29d67f1 2534 +g__fmt.c ee5f9be0 2439 g_ddfmt.c fcf94527 3790 g_dfmt.c f30e55a9 2533 g_ffmt.c 7c4ea96 2459 @@ -12,7 +12,7 @@ gdtoa.c 364a0d2 17017 gdtoa.h 1eb440de 4810 gdtoaimp.h 6a955ba 19106 -gethex.c ff3c434d 4981 +gethex.c 1310d1b3 5066 gmisc.c e1a268ea 2114 hd_init.c cf9a94e 1827 hexnan.c f53be1da 2988 @@ -26,9 +26,9 @@ strtoIg.c ec59c2fa 3484 strtoIx.c 8f8c9d 1990 strtoIxL.c 1313ff7f 1961 -strtod.c 1ad667 20076 +strtod.c fd6556c8 19985 strtodI.c e58338e0 4062 -strtodg.c 1caf3fa4 19553 +strtodg.c e04b9254 19458 strtof.c 1e7a787a 2202 strtopQ.c e232c542 2685 strtopd.c e865dc64 1701 ==== //depot/projects/mips/etc/printcap#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ +# $FreeBSD: src/etc/printcap,v 1.13 2003/03/25 18:03:11 trhodes Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/doc/handbook/printing.html +# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/mips/lib/libatm/Makefile#3 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.5 2003/03/25 04:29:26 mdodd Exp $ +# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $ # # @@ -33,6 +33,6 @@ LDADD+= -lmd DPADD+= ${LIBMD} -WARNS?= 5 +WARNS?= 3 .include ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.524 2003/03/22 04:37:16 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.527 2003/03/25 20:21:20 olgeni Exp $ 2000 @@ -183,7 +183,7 @@ default. This change greatly decreases the need for a static, centralized table of major number assignments to device drivers (a few drivers retain their old static major numbers for - compatability), and also reduces the possibility of running out + compatibility), and also reduces the possibility of running out of device major numbers. @@ -323,7 +323,7 @@ A number of changes have been made to the &man.cd.4; driver. The primary user-visible change is improved - compatability with ATAPI/USB/Firewire CDROM drives. + compatibility with ATAPI/USB/Firewire CDROM drives. &man.geom.4; is now mandatory; the NO_GEOM has been removed from the set of @@ -513,7 +513,8 @@ the Don't Fragment bit on outgoing packets. &man.ping.8; now supports a option to use - ICMP mask request or timestamp request messages instead of ICMP echo requests. + ICMP mask request or timestamp request messages instead of ICMP + echo requests. &man.ping.8; now supports a flag to set the Type of Service bits in outgoing packets. @@ -580,7 +581,7 @@ FILE has been updated to 3.41. &merged; - GCC has been updated to + GCC has been updated to 3.2.2 (release version). The ISC DHCP client has been @@ -590,7 +591,7 @@ form of KTH eBones) has been removed. Users requiring this functionality can still get it from the security/krb4 port - (or package). Kerberos IV compatability mode for Kerberos 5 + (or package). Kerberos IV compatibility mode for Kerberos 5 has been removed, and the k5program userland utilities have been renamed to ==== //depot/projects/mips/sbin/atm/ilmid/ilmid.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $ + * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.18 2003/03/25 20:34:46 mdodd Exp $ * */ @@ -73,7 +73,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.18 2003/03/25 20:34:46 mdodd Exp $"); #endif @@ -92,7 +92,15 @@ #define ASN_IPADDR 0x40 #define ASN_TIMESTAMP 0x43 -static char *Var_Types[] = { "", "", "ASN_INTEGER", "", "ASN_OCTET", "ASN_NULL", "ASN_OBJID" }; +static char *Var_Types[] = { + "", + "", + "ASN_INTEGER", + "", + "ASN_OCTET", + "ASN_NULL", + "ASN_OBJID" +}; /* * Define SNMP PDU types @@ -103,8 +111,15 @@ #define PDU_TYPE_SET 0xA3 #define PDU_TYPE_TRAP 0xA4 -static char *PDU_Types[] = { "GET REQUEST", "GETNEXT REQUEST", "GET RESPONSE", "SET REQUEST", - "TRAP" }; +static char *PDU_Types[] = { + "GET REQUEST", + "GETNEXT REQUEST", + "GET RESPONSE", + "SET REQUEST", + "TRAP", + " ?? ", + " ??? " +}; /* * Define TRAP codes @@ -235,7 +250,7 @@ {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 1 }}, #define MY_OBJID 11 {{ 7, 43, 6, 1, 4, 1, 9999, 1 }}, -#define SETPFX_OBJID 12 +#define SETPFX_OBJID 12 /* ATM Forum says 1=valid, 2=invalid, not 0! */ {{ 12, 43, 6, 1, 4, 1, 353, 2, 7, 1, 1, 3, 0 }}, #define ENTERPRISE_OBJID 13 {{ 8, 43, 6, 1, 4, 1, 3, 1, 1 }}, @@ -243,6 +258,8 @@ {{ 10, 43, 6, 1, 4, 1, 353, 2, 1, 4, 0 }}, #define ATMF_SYSID 15 {{ 12, 43, 6, 1, 4, 1, 353, 2, 1, 1, 1, 8, 0 }}, +#define MADGE_OBJECT1 16 /* I don't have a clue ... -RH */ + {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 99 }}, }; #define NUM_OIDS (sizeof(Objids)/sizeof(Objid)) @@ -270,6 +287,14 @@ ILMI_RUNNING /* Normal processing */ }; +static char *ILMI_State[] = { + "UNKNOWN", + "COLDSTART", + "INIT", + "REG", + "RUNNING" +}; + /* * Our (incrementing) Request ID */ @@ -1239,7 +1264,7 @@ /* Error Index */ *bp++ = ASN_INTEGER; *bp++ = 0x01; /* length = 1 */ - *bp++ = erridx; /* index - 0 if no error */ + *bp++ = erridx; /* index == 0 if no error */ } else { /* type == PDU_TYPE_TRAP */ @@ -2091,11 +2116,34 @@ { Variable *var; int idx; + int x; + int oidlen; var = hdr->head; while ( var ) { + + /* Handle the 'GET PREFIX' request */ + oidlen = Objids[SETPFX_OBJID].oid[0]; + if (oid_ncmp(&var->oid, &Objids[SETPFX_OBJID], oidlen) == 0) { + var->var.ival = 2; /* assume not valid */ + for(x = 0; x < 13; x++) + if (var->oid.oid[oidlen + x + 2] != + addressEntry[intf].oid[x + 1]) + break; + + /* Address Match */ + if (x == 13) + hdr->head->var.ival = 1; + var = var->next; + continue; + } + idx = find_var ( var ); switch ( idx ) { + case MADGE_OBJECT1: + /* reply with NO SUCH OBJECT */ + var->type = ASN_NULL; + break; case SYS_OBJID: var->type = ASN_OBJID; bcopy ( (caddr_t)&Objids[MY_OBJID], @@ -2167,6 +2215,138 @@ } +/****************************************************************************** + * + * Find an OBJID from known ones + * + * in: Variable with valid OID + * out: OID number (index), -1 = not found + */ +static int +lmi_object_find(Variable *var) +{ + Objid * obj_var; + Objid * obj_cur; + int x; + int y; + + obj_var = &var->oid; + + for (x = 0; x < NUM_OIDS; x++) { + obj_cur = &Objids[x]; + for (y = 0; y < 128; y++) { + if (obj_var->oid[y] != obj_cur->oid[y]) + break; + if (obj_var->oid[y] == 0) /* object ID endmark */ + return (x); + } + } + + return (-1); +} + +/****************************************************************************** + * + * Append instance number to OID + * + * in: Variable, instance number + * out: zero = success + * + */ +static int +lmi_object_instance(Variable *var, int instnum) +{ + int * oidptr; + int curlen; + + oidptr = var->oid.oid; + curlen = oidptr[0]; /* current length */ + if (curlen > 126) + return (1); + curlen++; + oidptr[curlen] = instnum; + oidptr[0] = curlen; + return (0); +} + +/****************************************************************************** + * + * Handle received GETNEXT + * + * in: Header with valid fields, interface number + * out: zero = success + * + */ +static int +lmi_rcvcmd_getnext(Snmp_Header *header, int intf) +{ + int * oidptr; + int oidlen; + int oidnum; + int x; + + oidnum = lmi_object_find(header->head); + oidptr = header->head->oid.oid; + oidlen = oidptr[0]; + + switch(oidnum) { + /* Should be because the remote side is attempting + * to verify that our table is empty + */ + case ADDRESS_OBJID: + if ( addressEntry[intf].oid[0] ) { + /* XXX - FIXME */ + /* Our table is not empty - return address */ + } + break; + + /* Madge Collage sends GETNEXT for this */ + case SETPFX_OBJID: + if(addressEntry[intf].oid[0]) { /* we have a prefix */ + oidptr[0] += 14; + oidptr += oidlen; /* skip to last number */ + oidptr++; + *oidptr++ = 13; /* length of prefix */ + + /* fill in the prefix */ + for(x = 0; x < 13; x++) { + *oidptr++ = addressEntry[intf].oid[x+1]; + } + header->head->type = ASN_INTEGER; + /* 1=valid, 2=invalid -- only 2 values */ + header->head->var.ival = 1; + } else { /* no prefix available */ + header->head->type = ASN_NULL; + } + break; + + default: + return (1); /* unknown object ID */ + } + + build_pdu(header, PDU_TYPE_GETRESP); + send_resp(intf, header, Resp_Buf); + + return (0); +} + + +/****************************************************************************** + * + * Handle received TRAP + * + * in: Header with valid fields, interface number + * out: zero = success + * + */ +static int +lmi_rcvcmd_trap(Snmp_Header *header, int intf) +{ + + bzero((caddr_t)&addressEntry[intf], sizeof(Objid)); + return (0); +} + /* * ILMI State Processing Loop * @@ -2321,20 +2501,7 @@ /* The only messages we care about are GETNEXTs, GETRESPs, and TRAPs */ switch ( Hdr->pdutype ) { case PDU_TYPE_GETNEXT: - /* - * Should be because the remote side is attempting - * to verify that our table is empty - */ - if ( oid_ncmp ( (caddr_t)&Hdr->head->oid, - (caddr_t)&Objids[ADDRESS_OBJID], - Objids[ADDRESS_OBJID].oid[0] ) == 0 ) { - if ( addressEntry[intf].oid[0] ) { - /* XXX - FIXME */ - /* Our table is not empty - return address */ - } - } - build_pdu ( Hdr, PDU_TYPE_GETRESP ); - send_resp ( intf, Hdr, Resp_Buf ); + lmi_rcvcmd_getnext(Hdr, intf); break; case PDU_TYPE_GETRESP: /* @@ -2396,6 +2563,7 @@ break; case PDU_TYPE_TRAP: /* Remote side wants us to start fresh */ + lmi_rcvcmd_trap(Hdr, intf); free_pdu ( Hdr ); break; default: @@ -2417,8 +2585,7 @@ free_pdu ( Hdr ); break; case PDU_TYPE_GETNEXT: - build_pdu ( Hdr, PDU_TYPE_GETRESP ); - send_resp ( intf, Hdr, Resp_Buf ); + lmi_rcvcmd_getnext(Hdr, intf); break; case PDU_TYPE_SET: /* Look for SET_PREFIX Objid */ @@ -2436,6 +2603,7 @@ } break; case PDU_TYPE_TRAP: + lmi_rcvcmd_trap(Hdr, intf); free_pdu ( Hdr ); break; } ==== //depot/projects/mips/sbin/mknod/mknod.8#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mknod.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.24 2003/02/24 22:54:26 ru Exp $ +.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.25 2003/03/25 18:43:10 trhodes Exp $ .\" .Dd December 11, 1993 .Dt MKNOD 8 @@ -48,13 +48,6 @@ The .Nm utility creates device special files. -Normally the shell script -.Pa /dev/MAKEDEV -is used to create special files for commonly known devices; it executes -.Nm -with the appropriate arguments and can make all the files required for the -device. -.Pp To make nodes manually, the four required arguments are: .Pp .Bl -tag -width indent @@ -78,8 +71,6 @@ The major device number is an integer number which tells the kernel which device driver entry point to use. To learn what major device number to use for a particular device, check -.Pa /dev/MAKEDEV -or .Pa /usr/src/sys/conf/majors . .It Ar minor The minor device number tells the kernel which subunit @@ -116,17 +107,11 @@ The .Xr chown 8 Ns - Ns like functionality is specific to -.Fx -and was added so that -.Pa /dev/MAKEDEV -would not depend on -.Pa /usr -being mounted. +.Fx . .Sh SEE ALSO .Xr mkfifo 1 , .Xr mknod 2 , -.Xr chown 8 , -.Xr MAKEDEV 8 +.Xr chown 8 .Sh HISTORY A .Nm ==== //depot/projects/mips/share/man/man4/bge.4#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" 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.6 2003/02/15 17:12:53 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.7 2003/03/25 18:08:57 ps Exp $ .\" .Dd September 27, 2001 .Dt BGE 4 @@ -55,6 +55,12 @@ .It IBM x235 server integrated BCM5703x NIC (10/100/1000baseTX) .It +HP ProLiant NC7760 embedded Gigabit NIC (10/100/1000baseTX) +.It +HP ProLiant NC7770 PCI-X Gigabit NIC (10/100/1000baseTX) +.It +HP ProLiant NC7781 embedded PCI-X Gigabit NIC (10/100/1000baseTX) +.It Netgear GA302T (10/100/1000baseTX) .It SysKonnect SK-9D21 (10/100/1000baseTX) @@ -123,11 +129,9 @@ .Cm half-duplex modes. .It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +Set 1000baseTX operation over twisted pair. Only .Cm full-duplex -and -.Cm half-duplex -modes are supported. +mode is supported. .It Cm 1000baseSX Set 1000Mbps (gigabit ethernet) operation. Both ==== //depot/projects/mips/share/man/man4/iir.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/iir.4,v 1.2 2003/02/24 22:53:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/iir.4,v 1.3 2003/03/25 18:13:20 trhodes Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -62,7 +62,7 @@ This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org and is based on information supplied by the driver authors and the website of -.An Mike Smith Aq msith@FreeBSD.org . +.An Mike Smith Aq msmith@FreeBSD.org . .Sh BUGS During a .Fx ==== //depot/projects/mips/share/man/man4/man4.i386/cx.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.14 2001/10/13 09:08:36 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.15 2003/03/25 18:08:50 trhodes Exp $ .\" .Dd December 12, 1994 .Dt CX 4 i386 @@ -77,16 +77,6 @@ The channels which have the RS-232 interface can be used both in synchronous and asynchronous modes (software selectable by cxconfig utility) and hence are called ``universal'' channels. -.Pp -The special device files, -.Pa /dev/* , -for the adapter Cronyx-Sigma -are created by th -.Xr MAKEDEV 8 -An example: -.Bd -literal -cd /dev -sh MAKEDEV cronyx ttyx0 ttyx1 ttyy0 .Ed .Sh "Asynchronous driver" The asynchronous channel device files have the names: ==== //depot/projects/mips/share/man/man4/man4.i386/dgb.4#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp .\" from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp -.\" $FreeBSD: src/share/man/man4/man4.i386/dgb.4,v 1.19 2001/07/14 19:41:04 schweikh Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/dgb.4,v 1.20 2003/03/25 18:08:50 trhodes Exp $ .\" .Dd October 13, 1995 .Dt DGB 4 i386 @@ -354,8 +354,7 @@ .Xr stty 1 , .Xr termios 4 , .Xr tty 4 , -.Xr comcontrol 8 , -.Xr MAKEDEV 8 +.Xr comcontrol 8 .\" XXX add next line to many other drivers. .Sh HISTORY The ==== //depot/projects/mips/share/man/man9/style.9#6 (text+ko) ==== @@ -43,7 +43,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.99 2003/03/25 16:36:47 jhb Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.100 2003/03/25 19:46:55 jhb Exp $ */ /* @@ -82,11 +82,11 @@ #if 0 #ifndef lint static char sccsid[] = "@(#)style 1.14 (Berkeley) 4/28/95"; -#endif /* !lint */ +#endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.99 2003/03/25 16:36:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.100 2003/03/25 19:46:55 jhb Exp $"); .Ed .Pp Leave another blank line before the header files. ==== //depot/projects/mips/sys/i386/linux/linux_machdep.c#6 (text+ko) ==== @@ -25,7 +25,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/sys/i386/linux/linux_machdep.c,v 1.36 2003/03/18 08:45:23 phk Exp $ + * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.37 2003/03/25 20:02:55 mdodd Exp $ */ #include @@ -442,7 +442,9 @@ long pad; off_t pos; } */ bsd_args; + int error; + error = 0; bsd_args.flags = 0; if (linux_args->flags & LINUX_MAP_SHARED) bsd_args.flags |= MAP_SHARED; @@ -530,12 +532,18 @@ #ifdef DEBUG if (ldebug(mmap)) - printf("-> (%p, %d, %d, 0x%08x, %d, %d)\n", + printf("-> %s(%p, %d, %d, 0x%08x, %d, 0x%x)\n", + __func__, (void *)bsd_args.addr, bsd_args.len, bsd_args.prot, bsd_args.flags, bsd_args.fd, (int)bsd_args.pos); #endif - - return (mmap(td, &bsd_args)); + error = mmap(td, &bsd_args); +#ifdef DEBUG + if (ldebug(mmap)) + printf("-> %s() return: 0x%x (0x%08x)\n", + __func__, error, (u_int)td->td_retval[0]); +#endif + return (error); } int ==== //depot/projects/mips/sys/kern/kern_subr.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.72 2003/03/08 06:58:17 ken Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.73 2003/03/25 20:13:24 jhb Exp $ */ #include "opt_zero.h" @@ -185,8 +185,6 @@ n -= cnt; } out: - if (td != curthread) printf("uiomove: IT CHANGED!"); - td = curthread; /* Might things have changed in copyin/copyout? */ if (td) { mtx_lock_spin(&sched_lock); td->td_flags = (td->td_flags & ~TDF_DEADLKTREAT) | save; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 13:53:50 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E06A37B404; Tue, 25 Mar 2003 13:53:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C821D37B401 for ; Tue, 25 Mar 2003 13:53:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70C8943F85 for ; Tue, 25 Mar 2003 13:53:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PLrl0U007466 for ; Tue, 25 Mar 2003 13:53:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PLrkp2007462 for perforce@freebsd.org; Tue, 25 Mar 2003 13:53:46 -0800 (PST) Date: Tue, 25 Mar 2003 13:53:46 -0800 (PST) Message-Id: <200303252153.h2PLrkp2007462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27382 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-6.1 required=5.0 tests=AWL,X_AUTH_WARNING version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27382 Change 27382 by jmallett@jmallett_dalek on 2003/03/25 13:53:31 Try killing these again. Affected files ... .. //depot/projects/mips/contrib/binutils/bfd/coff-mips.c#5 delete .. //depot/projects/mips/contrib/binutils/bfd/cpu-mips.c#5 delete .. //depot/projects/mips/contrib/binutils/bfd/elf32-mips.c#5 delete .. //depot/projects/mips/contrib/binutils/bfd/elf64-mips.c#5 delete .. //depot/projects/mips/contrib/binutils/bfd/pe-mips.c#5 delete .. //depot/projects/mips/contrib/binutils/include/opcode/mips.h#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmip.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmipn32.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bsmip.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32ebmip.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32elmip.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lmip.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lsmip.sh#5 delete .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf64bmip.sh#5 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 25 13:55:54 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99F2837B404; Tue, 25 Mar 2003 13:55:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 397DB37B401 for ; Tue, 25 Mar 2003 13:55:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A147B43F3F for ; Tue, 25 Mar 2003 13:55:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PLto0U007576 for ; Tue, 25 Mar 2003 13:55:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PLtoYu007573 for perforce@freebsd.org; Tue, 25 Mar 2003 13:55:50 -0800 (PST) Date: Tue, 25 Mar 2003 13:55:50 -0800 (PST) Message-Id: <200303252155.h2PLtoYu007573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 27383 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-5.8 required=5.0 tests=AWL,X_AUTH_WARNING version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27383 Change 27383 by jmallett@jmallett_dalek on 2003/03/25 13:54:58 Manually add these after integrate stops being sad. Affected files ... .. //depot/projects/mips/contrib/binutils/bfd/coff-mips.c#6 add .. //depot/projects/mips/contrib/binutils/bfd/cpu-mips.c#6 add .. //depot/projects/mips/contrib/binutils/bfd/elf32-mips.c#6 add .. //depot/projects/mips/contrib/binutils/bfd/elf64-mips.c#6 add .. //depot/projects/mips/contrib/binutils/bfd/pe-mips.c#6 add .. //depot/projects/mips/contrib/binutils/include/opcode/mips.h#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmip.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bmipn32.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32bsmip.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32ebmip.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32elmip.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lmip.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf32lsmip.sh#6 add .. //depot/projects/mips/contrib/binutils/ld/emulparams/elf64bmip.sh#6 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects@FreeBSD.ORG Thu Mar 27 11:56:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C1CB37B404; Thu, 27 Mar 2003 11:56:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6EED37B401 for ; Thu, 27 Mar 2003 11:56:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C5EC43F85 for ; Thu, 27 Mar 2003 11:56:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2RJup0U092999 for ; Thu, 27 Mar 2003 11:56:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2RJupsv092996 for perforce@freebsd.org; Thu, 27 Mar 2003 11:56:51 -0800 (PST) Date: Thu, 27 Mar 2003 11:56:51 -0800 (PST) Message-Id: <200303271956.h2RJupsv092996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews X-Spam-Status: No, hits=-3.7 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Subject: PERFORCE change 27475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 19:56:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=27475 Change 27475 by jhb@jhb_laptop on 2003/03/27 11:56:17 First pass at letting BIOS programs read both %CR0 and %CR4 into any register rather than just %eax. Unfortunately, boot2 now overflows by 29 bytes. Also, this isn't tested. I'm not quite sure how I will test it either. :-( Affected files ... .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#4 edit Differences ... ==== //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#4 (text+ko) ==== @@ -494,9 +494,9 @@ cmpb $0x32,(%esi) # Is it a RDMSR? je v86rdmsr # Yes cmpb $0x20,(%esi) # Is this a - jne v86mon.4 # MOV EAX,CR0 - cmpb $0xc0,0x1(%esi) # instruction? - je v86mov # Yes + jne v86mon.4 # MOV reg,CR[04] + testb $0x18,0x1(%esi) # instruction? + jz v86mov # Yes v86mon.4: cmpb $0xfa,%al # CLI? je v86cli # Yes cmpb $0xfb,%al # STI? @@ -527,10 +527,17 @@ leal 0x8(%esp,1),%esp # Discard int no, error iret # To V86 mode # -# Emulate MOV EAX,CR0. +# Emulate MOV reg,CR[04]. # -v86mov: movl %cr0,%eax # CR0 to - movl %eax,0x1c(%ebp) # saved EAX +v86mov: movb 0x1(%esi),%bl # Fetch Mod R/M byte + movl %cr0,%eax # Read CR0 + testb $0x20,%bl # Read CR4 instead? + jz v86mov.1 # No + movl %cr4,%eax # Read CR4 +v86mov.1: andl $0x7,%ebx # Compute offset in + shl $2,%ebx # frame of destination + neg %ebx # register + movl %eax,0x1c(%ebp,%ebx,1) # Store CR to reg incl %esi # Adjust IP # # Return from emulating a 0x0f prefixed instruction From owner-p4-projects@FreeBSD.ORG Thu Mar 27 13:23:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D121937B404; Thu, 27 Mar 2003 13:23:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59E3D37B401 for ; Thu, 27 Mar 2003 13:23:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E85E543F93 for ; Thu, 27 Mar 2003 13:23:38 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2RLNc0U006132 for ; Thu, 27 Mar 2003 13:23:38 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2RLNcBr006129 for perforce@freebsd.org; Thu, 27 Mar 2003 13:23:38 -0800 (PST) Date: Thu, 27 Mar 2003 13:23:38 -0800 (PST) Message-Id: <200303272123.h2RLNcBr006129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews X-Spam-Status: No, hits=-3.9 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Subject: PERFORCE change 27479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 21:23:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=27479 Change 27479 by jhb@jhb_laptop on 2003/03/27 13:23:10 - Rework to allow for reading CR3 as well (and CR2). - Trim the int15_87 handler considerably by wiser choice of instructions. Affected files ... .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#5 edit Differences ... ==== //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#5 (text+ko) ==== @@ -493,10 +493,8 @@ je v86wrmsr # Yes cmpb $0x32,(%esi) # Is it a RDMSR? je v86rdmsr # Yes - cmpb $0x20,(%esi) # Is this a - jne v86mon.4 # MOV reg,CR[04] - testb $0x18,0x1(%esi) # instruction? - jz v86mov # Yes + cmpb $0x20,(%esi) # Is this a MOV reg,CRx? + je v86mov # Yes v86mon.4: cmpb $0xfa,%al # CLI? je v86cli # Yes cmpb $0xfb,%al # STI? @@ -527,14 +525,21 @@ leal 0x8(%esp,1),%esp # Discard int no, error iret # To V86 mode # -# Emulate MOV reg,CR[04]. +# Emulate MOV reg,CRx. # v86mov: movb 0x1(%esi),%bl # Fetch Mod R/M byte + testb $0x10,%bl # Read CR2 or CR3? + jnz v86mov.1 # Yes movl %cr0,%eax # Read CR0 testb $0x20,%bl # Read CR4 instead? - jz v86mov.1 # No + jz v86mov.2 # No movl %cr4,%eax # Read CR4 -v86mov.1: andl $0x7,%ebx # Compute offset in + jmp v86mov.2 +v86mov.1: movl %cr2,%eax # Read CR2 + testb $0x08,%bl # Read CR3 instead? + jz v86mov.2 # No + movl %cr3,%eax # Read CR3 +v86mov.2: andl $0x7,%ebx # Compute offset in shl $2,%ebx # frame of destination neg %ebx # register movl %eax,0x1c(%ebp,%ebx,1) # Store CR to reg @@ -613,41 +618,27 @@ # reads count of words from saved %cx # returns success by setting %ah to 0 # -int15_87: pushl %eax # Save - pushl %ebx # some information - pushl %esi # onto the stack. - pushl %edi - xorl %eax,%eax # clean EAX - xorl %ebx,%ebx # clean EBX - movl 0x4(%ebp),%esi # Get user's ESI - movl 0x3C(%ebp),%ebx # store ES - movw %si,%ax # store SI - shll $0x4,%ebx # Make it a seg. - addl %eax,%ebx # ebx=(es<<4)+si - movb 0x14(%ebx),%al # Grab the - movb 0x17(%ebx),%ah # necessary - shll $0x10,%eax # information - movw 0x12(%ebx),%ax # from - movl %eax,%esi # the - movb 0x1c(%ebx),%al # GDT in order to - movb 0x1f(%ebx),%ah # have %esi offset - shll $0x10,%eax # of source and %edi - movw 0x1a(%ebx),%ax # of destination. - movl %eax,%edi +int15_87: pushl %esi # Save + pushl %edi # registers + movzwl 0x4(%ebp),%eax # Load user's SI + movl 0x3C(%ebp),%edi # Load ES + leal (%eax,%edi,4),%edi # EDI = (ES << 4) + SI + movl 0x11(%edi),%eax # Read base of + movb 0x17(%edi),%al # GDT entry + ror $8,%eax # for source + movl %eax,%esi # into %esi + movl 0x19(%edi),%eax # Read base of + movb 0x1f(%edi),%al # GDT entry for + ror $8,%eax # destination + movl %eax,%edi # into %edi pushl %ds # Make: popl %es # es = ds - pushl %ecx # stash ECX - xorl %ecx,%ecx # highw of ECX is clear - movw 0x18(%ebp),%cx # Get user's ECX - shll $0x1,%ecx # Convert from num words to num - # bytes + movzwl 0x18(%ebp),%ecx # Get user's CX + shll $0x1,%ecx # Convert count from words rep # repeat... movsb # perform copy. - popl %ecx # Restore - popl %edi - popl %esi # previous - popl %ebx # register - popl %eax # values. + popl %edi # Restore + popl %esi # registers movb $0x0,0x1d(%ebp) # set ah = 0 to indicate # success andb $0xfe,%dl # clear CF From owner-p4-projects@FreeBSD.ORG Thu Mar 27 15:12:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2638A37B404; Thu, 27 Mar 2003 15:12:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C582E37B401 for ; Thu, 27 Mar 2003 15:12:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EF0243F85 for ; Thu, 27 Mar 2003 15:12:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2RNCp0U014715 for ; Thu, 27 Mar 2003 15:12:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2RNCoYQ014712 for perforce@freebsd.org; Thu, 27 Mar 2003 15:12:50 -0800 (PST) Date: Thu, 27 Mar 2003 15:12:50 -0800 (PST) Message-Id: <200303272312.h2RNCoYQ014712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews X-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL,LARGE_COLLECTION,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Subject: PERFORCE change 27481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 23:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=27481 Change 27481 by rwatson@rwatson_tislabs on 2003/03/27 15:12:11 Integ the TrustedBSD base branch -- primarily to loop back removal of "trustedbsd_" from the front of policy short names, but also to pick up O_DIRECT, better low memory handling. Affected files ... .. //depot/projects/trustedbsd/base/lib/libgeom/geom_ctl.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#9 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/apm/apm_saver.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#23 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#24 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ext.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/float.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#27 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#25 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#18 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#38 integrate .. //depot/projects/trustedbsd/base/sys/sys/ucred.h#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/gen/test-fpclassify.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/lp.local.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/lpr/printcap.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libgeom/geom_ctl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.1 2003/03/23 10:15:02 phk Exp $ + * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.2 2003/03/27 14:35:00 phk Exp $ */ #include @@ -35,29 +35,30 @@ #include #include #include +#include #include #include #include #include -#define GEOM_CTL_TABLE 1 +#define GCTL_TABLE 1 #include #include void -geom_ctl_dump(struct geom_ctl_req *req, FILE *f) +gctl_dump(struct gctl_req *req, FILE *f) { u_int i; int j; - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; if (req == NULL) { - fprintf(f, "Dump of geom_ctl request at NULL\n"); + fprintf(f, "Dump of gctl request at NULL\n"); return; } - fprintf(f, "Dump of geom_ctl %s request at %p:\n", req->reqt->name, req); + fprintf(f, "Dump of gctl %s request at %p:\n", req->reqt->name, req); if (req->error != NULL) fprintf(f, " error:\t\"%s\"\n", req->error); else @@ -68,24 +69,30 @@ fprintf(f, " param:\t\"%s\"", ap->name); else fprintf(f, " meta:\t@%jd", (intmax_t)ap->offset); + fprintf(f, " [%s%s", + ap->flag & GCTL_PARAM_RD ? "R" : "", + ap->flag & GCTL_PARAM_WR ? "W" : ""); fflush(f); - if (ap->len < 0) - fprintf(f, " = [%d] \"%s\"", -ap->len, (char *)ap->value); + if (ap->flag & GCTL_PARAM_ASCII) + fprintf(f, "%d] = \"%s\"", ap->len, (char *)ap->value); else if (ap->len > 0) { - fprintf(f, " = [%d]", ap->len); + fprintf(f, "%d] = ", ap->len); fflush(f); for (j = 0; j < ap->len; j++) { fprintf(f, " %02x", ((u_char *)ap->value)[j]); } } else { - fprintf(f, " = [0] %p", ap->value); + fprintf(f, "0] = %p", ap->value); } fprintf(f, "\n"); } } +/* + * Set an error message, if one does not already exist. + */ static void -geom_ctl_set_error(struct geom_ctl_req *req, const char *error, ...) +gctl_set_error(struct gctl_req *req, const char *error, ...) { va_list ap; @@ -93,107 +100,145 @@ return; va_start(ap, error); vasprintf(&req->error, error, ap); + va_end(ap); } +/* + * Check that a malloc operation succeeded, and set a consistent error + * message if not. + */ static void -geom_ctl_check_alloc(struct geom_ctl_req *req, void *ptr) +gctl_check_alloc(struct gctl_req *req, void *ptr) { if (ptr != NULL) return; - geom_ctl_set_error(req, "Could not allocate memory"); + gctl_set_error(req, "Could not allocate memory"); + if (req->error == NULL) + req->error = "Could not allocate memory"; } -struct geom_ctl_req * -geom_ctl_get_handle(enum geom_ctl_request req) +/* + * Allocate a new request handle of the specified type. + * XXX: Why bother checking the type ? + */ +struct gctl_req * +gctl_get_handle(enum gctl_request req) { - struct geom_ctl_req_table *gtp; - struct geom_ctl_req *rp; + struct gctl_req_table *gtp; + struct gctl_req *rp; rp = calloc(1, sizeof *rp); if (rp == NULL) return (NULL); for (gtp = gcrt; gtp->request != req; gtp++) - if (gtp->request == GEOM_INVALID_REQUEST) + if (gtp->request == GCTL_INVALID_REQUEST) break; rp->request = req; rp->reqt = gtp; - if (rp->reqt->request == GEOM_INVALID_REQUEST) - geom_ctl_set_error(rp, "Invalid request"); + if (rp->reqt->request == GCTL_INVALID_REQUEST) + gctl_set_error(rp, "Invalid request"); return (rp); } +/* + * Allocate space for another argument. + */ +static struct gctl_req_arg * +gctl_new_arg(struct gctl_req *req) +{ + struct gctl_req_arg *ap; + + req->narg++; + req->arg = realloc(req->arg, sizeof *ap * req->narg); + gctl_check_alloc(req, req->arg); + if (req->arg == NULL) { + req->narg = 0; + return (NULL); + } + ap = req->arg + (req->narg - 1); + memset(ap, 0, sizeof *ap); + return (ap); +} + void -geom_ctl_set_param(struct geom_ctl_req *req, const char *name, int len, void* value) +gctl_ro_param(struct gctl_req *req, const char *name, int len, const void* value) { - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; if (req == NULL || req->error != NULL) return; - if (req->reqt->params == 0) - geom_ctl_set_error(req, "Request takes no parameters"); - req->narg++; - req->arg = realloc(req->arg, sizeof *ap * req->narg); - geom_ctl_check_alloc(req, req->arg); - if (req->arg != NULL) { - ap = req->arg + (req->narg - 1); - memset(ap, 0, sizeof *ap); - ap->name = strdup(name); - geom_ctl_check_alloc(req, ap->name); - ap->nlen = strlen(ap->name); + ap = gctl_new_arg(req); + if (ap == NULL) + return; + ap->name = strdup(name); + gctl_check_alloc(req, ap->name); + ap->nlen = strlen(ap->name) + 1; + ap->value = __DECONST(void *, value); + ap->flag = GCTL_PARAM_RD; + if (len >= 0) ap->len = len; - if (len > 0) { - ap->value = value; - } else if (len < 0) { - ap->len = -strlen(value); - ap->value = strdup(value); - } else { - ap->value = value; - } - if (len != 0) - geom_ctl_check_alloc(req, ap->value); - } else { - req->narg = 0; + else if (len < 0) { + ap->flag |= GCTL_PARAM_ASCII; + ap->len = strlen(value) + 1; } } void -geom_ctl_set_meta(struct geom_ctl_req *req, off_t offset, u_int len, void* value) +gctl_rw_param(struct gctl_req *req, const char *name, int len, void* value) { - struct geom_ctl_req_arg *ap; - u_int i; + struct gctl_req_arg *ap; if (req == NULL || req->error != NULL) return; - if (req->reqt->meta == 0) - geom_ctl_set_error(req, "Request takes no meta data"); - for (i = 0; i < req->narg; i++) { - ap = &req->arg[i]; - if (ap->name != NULL) - continue; - if (ap->offset >= offset + len) - continue; - if (ap->offset + ap->len <= offset) - continue; - geom_ctl_set_error(req, "Overlapping meta data"); + ap = gctl_new_arg(req); + if (ap == NULL) return; - } - req->narg++; - req->arg = realloc(req->arg, sizeof *ap * req->narg); - geom_ctl_check_alloc(req, req->arg); - if (req->arg != NULL) { - ap = req->arg + (req->narg - 1); - memset(ap, 0, sizeof *ap); - ap->value = value; - ap->offset = offset; + ap->name = strdup(name); + gctl_check_alloc(req, ap->name); + ap->nlen = strlen(ap->name) + 1; + ap->value = value; + ap->flag = GCTL_PARAM_RW; + if (len >= 0) ap->len = len; - } else { - req->narg = 0; - } + else if (len < 0) + ap->len = strlen(value) + 1; +} + +void +gctl_ro_meta(struct gctl_req *req, off_t offset, u_int len, const void* value) +{ + struct gctl_req_arg *ap; + + if (req == NULL || req->error != NULL) + return; + ap = gctl_new_arg(req); + if (ap == NULL) + return; + ap->value = __DECONST(void *, value); + ap->flag = GCTL_PARAM_RD; + ap->offset = offset; + ap->len = len; +} + +void +gctl_rw_meta(struct gctl_req *req, off_t offset, u_int len, void* value) +{ + struct gctl_req_arg *ap; + + if (req == NULL || req->error != NULL) + return; + ap = gctl_new_arg(req); + if (ap == NULL) + return; + ap->value = value; + ap->flag = GCTL_PARAM_RW; + ap->offset = offset; + ap->len = len; } const char * -geom_ctl_issue(struct geom_ctl_req *req) +gctl_issue(struct gctl_req *req) { int fd, error; @@ -202,16 +247,21 @@ if (req->error != NULL) return (req->error); - req->version = GEOM_CTL_VERSION; + req->version = GCTL_VERSION; req->lerror = BUFSIZ; /* XXX: arbitrary number */ req->error = malloc(req->lerror); + if (req->error == NULL) { + gctl_check_alloc(req, req->error); + return (req->error); + } memset(req->error, 0, req->lerror); req->lerror--; fd = open(_PATH_DEV PATH_GEOM_CTL, O_RDONLY); if (fd < 0) return(strerror(errno)); error = ioctl(fd, GEOM_CTL, req); - if (error && errno == EINVAL && req->error[0] != '\0') + close(fd); + if (req->error[0] != '\0') return (req->error); if (error != 0) return(strerror(errno)); @@ -219,19 +269,18 @@ } void -geom_ctl_free(struct geom_ctl_req *req) +gctl_free(struct gctl_req *req) { u_int i; + if (req == NULL) + return; for (i = 0; i < req->narg; i++) { if (req->arg[i].name != NULL) free(req->arg[i].name); - if (req->arg[i].len < 0) - free(req->arg[i].value); } + free(req->arg); if (req->error != NULL) free(req->error); - free(req->arg); free(req); } - ==== //depot/projects/trustedbsd/base/lib/libgeom/libgeom.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.6 2003/03/23 10:15:02 phk Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.7 2003/03/27 14:35:00 phk Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -129,23 +129,17 @@ /* geom_ctl.c */ -struct geom_ctl_req; +struct gctl_req; #ifdef _STDIO_H_ /* limit #include pollution */ -void geom_ctl_dump(struct geom_ctl_req *req, FILE *f); +void gctl_dump(struct gctl_req *req, FILE *f); #endif -void geom_ctl_free(struct geom_ctl_req *req); -struct geom_ctl_req *geom_ctl_get_handle(enum geom_ctl_request req); -const char *geom_ctl_issue(struct geom_ctl_req *req); -void geom_ctl_set_class_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_class_by_name(struct geom_ctl_req *req, const char *name); -void geom_ctl_set_consumer_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_consumer_by_name(struct geom_ctl_req *req, const char *name); -void geom_ctl_set_geom_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_geom_by_name(struct geom_ctl_req *req, const char *name); -void geom_ctl_set_meta(struct geom_ctl_req *req, off_t offset, u_int len, void* val); -void geom_ctl_set_param(struct geom_ctl_req *req, const char *name, int len, void* val); -void geom_ctl_set_provider_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_provider_by_name(struct geom_ctl_req *req, const char *name); +void gctl_free(struct gctl_req *req); +struct gctl_req *gctl_get_handle(enum gctl_request req); +const char *gctl_issue(struct gctl_req *req); +void gctl_ro_meta(struct gctl_req *req, off_t offset, u_int len, const void* val); +void gctl_rw_meta(struct gctl_req *req, off_t offset, u_int len, void* val); +void gctl_ro_param(struct gctl_req *req, const char *name, int len, const void* val); +void gctl_rw_param(struct gctl_req *req, const char *name, int len, void* val); #endif /* _LIBGEOM_H_ */ ==== //depot/projects/trustedbsd/base/share/man/man4/wi.4#10 (text+ko) ==== @@ -28,7 +28,7 @@ .\" 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/wi.4,v 1.38 2003/03/05 02:37:20 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.39 2003/03/27 19:33:22 shiba Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -144,7 +144,7 @@ Addtron AWP-100 Prism-II PCMCIA Adtec Adlink/340C Prism-II PCMCIA Agere Orinoco Hermes PCMCIA -Allied Telesis WR211PCM Prism? PCMCIA +Allied Telesis WR211PCM Prism-II PCMCIA ArTem OnAir Prism? PCMCIA Avaya Wireless Prism-II PCMCIA Bay eMobility 11B Prism-2.5? PCMCIA @@ -208,7 +208,7 @@ TDK LAK-CD011WL Prism-II PCMCIA Toshiba Wireless LAN Card Prism-II PCMCIA U.S. Robotics Wireless Card 2410 Prism-II PCMCIA -YIS TWL-11B Prism-II PCMCIA +YIS YWL-11B Prism-II PCMCIA .El .Pp Several vendors sell PCI adapters built around the PLX Technology 9050 ==== //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#9 (text+ko) ==== @@ -25,7 +25,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/sys/alpha/linux/linux_sysvec.c,v 1.86 2003/03/26 18:29:44 jhb Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.87 2003/03/27 18:18:35 jhb Exp $ */ /* XXX we use functions that might not exist. */ @@ -60,6 +60,7 @@ #include #include +#include #include #undef szsigcode ==== //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_fbsd.c,v 1.28 2003/03/03 12:15:40 phk Exp $ + * $FreeBSD: src/sys/coda/coda_fbsd.c,v 1.29 2003/03/27 12:47:53 tjr Exp $ * */ @@ -173,6 +173,8 @@ static void coda_fbsd_drvuninit(void *unused); static void coda_fbsd_clone(void *arg, char *name, int namelen, dev_t *dev); +static eventhandler_tag clonetag; + static void coda_fbsd_clone(arg, name, namelen, dev) void *arg; char *name; @@ -196,7 +198,7 @@ { int i; - EVENTHANDLER_REGISTER(dev_clone,coda_fbsd_clone,0,1000); + clonetag = EVENTHANDLER_REGISTER(dev_clone,coda_fbsd_clone,0,1000); for(i=0;iqueue, bp); + if (!(request = malloc(sizeof(struct ad_request), M_AD, M_NOWAIT|M_ZERO))) { ata_prtdev(atadev, "out of memory in start\n"); + biofinish(bp, NULL, ENOMEM); return; } @@ -377,9 +381,6 @@ /* insert in tag array */ adp->tags[tag] = request; - /* remove from drive queue */ - bioq_remove(&adp->queue, bp); - /* link onto controller queue */ TAILQ_INSERT_TAIL(&atadev->channel->ata_queue, request, chain); } ==== //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.87 2003/02/19 05:47:06 imp Exp $ + * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.89 2003/03/27 20:38:00 mdodd Exp $ * * MAINTAINER: Matthew N. Dodd */ @@ -222,6 +222,7 @@ INTR_TYPE_NET, ieprobe, ieattach, "ie" }; +COMPAT_ISA_DRIVER(ie, iedriver); enum ie_hardware { IE_STARLAN10, @@ -783,13 +784,10 @@ ie->arpcom.ac_enaddr, ":"); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_output = ether_output; ifp->if_start = iestart; ifp->if_ioctl = ieioctl; ifp->if_init = ieinit; - ifp->if_type = IFT_ETHER; - ifp->if_addrlen = 6; - ifp->if_hdrlen = 14; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; if (ie->hard_type == IE_EE16) EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown, @@ -1123,6 +1121,7 @@ static __inline int ieget(int unit, struct ie_softc *ie, struct mbuf **mp) { + struct ether_header eh; struct mbuf *m, *top, **mymp; int offset; int totlen, resid; @@ -1133,18 +1132,10 @@ if (totlen <= 0) return (-1); - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (!m) { - ie_drop_packet_buffer(unit, ie); - /* XXXX if_ierrors++; */ - return (-1); - } - /* * Snarf the Ethernet header. */ - bcopy((v_caddr_t) ie->cbuffs[ie->rbhead], mtod(m, caddr_t), - sizeof (struct ether_header)); + bcopy((caddr_t)ie->cbuffs[ie->rbhead], &eh, sizeof(struct ether_header)); /* ignore cast-qual warning here */ /* @@ -1153,7 +1144,7 @@ * This is only a consideration when FILTER is defined; i.e., when * we are either running BPF or doing multicasting. */ - if (!check_eh(ie, mtod(m, struct ether_header *))) { + if (!check_eh(ie, &eh)) { m_free(m); ie_drop_packet_buffer(unit, ie); ie->arpcom.ac_if.if_ierrors--; /* just this case, it's not an @@ -1162,16 +1153,19 @@ return (-1); } - /* XXX way too complicated, check carefully XXXX */ + MGETHDR(m, M_DONTWAIT, MT_DATA); + if (!m) { + ie_drop_packet_buffer(unit, ie); + /* XXXX if_ierrors++; */ + return (-1); + } *mp = m; m->m_pkthdr.rcvif = &ie->arpcom.ac_if; - /* deduct header just copied; m_len must reflect space avail below */ - m->m_len = MHLEN - sizeof (struct ether_header); - m->m_pkthdr.len = totlen; + m->m_len = MHLEN; + resid = m->m_pkthdr.len = totlen; + top = 0; - resid = totlen - sizeof (struct ether_header); /* remaining data */ - top = NULL; mymp = ⊤ /* @@ -1212,10 +1206,11 @@ mymp = &m->m_next; } while (resid > 0); - resid = totlen - sizeof (struct ether_header); /* remaining data */ - offset = sizeof (struct ether_header); /* packet offset */ + resid = totlen; /* remaining data */ + offset = 0; /* packet offset */ + thismboff = 0; /* offset in m */ + m = top; /* current mbuf */ - thismboff = sizeof (struct ether_header); /* offset in m */ head = ie->rbhead; /* current rx buffer */ /* ==== //depot/projects/trustedbsd/base/sys/dev/md/md.c#23 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.91 2003/03/24 19:46:26 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.92 2003/03/27 10:14:36 phk Exp $ * */ @@ -240,9 +240,13 @@ /* * XXX: the top layer is probably not fully populated, so we allocate - * too much space for ip->array in new_indir() here. + * too much space for ip->array in here. */ - ip = new_indir(layer * nshift); + ip = malloc(sizeof *ip, M_MD, M_WAITOK | M_ZERO); + ip->array = malloc(sizeof(uintptr_t) * NINDIR, + M_MDSECT, M_WAITOK | M_ZERO); + ip->total = NINDIR; + ip->shift = layer * nshift; return (ip); } ==== //depot/projects/trustedbsd/base/sys/dev/syscons/apm/apm_saver.c#5 (text+ko) ==== @@ -25,7 +25,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/sys/dev/syscons/apm/apm_saver.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $ + * $FreeBSD: src/sys/dev/syscons/apm/apm_saver.c,v 1.9 2003/03/27 07:37:02 mdodd Exp $ */ #include @@ -44,10 +44,8 @@ #include #ifdef PC98 #include -#include -#else +#endif #include -#endif extern int apm_display(int newstate); ==== //depot/projects/trustedbsd/base/sys/geom/geom.h#23 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.49 2003/03/25 09:07:35 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.50 2003/03/27 14:34:59 phk Exp $ */ #ifndef _GEOM_GEOM_H_ @@ -62,9 +62,12 @@ struct thread; struct bio; struct sbuf; +struct gctl_req; struct g_configargs; typedef int g_config_t (struct g_configargs *ca); +typedef int g_ctl_create_geom_t (struct gctl_req *, struct g_class *cp, struct g_provider *pp); +typedef int g_ctl_destroy_geom_t (struct gctl_req *, struct g_class *cp, struct g_geom *gp); typedef struct g_geom * g_taste_t (struct g_class *, struct g_provider *, int flags); #define G_TF_NORMAL 0 @@ -90,6 +93,8 @@ const char *name; g_taste_t *taste; g_config_t *config; + g_ctl_create_geom_t *create_geom; + g_ctl_destroy_geom_t *destroy_geom; /* * The remaning elements are private and classes should use * the G_CLASS_INITIALIZER macro to initialize them. @@ -426,6 +431,10 @@ */ +/* geom_ctl.c */ +void *gctl_get_param(struct gctl_req *req, const char *param, int *len); +int gctl_error(struct gctl_req *req, const char *errtxt); + /* geom_enc.c */ uint16_t g_dec_be2(const u_char *p); uint32_t g_dec_be4(const u_char *p); ==== //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_ctl.c,v 1.10 2003/03/24 13:37:15 phk Exp $ + * $FreeBSD: src/sys/geom/geom_ctl.c,v 1.11 2003/03/27 14:34:59 phk Exp $ */ #include "opt_geom.h" @@ -55,7 +55,7 @@ #include #include -#define GEOM_CTL_TABLE 1 +#define GCTL_TABLE 1 #include #include @@ -74,6 +74,10 @@ make_dev(&g_ctl_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0640, PATH_GEOM_CTL); + KASSERT(GCTL_PARAM_RD == VM_PROT_READ, + ("GCTL_PARAM_RD != VM_PROT_READ")); + KASSERT(GCTL_PARAM_WR == VM_PROT_WRITE, + ("GCTL_PARAM_WR != VM_PROT_WRITE")); } static int @@ -125,8 +129,8 @@ * XXX: should not be static. * XXX: should take printf like args. */ -static int -g_ctl_seterror(struct geom_ctl_req *req, const char *errtxt) +int +gctl_error(struct gctl_req *req, const char *errtxt) { int error; @@ -142,7 +146,7 @@ * XXX: this should really be a standard function in the kernel. */ static void * -geom_alloc_copyin(void *uaddr, size_t len, int *errp) +geom_alloc_copyin(struct gctl_req *req, void *uaddr, size_t len, int *errp) { int error; void *ptr; @@ -154,6 +158,7 @@ error = copyin(uaddr, ptr, len); if (!error) return (ptr); + gctl_error(req, "no access to argument"); *errp = error; if (ptr != NULL) g_free(ptr); @@ -169,45 +174,46 @@ */ static int -geom_ctl_copyin(struct geom_ctl_req *req) +gctl_copyin(struct gctl_req *req) { int error, i, j; - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; char *p; error = 0; - if (!useracc(req->error, req->lerror, VM_PROT_WRITE)) - return (g_ctl_seterror(req, "No access to error field")); - ap = geom_alloc_copyin(req->arg, req->narg * sizeof(*ap), &error); - if (ap == NULL) + ap = geom_alloc_copyin(req, req->arg, req->narg * sizeof(*ap), &error); + if (ap == NULL) { + gctl_error(req, "copyin() of arguments failed"); return (error); + } + for (i = 0; !error && i < req->narg; i++) { - if (ap[i].len < 0 && - !useracc(ap[i].value, 1 + -ap[i].len, VM_PROT_READ)) - error = g_ctl_seterror(req, "No access to param data"); - else if (ap[i].len > 0 && - !useracc(ap[i].value, ap[i].len, - VM_PROT_READ | VM_PROT_WRITE)) - error = g_ctl_seterror(req, "No access to param data"); - if (ap[i].name == NULL) - continue; + if (ap[i].len > 0 && + !useracc(ap[i].value, ap[i].len, + ap[i].flag & GCTL_PARAM_RW)) + error = gctl_error(req, "no access to param data"); + if (ap[i].name == NULL) { + if (req->reqt->meta) + continue; + error = gctl_error(req, + "request does not take metadata arguments"); + break; + } p = NULL; - if (ap[i].nlen < 1 || ap[i].nlen > SPECNAMELEN) - error = EINVAL; - if (error) + if (ap[i].nlen < 1 || ap[i].nlen > SPECNAMELEN) { + error = gctl_error(req, "wrong param name length"); break; - p = geom_alloc_copyin(ap[i].name, ap[i].nlen + 1, &error); - if (error) + } + p = geom_alloc_copyin(req, ap[i].name, ap[i].nlen, &error); + if (p == NULL) break; - if (p[ap[i].nlen] != '\0') - error = EINVAL; - if (!error) { - ap[i].name = p; - ap[i].nlen = 0; - } else { + if (p[ap[i].nlen - 1] != '\0') { + error = gctl_error(req, "unterminated param name"); g_free(p); break; } + ap[i].name = p; + ap[i].nlen = 0; } if (!error) { req->arg = ap; @@ -221,17 +227,17 @@ } static void -geom_ctl_dump(struct geom_ctl_req *req) +gctl_dump(struct gctl_req *req) { u_int i; int j, error; - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; void *p; - printf("Dump of geom_ctl %s request at %p:\n", req->reqt->name, req); + printf("Dump of gctl %s request at %p:\n", req->reqt->name, req); if (req->lerror > 0) { - p = geom_alloc_copyin(req->error, req->lerror, &error); + p = geom_alloc_copyin(req, req->error, req->lerror, &error); if (p != NULL) { ((char *)p)[req->lerror - 1] = '\0'; printf(" error:\t\"%s\"\n", (char *)p); @@ -244,15 +250,19 @@ printf(" param:\t\"%s\"", ap->name); else printf(" meta:\t@%jd", (intmax_t)ap->offset); - printf(" [%d] = ", ap->len); - if (ap->len < 0) { - p = geom_alloc_copyin(ap->value, 1 + -ap->len, &error); - ((char *)p)[-ap->len] = '\0'; - if (p != NULL) + printf(" [%s%s%d] = ", + ap->flag & GCTL_PARAM_RD ? "R" : "", + ap->flag & GCTL_PARAM_WR ? "W" : "", + ap->len); + if (ap->flag & GCTL_PARAM_ASCII) { + p = geom_alloc_copyin(req, ap->value, ap->len, &error); + if (p != NULL) { + ((char *)p)[ap->len - 1] = '\0'; printf("\"%s\"", (char *)p); + } g_free(p); } else if (ap->len > 0) { - p = geom_alloc_copyin(ap->value, ap->len, &error); + p = geom_alloc_copyin(req, ap->value, ap->len, &error); for (j = 0; j < ap->len; j++) printf(" %02x", ((u_char *)p)[j]); g_free(p); @@ -263,6 +273,171 @@ } } +void * +gctl_get_param(struct gctl_req *req, const char *param, int *len) +{ + int i, error, j; + void *p; + struct gctl_req_arg *ap; + + for (i = 0; i < req->narg; i++) { + ap = &req->arg[i]; + if (strcmp(param, ap->name)) + continue; + if (!(ap->flag & GCTL_PARAM_RD)) + continue; + if (ap->len > 0) + j = ap->len; + else + j = 0; + if (j != 0) + p = geom_alloc_copyin(req, ap->value, j, &error); + /* XXX: should not fail, tested prviously */ + else + p = ap->value; + if (len != NULL) + *len = j; + return (p); + } + return (NULL); +} + +static struct g_class* +gctl_get_class(struct gctl_req *req) +{ + char *p; + int len; + struct g_class *cp; + + p = gctl_get_param(req, "class", &len); + if (p == NULL) + return (NULL); + if (p[len - 1] != '\0') { + gctl_error(req, "Unterminated class name"); + g_free(p); + return (NULL); + } + LIST_FOREACH(cp, &g_classes, class) { + if (!strcmp(p, cp->name)) { + g_free(p); + return (cp); + } + } + gctl_error(req, "Class not found"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 27 15:20:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63B7637B404; Thu, 27 Mar 2003 15:20:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E24F737B401 for ; Thu, 27 Mar 2003 15:20:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C72E943FE9 for ; Thu, 27 Mar 2003 15:20:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2RNK00U015699 for ; Thu, 27 Mar 2003 15:20:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2RNK00U015696 for perforce@freebsd.org; Thu, 27 Mar 2003 15:20:00 -0800 (PST) Date: Thu, 27 Mar 2003 15:20:00 -0800 (PST) Message-Id: <200303272320.h2RNK00U015696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews X-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL,LARGE_COLLECTION,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Subject: PERFORCE change 27482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 23:20:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=27482 Change 27482 by rwatson@rwatson_tislabs on 2003/03/27 15:19:42 Integ the TrustedBSD base branch -- primarily to loop back removal of "trustedbsd_" from the front of policy short names, but also to pick up O_DIRECT, better low memory handling. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libgeom/geom_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/apm/apm_saver.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_ext.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/float.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#202 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#71 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#161 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#120 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#97 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#40 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/gen/test-fpclassify.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/jail/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.8#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/lp.local.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpr/printcap.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/lib/libgeom/geom_ctl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.1 2003/03/23 10:15:02 phk Exp $ + * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.2 2003/03/27 14:35:00 phk Exp $ */ #include @@ -35,29 +35,30 @@ #include #include #include +#include #include #include #include #include -#define GEOM_CTL_TABLE 1 +#define GCTL_TABLE 1 #include #include void -geom_ctl_dump(struct geom_ctl_req *req, FILE *f) +gctl_dump(struct gctl_req *req, FILE *f) { u_int i; int j; - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; if (req == NULL) { - fprintf(f, "Dump of geom_ctl request at NULL\n"); + fprintf(f, "Dump of gctl request at NULL\n"); return; } - fprintf(f, "Dump of geom_ctl %s request at %p:\n", req->reqt->name, req); + fprintf(f, "Dump of gctl %s request at %p:\n", req->reqt->name, req); if (req->error != NULL) fprintf(f, " error:\t\"%s\"\n", req->error); else @@ -68,24 +69,30 @@ fprintf(f, " param:\t\"%s\"", ap->name); else fprintf(f, " meta:\t@%jd", (intmax_t)ap->offset); + fprintf(f, " [%s%s", + ap->flag & GCTL_PARAM_RD ? "R" : "", + ap->flag & GCTL_PARAM_WR ? "W" : ""); fflush(f); - if (ap->len < 0) - fprintf(f, " = [%d] \"%s\"", -ap->len, (char *)ap->value); + if (ap->flag & GCTL_PARAM_ASCII) + fprintf(f, "%d] = \"%s\"", ap->len, (char *)ap->value); else if (ap->len > 0) { - fprintf(f, " = [%d]", ap->len); + fprintf(f, "%d] = ", ap->len); fflush(f); for (j = 0; j < ap->len; j++) { fprintf(f, " %02x", ((u_char *)ap->value)[j]); } } else { - fprintf(f, " = [0] %p", ap->value); + fprintf(f, "0] = %p", ap->value); } fprintf(f, "\n"); } } +/* + * Set an error message, if one does not already exist. + */ static void -geom_ctl_set_error(struct geom_ctl_req *req, const char *error, ...) +gctl_set_error(struct gctl_req *req, const char *error, ...) { va_list ap; @@ -93,107 +100,145 @@ return; va_start(ap, error); vasprintf(&req->error, error, ap); + va_end(ap); } +/* + * Check that a malloc operation succeeded, and set a consistent error + * message if not. + */ static void -geom_ctl_check_alloc(struct geom_ctl_req *req, void *ptr) +gctl_check_alloc(struct gctl_req *req, void *ptr) { if (ptr != NULL) return; - geom_ctl_set_error(req, "Could not allocate memory"); + gctl_set_error(req, "Could not allocate memory"); + if (req->error == NULL) + req->error = "Could not allocate memory"; } -struct geom_ctl_req * -geom_ctl_get_handle(enum geom_ctl_request req) +/* + * Allocate a new request handle of the specified type. + * XXX: Why bother checking the type ? + */ +struct gctl_req * +gctl_get_handle(enum gctl_request req) { - struct geom_ctl_req_table *gtp; - struct geom_ctl_req *rp; + struct gctl_req_table *gtp; + struct gctl_req *rp; rp = calloc(1, sizeof *rp); if (rp == NULL) return (NULL); for (gtp = gcrt; gtp->request != req; gtp++) - if (gtp->request == GEOM_INVALID_REQUEST) + if (gtp->request == GCTL_INVALID_REQUEST) break; rp->request = req; rp->reqt = gtp; - if (rp->reqt->request == GEOM_INVALID_REQUEST) - geom_ctl_set_error(rp, "Invalid request"); + if (rp->reqt->request == GCTL_INVALID_REQUEST) + gctl_set_error(rp, "Invalid request"); return (rp); } +/* + * Allocate space for another argument. + */ +static struct gctl_req_arg * +gctl_new_arg(struct gctl_req *req) +{ + struct gctl_req_arg *ap; + + req->narg++; + req->arg = realloc(req->arg, sizeof *ap * req->narg); + gctl_check_alloc(req, req->arg); + if (req->arg == NULL) { + req->narg = 0; + return (NULL); + } + ap = req->arg + (req->narg - 1); + memset(ap, 0, sizeof *ap); + return (ap); +} + void -geom_ctl_set_param(struct geom_ctl_req *req, const char *name, int len, void* value) +gctl_ro_param(struct gctl_req *req, const char *name, int len, const void* value) { - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; if (req == NULL || req->error != NULL) return; - if (req->reqt->params == 0) - geom_ctl_set_error(req, "Request takes no parameters"); - req->narg++; - req->arg = realloc(req->arg, sizeof *ap * req->narg); - geom_ctl_check_alloc(req, req->arg); - if (req->arg != NULL) { - ap = req->arg + (req->narg - 1); - memset(ap, 0, sizeof *ap); - ap->name = strdup(name); - geom_ctl_check_alloc(req, ap->name); - ap->nlen = strlen(ap->name); + ap = gctl_new_arg(req); + if (ap == NULL) + return; + ap->name = strdup(name); + gctl_check_alloc(req, ap->name); + ap->nlen = strlen(ap->name) + 1; + ap->value = __DECONST(void *, value); + ap->flag = GCTL_PARAM_RD; + if (len >= 0) ap->len = len; - if (len > 0) { - ap->value = value; - } else if (len < 0) { - ap->len = -strlen(value); - ap->value = strdup(value); - } else { - ap->value = value; - } - if (len != 0) - geom_ctl_check_alloc(req, ap->value); - } else { - req->narg = 0; + else if (len < 0) { + ap->flag |= GCTL_PARAM_ASCII; + ap->len = strlen(value) + 1; } } void -geom_ctl_set_meta(struct geom_ctl_req *req, off_t offset, u_int len, void* value) +gctl_rw_param(struct gctl_req *req, const char *name, int len, void* value) { - struct geom_ctl_req_arg *ap; - u_int i; + struct gctl_req_arg *ap; if (req == NULL || req->error != NULL) return; - if (req->reqt->meta == 0) - geom_ctl_set_error(req, "Request takes no meta data"); - for (i = 0; i < req->narg; i++) { - ap = &req->arg[i]; - if (ap->name != NULL) - continue; - if (ap->offset >= offset + len) - continue; - if (ap->offset + ap->len <= offset) - continue; - geom_ctl_set_error(req, "Overlapping meta data"); + ap = gctl_new_arg(req); + if (ap == NULL) return; - } - req->narg++; - req->arg = realloc(req->arg, sizeof *ap * req->narg); - geom_ctl_check_alloc(req, req->arg); - if (req->arg != NULL) { - ap = req->arg + (req->narg - 1); - memset(ap, 0, sizeof *ap); - ap->value = value; - ap->offset = offset; + ap->name = strdup(name); + gctl_check_alloc(req, ap->name); + ap->nlen = strlen(ap->name) + 1; + ap->value = value; + ap->flag = GCTL_PARAM_RW; + if (len >= 0) ap->len = len; - } else { - req->narg = 0; - } + else if (len < 0) + ap->len = strlen(value) + 1; +} + +void +gctl_ro_meta(struct gctl_req *req, off_t offset, u_int len, const void* value) +{ + struct gctl_req_arg *ap; + + if (req == NULL || req->error != NULL) + return; + ap = gctl_new_arg(req); + if (ap == NULL) + return; + ap->value = __DECONST(void *, value); + ap->flag = GCTL_PARAM_RD; + ap->offset = offset; + ap->len = len; +} + +void +gctl_rw_meta(struct gctl_req *req, off_t offset, u_int len, void* value) +{ + struct gctl_req_arg *ap; + + if (req == NULL || req->error != NULL) + return; + ap = gctl_new_arg(req); + if (ap == NULL) + return; + ap->value = value; + ap->flag = GCTL_PARAM_RW; + ap->offset = offset; + ap->len = len; } const char * -geom_ctl_issue(struct geom_ctl_req *req) +gctl_issue(struct gctl_req *req) { int fd, error; @@ -202,16 +247,21 @@ if (req->error != NULL) return (req->error); - req->version = GEOM_CTL_VERSION; + req->version = GCTL_VERSION; req->lerror = BUFSIZ; /* XXX: arbitrary number */ req->error = malloc(req->lerror); + if (req->error == NULL) { + gctl_check_alloc(req, req->error); + return (req->error); + } memset(req->error, 0, req->lerror); req->lerror--; fd = open(_PATH_DEV PATH_GEOM_CTL, O_RDONLY); if (fd < 0) return(strerror(errno)); error = ioctl(fd, GEOM_CTL, req); - if (error && errno == EINVAL && req->error[0] != '\0') + close(fd); + if (req->error[0] != '\0') return (req->error); if (error != 0) return(strerror(errno)); @@ -219,19 +269,18 @@ } void -geom_ctl_free(struct geom_ctl_req *req) +gctl_free(struct gctl_req *req) { u_int i; + if (req == NULL) + return; for (i = 0; i < req->narg; i++) { if (req->arg[i].name != NULL) free(req->arg[i].name); - if (req->arg[i].len < 0) - free(req->arg[i].value); } + free(req->arg); if (req->error != NULL) free(req->error); - free(req->arg); free(req); } - ==== //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.6 2003/03/23 10:15:02 phk Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.7 2003/03/27 14:35:00 phk Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -129,23 +129,17 @@ /* geom_ctl.c */ -struct geom_ctl_req; +struct gctl_req; #ifdef _STDIO_H_ /* limit #include pollution */ -void geom_ctl_dump(struct geom_ctl_req *req, FILE *f); +void gctl_dump(struct gctl_req *req, FILE *f); #endif -void geom_ctl_free(struct geom_ctl_req *req); -struct geom_ctl_req *geom_ctl_get_handle(enum geom_ctl_request req); -const char *geom_ctl_issue(struct geom_ctl_req *req); -void geom_ctl_set_class_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_class_by_name(struct geom_ctl_req *req, const char *name); -void geom_ctl_set_consumer_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_consumer_by_name(struct geom_ctl_req *req, const char *name); -void geom_ctl_set_geom_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_geom_by_name(struct geom_ctl_req *req, const char *name); -void geom_ctl_set_meta(struct geom_ctl_req *req, off_t offset, u_int len, void* val); -void geom_ctl_set_param(struct geom_ctl_req *req, const char *name, int len, void* val); -void geom_ctl_set_provider_by_id(struct geom_ctl_req *req, void *id); -void geom_ctl_set_provider_by_name(struct geom_ctl_req *req, const char *name); +void gctl_free(struct gctl_req *req); +struct gctl_req *gctl_get_handle(enum gctl_request req); +const char *gctl_issue(struct gctl_req *req); +void gctl_ro_meta(struct gctl_req *req, off_t offset, u_int len, const void* val); +void gctl_rw_meta(struct gctl_req *req, off_t offset, u_int len, void* val); +void gctl_ro_param(struct gctl_req *req, const char *name, int len, const void* val); +void gctl_rw_param(struct gctl_req *req, const char *name, int len, void* val); #endif /* _LIBGEOM_H_ */ ==== //depot/projects/trustedbsd/mac/share/man/man4/wi.4#10 (text+ko) ==== @@ -28,7 +28,7 @@ .\" 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/wi.4,v 1.38 2003/03/05 02:37:20 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.39 2003/03/27 19:33:22 shiba Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -144,7 +144,7 @@ Addtron AWP-100 Prism-II PCMCIA Adtec Adlink/340C Prism-II PCMCIA Agere Orinoco Hermes PCMCIA -Allied Telesis WR211PCM Prism? PCMCIA +Allied Telesis WR211PCM Prism-II PCMCIA ArTem OnAir Prism? PCMCIA Avaya Wireless Prism-II PCMCIA Bay eMobility 11B Prism-2.5? PCMCIA @@ -208,7 +208,7 @@ TDK LAK-CD011WL Prism-II PCMCIA Toshiba Wireless LAN Card Prism-II PCMCIA U.S. Robotics Wireless Card 2410 Prism-II PCMCIA -YIS TWL-11B Prism-II PCMCIA +YIS YWL-11B Prism-II PCMCIA .El .Pp Several vendors sell PCI adapters built around the PLX Technology 9050 ==== //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#9 (text+ko) ==== @@ -25,7 +25,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/sys/alpha/linux/linux_sysvec.c,v 1.86 2003/03/26 18:29:44 jhb Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.87 2003/03/27 18:18:35 jhb Exp $ */ /* XXX we use functions that might not exist. */ @@ -60,6 +60,7 @@ #include #include +#include #include #undef szsigcode ==== //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_fbsd.c,v 1.28 2003/03/03 12:15:40 phk Exp $ + * $FreeBSD: src/sys/coda/coda_fbsd.c,v 1.29 2003/03/27 12:47:53 tjr Exp $ * */ @@ -173,6 +173,8 @@ static void coda_fbsd_drvuninit(void *unused); static void coda_fbsd_clone(void *arg, char *name, int namelen, dev_t *dev); +static eventhandler_tag clonetag; + static void coda_fbsd_clone(arg, name, namelen, dev) void *arg; char *name; @@ -196,7 +198,7 @@ { int i; - EVENTHANDLER_REGISTER(dev_clone,coda_fbsd_clone,0,1000); + clonetag = EVENTHANDLER_REGISTER(dev_clone,coda_fbsd_clone,0,1000); for(i=0;iqueue, bp); + if (!(request = malloc(sizeof(struct ad_request), M_AD, M_NOWAIT|M_ZERO))) { ata_prtdev(atadev, "out of memory in start\n"); + biofinish(bp, NULL, ENOMEM); return; } @@ -377,9 +381,6 @@ /* insert in tag array */ adp->tags[tag] = request; - /* remove from drive queue */ - bioq_remove(&adp->queue, bp); - /* link onto controller queue */ TAILQ_INSERT_TAIL(&atadev->channel->ata_queue, request, chain); } ==== //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.87 2003/02/19 05:47:06 imp Exp $ + * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.89 2003/03/27 20:38:00 mdodd Exp $ * * MAINTAINER: Matthew N. Dodd */ @@ -222,6 +222,7 @@ INTR_TYPE_NET, ieprobe, ieattach, "ie" }; +COMPAT_ISA_DRIVER(ie, iedriver); enum ie_hardware { IE_STARLAN10, @@ -783,13 +784,10 @@ ie->arpcom.ac_enaddr, ":"); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_output = ether_output; ifp->if_start = iestart; ifp->if_ioctl = ieioctl; ifp->if_init = ieinit; - ifp->if_type = IFT_ETHER; - ifp->if_addrlen = 6; - ifp->if_hdrlen = 14; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; if (ie->hard_type == IE_EE16) EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown, @@ -1123,6 +1121,7 @@ static __inline int ieget(int unit, struct ie_softc *ie, struct mbuf **mp) { + struct ether_header eh; struct mbuf *m, *top, **mymp; int offset; int totlen, resid; @@ -1133,18 +1132,10 @@ if (totlen <= 0) return (-1); - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (!m) { - ie_drop_packet_buffer(unit, ie); - /* XXXX if_ierrors++; */ - return (-1); - } - /* * Snarf the Ethernet header. */ - bcopy((v_caddr_t) ie->cbuffs[ie->rbhead], mtod(m, caddr_t), - sizeof (struct ether_header)); + bcopy((caddr_t)ie->cbuffs[ie->rbhead], &eh, sizeof(struct ether_header)); /* ignore cast-qual warning here */ /* @@ -1153,7 +1144,7 @@ * This is only a consideration when FILTER is defined; i.e., when * we are either running BPF or doing multicasting. */ - if (!check_eh(ie, mtod(m, struct ether_header *))) { + if (!check_eh(ie, &eh)) { m_free(m); ie_drop_packet_buffer(unit, ie); ie->arpcom.ac_if.if_ierrors--; /* just this case, it's not an @@ -1162,16 +1153,19 @@ return (-1); } - /* XXX way too complicated, check carefully XXXX */ + MGETHDR(m, M_DONTWAIT, MT_DATA); + if (!m) { + ie_drop_packet_buffer(unit, ie); + /* XXXX if_ierrors++; */ + return (-1); + } *mp = m; m->m_pkthdr.rcvif = &ie->arpcom.ac_if; - /* deduct header just copied; m_len must reflect space avail below */ - m->m_len = MHLEN - sizeof (struct ether_header); - m->m_pkthdr.len = totlen; + m->m_len = MHLEN; + resid = m->m_pkthdr.len = totlen; + top = 0; - resid = totlen - sizeof (struct ether_header); /* remaining data */ - top = NULL; mymp = ⊤ /* @@ -1212,10 +1206,11 @@ mymp = &m->m_next; } while (resid > 0); - resid = totlen - sizeof (struct ether_header); /* remaining data */ - offset = sizeof (struct ether_header); /* packet offset */ + resid = totlen; /* remaining data */ + offset = 0; /* packet offset */ + thismboff = 0; /* offset in m */ + m = top; /* current mbuf */ - thismboff = sizeof (struct ether_header); /* offset in m */ head = ie->rbhead; /* current rx buffer */ /* ==== //depot/projects/trustedbsd/mac/sys/dev/md/md.c#22 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.91 2003/03/24 19:46:26 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.92 2003/03/27 10:14:36 phk Exp $ * */ @@ -240,9 +240,13 @@ /* * XXX: the top layer is probably not fully populated, so we allocate - * too much space for ip->array in new_indir() here. + * too much space for ip->array in here. */ - ip = new_indir(layer * nshift); + ip = malloc(sizeof *ip, M_MD, M_WAITOK | M_ZERO); + ip->array = malloc(sizeof(uintptr_t) * NINDIR, + M_MDSECT, M_WAITOK | M_ZERO); + ip->total = NINDIR; + ip->shift = layer * nshift; return (ip); } ==== //depot/projects/trustedbsd/mac/sys/dev/syscons/apm/apm_saver.c#5 (text+ko) ==== @@ -25,7 +25,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/sys/dev/syscons/apm/apm_saver.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $ + * $FreeBSD: src/sys/dev/syscons/apm/apm_saver.c,v 1.9 2003/03/27 07:37:02 mdodd Exp $ */ #include @@ -44,10 +44,8 @@ #include #ifdef PC98 #include -#include -#else +#endif #include -#endif extern int apm_display(int newstate); ==== //depot/projects/trustedbsd/mac/sys/geom/geom.h#22 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.49 2003/03/25 09:07:35 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.50 2003/03/27 14:34:59 phk Exp $ */ #ifndef _GEOM_GEOM_H_ @@ -62,9 +62,12 @@ struct thread; struct bio; struct sbuf; +struct gctl_req; struct g_configargs; typedef int g_config_t (struct g_configargs *ca); +typedef int g_ctl_create_geom_t (struct gctl_req *, struct g_class *cp, struct g_provider *pp); +typedef int g_ctl_destroy_geom_t (struct gctl_req *, struct g_class *cp, struct g_geom *gp); typedef struct g_geom * g_taste_t (struct g_class *, struct g_provider *, int flags); #define G_TF_NORMAL 0 @@ -90,6 +93,8 @@ const char *name; g_taste_t *taste; g_config_t *config; + g_ctl_create_geom_t *create_geom; + g_ctl_destroy_geom_t *destroy_geom; /* * The remaning elements are private and classes should use * the G_CLASS_INITIALIZER macro to initialize them. @@ -426,6 +431,10 @@ */ +/* geom_ctl.c */ +void *gctl_get_param(struct gctl_req *req, const char *param, int *len); +int gctl_error(struct gctl_req *req, const char *errtxt); + /* geom_enc.c */ uint16_t g_dec_be2(const u_char *p); uint32_t g_dec_be4(const u_char *p); ==== //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_ctl.c,v 1.10 2003/03/24 13:37:15 phk Exp $ + * $FreeBSD: src/sys/geom/geom_ctl.c,v 1.11 2003/03/27 14:34:59 phk Exp $ */ #include "opt_geom.h" @@ -55,7 +55,7 @@ #include #include -#define GEOM_CTL_TABLE 1 +#define GCTL_TABLE 1 #include #include @@ -74,6 +74,10 @@ make_dev(&g_ctl_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0640, PATH_GEOM_CTL); + KASSERT(GCTL_PARAM_RD == VM_PROT_READ, + ("GCTL_PARAM_RD != VM_PROT_READ")); + KASSERT(GCTL_PARAM_WR == VM_PROT_WRITE, + ("GCTL_PARAM_WR != VM_PROT_WRITE")); } static int @@ -125,8 +129,8 @@ * XXX: should not be static. * XXX: should take printf like args. */ -static int -g_ctl_seterror(struct geom_ctl_req *req, const char *errtxt) +int +gctl_error(struct gctl_req *req, const char *errtxt) { int error; @@ -142,7 +146,7 @@ * XXX: this should really be a standard function in the kernel. */ static void * -geom_alloc_copyin(void *uaddr, size_t len, int *errp) +geom_alloc_copyin(struct gctl_req *req, void *uaddr, size_t len, int *errp) { int error; void *ptr; @@ -154,6 +158,7 @@ error = copyin(uaddr, ptr, len); if (!error) return (ptr); + gctl_error(req, "no access to argument"); *errp = error; if (ptr != NULL) g_free(ptr); @@ -169,45 +174,46 @@ */ static int -geom_ctl_copyin(struct geom_ctl_req *req) +gctl_copyin(struct gctl_req *req) { int error, i, j; - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; char *p; error = 0; - if (!useracc(req->error, req->lerror, VM_PROT_WRITE)) - return (g_ctl_seterror(req, "No access to error field")); - ap = geom_alloc_copyin(req->arg, req->narg * sizeof(*ap), &error); - if (ap == NULL) + ap = geom_alloc_copyin(req, req->arg, req->narg * sizeof(*ap), &error); + if (ap == NULL) { + gctl_error(req, "copyin() of arguments failed"); return (error); + } + for (i = 0; !error && i < req->narg; i++) { - if (ap[i].len < 0 && - !useracc(ap[i].value, 1 + -ap[i].len, VM_PROT_READ)) - error = g_ctl_seterror(req, "No access to param data"); - else if (ap[i].len > 0 && - !useracc(ap[i].value, ap[i].len, - VM_PROT_READ | VM_PROT_WRITE)) - error = g_ctl_seterror(req, "No access to param data"); - if (ap[i].name == NULL) - continue; + if (ap[i].len > 0 && + !useracc(ap[i].value, ap[i].len, + ap[i].flag & GCTL_PARAM_RW)) + error = gctl_error(req, "no access to param data"); + if (ap[i].name == NULL) { + if (req->reqt->meta) + continue; + error = gctl_error(req, + "request does not take metadata arguments"); + break; + } p = NULL; - if (ap[i].nlen < 1 || ap[i].nlen > SPECNAMELEN) - error = EINVAL; - if (error) + if (ap[i].nlen < 1 || ap[i].nlen > SPECNAMELEN) { + error = gctl_error(req, "wrong param name length"); break; - p = geom_alloc_copyin(ap[i].name, ap[i].nlen + 1, &error); - if (error) + } + p = geom_alloc_copyin(req, ap[i].name, ap[i].nlen, &error); + if (p == NULL) break; - if (p[ap[i].nlen] != '\0') - error = EINVAL; - if (!error) { - ap[i].name = p; - ap[i].nlen = 0; - } else { + if (p[ap[i].nlen - 1] != '\0') { + error = gctl_error(req, "unterminated param name"); g_free(p); break; } + ap[i].name = p; + ap[i].nlen = 0; } if (!error) { req->arg = ap; @@ -221,17 +227,17 @@ } static void -geom_ctl_dump(struct geom_ctl_req *req) +gctl_dump(struct gctl_req *req) { u_int i; int j, error; - struct geom_ctl_req_arg *ap; + struct gctl_req_arg *ap; void *p; - printf("Dump of geom_ctl %s request at %p:\n", req->reqt->name, req); + printf("Dump of gctl %s request at %p:\n", req->reqt->name, req); if (req->lerror > 0) { - p = geom_alloc_copyin(req->error, req->lerror, &error); + p = geom_alloc_copyin(req, req->error, req->lerror, &error); if (p != NULL) { ((char *)p)[req->lerror - 1] = '\0'; printf(" error:\t\"%s\"\n", (char *)p); @@ -244,15 +250,19 @@ printf(" param:\t\"%s\"", ap->name); else printf(" meta:\t@%jd", (intmax_t)ap->offset); - printf(" [%d] = ", ap->len); - if (ap->len < 0) { - p = geom_alloc_copyin(ap->value, 1 + -ap->len, &error); - ((char *)p)[-ap->len] = '\0'; - if (p != NULL) + printf(" [%s%s%d] = ", + ap->flag & GCTL_PARAM_RD ? "R" : "", + ap->flag & GCTL_PARAM_WR ? "W" : "", + ap->len); + if (ap->flag & GCTL_PARAM_ASCII) { + p = geom_alloc_copyin(req, ap->value, ap->len, &error); + if (p != NULL) { + ((char *)p)[ap->len - 1] = '\0'; printf("\"%s\"", (char *)p); + } g_free(p); } else if (ap->len > 0) { - p = geom_alloc_copyin(ap->value, ap->len, &error); + p = geom_alloc_copyin(req, ap->value, ap->len, &error); for (j = 0; j < ap->len; j++) printf(" %02x", ((u_char *)p)[j]); g_free(p); @@ -263,6 +273,171 @@ } } +void * +gctl_get_param(struct gctl_req *req, const char *param, int *len) +{ + int i, error, j; + void *p; + struct gctl_req_arg *ap; + + for (i = 0; i < req->narg; i++) { + ap = &req->arg[i]; + if (strcmp(param, ap->name)) + continue; + if (!(ap->flag & GCTL_PARAM_RD)) + continue; + if (ap->len > 0) + j = ap->len; + else + j = 0; + if (j != 0) + p = geom_alloc_copyin(req, ap->value, j, &error); + /* XXX: should not fail, tested prviously */ + else + p = ap->value; + if (len != NULL) + *len = j; + return (p); + } + return (NULL); +} + +static struct g_class* +gctl_get_class(struct gctl_req *req) +{ + char *p; + int len; + struct g_class *cp; + + p = gctl_get_param(req, "class", &len); + if (p == NULL) + return (NULL); + if (p[len - 1] != '\0') { + gctl_error(req, "Unterminated class name"); + g_free(p); + return (NULL); + } + LIST_FOREACH(cp, &g_classes, class) { + if (!strcmp(p, cp->name)) { + g_free(p); + return (cp); + } + } + gctl_error(req, "Class not found"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 27 15:32:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1835237B404; Thu, 27 Mar 2003 15:32:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C202337B401 for ; Thu, 27 Mar 2003 15:32:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 369B643F75 for ; Thu, 27 Mar 2003 15:32:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2RNWG0U017055 for ; Thu, 27 Mar 2003 15:32:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2RNWFIU017052 for perforce@freebsd.org; Thu, 27 Mar 2003 15:32:15 -0800 (PST) Date: Thu, 27 Mar 2003 15:32:15 -0800 (PST) Message-Id: <200303272332.h2RNWFIU017052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews X-Spam-Status: No, hits=-4.0 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Subject: PERFORCE change 27483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 23:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=27483 Change 27483 by jhb@jhb_laptop on 2003/03/27 15:32:09 More arcane optimizations to trim the size down. This is now down to -13 bytes over. However, if you remove the .p2align at the end of the file, boot2 is only at -1 byte. Affected files ... .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#6 edit Differences ... ==== //depot/projects/smpng/sys/boot/i386/btx/btx/btx.s#6 (text+ko) ==== @@ -208,7 +208,7 @@ ifdef(`PAGING',` or $0x80000001,%eax # mode and enable paging ',` - or $0x01,%eax # mode + inc %ax # mode ') mov %eax,%cr0 # ljmp $SEL_SCODE,$init.8 # To 32-bit code @@ -626,11 +626,11 @@ movl 0x11(%edi),%eax # Read base of movb 0x17(%edi),%al # GDT entry ror $8,%eax # for source - movl %eax,%esi # into %esi + xchgl %eax,%esi # into %esi movl 0x19(%edi),%eax # Read base of movb 0x1f(%edi),%al # GDT entry for ror $8,%eax # destination - movl %eax,%edi # into %edi + xchgl %eax,%edi # into %edi pushl %ds # Make: popl %es # es = ds movzwl 0x18(%ebp),%ecx # Get user's CX @@ -657,23 +657,16 @@ cmpb $0x19,%al # is it int 19? je reboot # yes, reboot the machine cmpb $0x15,%al # is it int 15? - jne v86intn.3 # no, skip parse - pushl %eax # stash EAX - movl 0x1c(%ebp),%eax # user's saved EAX - cmpb $0x87,%ah # is it the memcpy subfunction? - jne v86intn.1 # no, keep checking - popl %eax # get the stack straight - jmp int15_87 # it's our cue -v86intn.1: cmpw $0x4f53,%ax # is it the delete key callout? - jne v86intn.2 # no, handle the int normally + jne v86intn.1 # no, skip parse + cmpb $0x87,0x1c(%ebp) # is it the memcpy subfunction? + je int15_87 # yes + cmpw $0x4f53,0x1c(%ebp) # is it the delete key callout? + jne v86intn.1 # no, handle the int normally movb BDA_KEYFLAGS,%al # get the shift key state andb $0xc,%al # mask off just Ctrl and Alt cmpb $0xc,%al # are both Ctrl and Alt down? - jne v86intn.2 # no, handle the int normally - popl %eax # restore EAX - jmp reboot # reboot the machine -v86intn.2: popl %eax # restore EAX -v86intn.3: subl %edi,%esi # From + je reboot # yes, reboot the machine +v86intn.1: subl %edi,%esi # From shrl $0x4,%edi # linear movw %dx,-0x2(%ebx) # Save flags movw %di,-0x4(%ebx) # Save CS @@ -905,8 +898,7 @@ dump.3: lodsl # Set offset xchgl %eax,%edx # Save lodsl # Get segment - shll $0x4,%eax # * 0x10 - addl %edx,%eax # + offset + leal (%edx,%eax,4),%eax # * 0x10 + offset xchgl %eax,%esi # Set pointer dump.4: movb $2,%dl # Num lines dump.4a: movb $0x10,%cl # Bytes to dump From owner-p4-projects@FreeBSD.ORG Wed Mar 26 20:48:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 036A737B405; Wed, 26 Mar 2003 20:48:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A58FF37B404 for ; Wed, 26 Mar 2003 20:48:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5521343FAF for ; Wed, 26 Mar 2003 20:48:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2R4mN0U000717 for ; Wed, 26 Mar 2003 20:48:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2R4mLbX000714 for perforce@freebsd.org; Wed, 26 Mar 2003 20:48:21 -0800 (PST) Date: Wed, 26 Mar 2003 20:48:21 -0800 (PST) Message-Id: <200303270448.h2R4mLbX000714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews X-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL,HTML_00_10,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) X-Mailman-Approved-At: Wed, 26 Mar 2003 21:01:09 -0800 Subject: PERFORCE change 27454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 04:48:30 -0000 X-List-Received-Date: Thu, 27 Mar 2003 04:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=27454 Change 27454 by rwatson@rwatson_tislabs on 2003/03/26 20:47:46 Integ TrustedBSD base branch for more merge-work: loop back ipq entry point changes, etc. Affected files ... .. //depot/projects/trustedbsd/base/contrib/gcc/FAQ#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/GNATS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/bugs.html#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config-ml.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config.if#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config.sub#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/faq.html#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/gnats.html#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/COPYING#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/md5.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/partition.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/sort.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/install-sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/libtool.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ltconfig#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/missing#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/mkdep#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/symlink-tree#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ylwrap#2 delete .. //depot/projects/trustedbsd/base/contrib/gdtoa/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/trustedbsd/base/etc/printcap#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#5 integrate .. //depot/projects/trustedbsd/base/lib/libatm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libatm/atm_addr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libatm/cache_key.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libatm/libatm.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libatm/timer.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/spinlock.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_spinlock.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#10 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 integrate .. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/init/init.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mknod/mknod.8#6 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/refuse#4 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/refuse.README#5 integrate .. //depot/projects/trustedbsd/base/share/examples/ppp/ppp.conf.sample#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amr.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bge.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ccd.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iir.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/intro.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kld.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tap.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tun.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ukbd.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/urio.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#24 integrate .. //depot/projects/trustedbsd/base/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/trustedbsd/base/share/man/man8/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#25 integrate .. //depot/projects/trustedbsd/base/share/man/man9/at_exit.9#2 delete .. //depot/projects/trustedbsd/base/share/man/man9/at_fork.9#4 delete .. //depot/projects/trustedbsd/base/share/man/man9/style.9#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#16 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#28 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.h#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#56 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#33 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aacreg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aacvar.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/apm.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#35 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/SMP#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/smp.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/trustedbsd/base/sys/isa/orm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/bus_if.m#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#34 integrate .. //depot/projects/trustedbsd/base/sys/modules/apm/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#12 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pc98/apm/apm.c#9 delete .. //depot/projects/trustedbsd/base/sys/pc98/apm/apm.h#2 delete .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#26 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#24 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/ofw_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#20 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#17 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#1 branch .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#19 integrate .. //depot/projects/trustedbsd/base/usr.bin/at/at.man#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/bundle.h#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/datalink.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ip.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ipv6cp.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ncpaddr.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/route.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtadvd/rtadvd.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/setfmac/setfsmac.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/gdtoa/README#2 (text+ko) ==== @@ -320,7 +320,4 @@ Please send comments to David M. Gay - Bell Labs, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636, U.S.A. - dmg@research.bell-labs.com + dmg@acm.org ==== //depot/projects/trustedbsd/base/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -28,15 +28,15 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + int #ifdef KR_headers gethex(sp, fpi, exp, bp, sign) @@ -50,6 +50,11 @@ int esign, havedig, irv, k, n, nbits, up; ULong L, lostbits, *x; Long e, e1; +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (!hexdig['0']) hexdig_init_D2A(); @@ -61,7 +66,7 @@ s = s0; decpt = 0; if (!hexdig[*s]) { - if (*s == '.') { + if (*s == decimalpoint) { decpt = ++s; if (!hexdig[*s]) goto ret0; @@ -80,7 +85,7 @@ } while(hexdig[*s]) s++; - if (*s == '.' && !decpt) { + if (*s == decimalpoint && !decpt) { decpt = ++s; while(hexdig[*s]) s++; @@ -120,7 +125,7 @@ n = 0; L = 0; while(s1 > s0) { - if (*--s1 == '.') + if (*--s1 == decimalpoint) continue; if (n == 32) { *x++ = L; ==== //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" @@ -118,7 +114,7 @@ switch(s[1]) { case 'x': case 'X': - switch(gethex(&s, &fpi, &exp, &bb, sign)) { + switch(i = gethex(&s, &fpi, &exp, &bb, sign)) { case STRTOG_NoNumber: s = s00; sign = 0; ==== //depot/projects/trustedbsd/base/contrib/gdtoa/strtodg.c#2 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#2 (text+ko) ==== @@ -1,9 +1,9 @@ -README 7150e50 13249 +README c9c34c1 13153 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 -g__fmt.c e29d67f1 2534 +g__fmt.c ee5f9be0 2439 g_ddfmt.c fcf94527 3790 g_dfmt.c f30e55a9 2533 g_ffmt.c 7c4ea96 2459 @@ -12,7 +12,7 @@ gdtoa.c 364a0d2 17017 gdtoa.h 1eb440de 4810 gdtoaimp.h 6a955ba 19106 -gethex.c ff3c434d 4981 +gethex.c 1310d1b3 5066 gmisc.c e1a268ea 2114 hd_init.c cf9a94e 1827 hexnan.c f53be1da 2988 @@ -26,9 +26,9 @@ strtoIg.c ec59c2fa 3484 strtoIx.c 8f8c9d 1990 strtoIxL.c 1313ff7f 1961 -strtod.c 1ad667 20076 +strtod.c fd6556c8 19985 strtodI.c e58338e0 4062 -strtodg.c 1caf3fa4 19553 +strtodg.c e04b9254 19458 strtof.c 1e7a787a 2202 strtopQ.c e232c542 2685 strtopd.c e865dc64 1701 ==== //depot/projects/trustedbsd/base/etc/printcap#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ +# $FreeBSD: src/etc/printcap,v 1.13 2003/03/25 18:03:11 trhodes Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/doc/handbook/printing.html +# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.14 2002/08/13 10:30:55 blackend Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.15 2003/03/26 01:45:20 keramida Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -228,6 +228,19 @@ default: .B vi .sp +If the environment variable +.B MAIL_AGENT +is set, its value is used as the path + command line arguments of the +executable to be invoked for sending the problem report (which will be +provided via standard input). +.br +This can be useful if you either use a MTA other than sendmail or need +to provide additional parameters, such as the envelope sender on +machines without a valid FQDN. +.br +Default value: +.B /usr/sbin/sendmail -oi -t +.sp If the environment variable .B PR_FORM is set, then its value is used as the file name of the template for ==== //depot/projects/trustedbsd/base/lib/libatm/Makefile#2 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.4 2000/01/14 07:57:22 rgrimes Exp $ +# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $ # # @@ -33,5 +33,6 @@ LDADD+= -lmd DPADD+= ${LIBMD} +WARNS?= 3 .include ==== //depot/projects/trustedbsd/base/lib/libatm/atm_addr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.8 2002/06/24 22:29:01 arr Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.9 2003/03/25 04:29:26 mdodd Exp $"); #ifndef lint #if 0 /* original (broken) import id */ static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $"; @@ -183,6 +183,10 @@ val += c_value; out[out_len] = (u_char) val; out_len++; + if (out_len > len) + (void)fprintf(stderr, "%s() out_len > len (%d > %d)\n", + __func__, out_len, len); + break; case 4: @@ -305,7 +309,8 @@ u2.c[3] = atm_spans->aas_addr[7]; if (!(u1.w == 0 && u2.w == 0)) - sprintf(str, "0x%08lx.%08lx", ntohl(u1.w), ntohl(u2.w)); + sprintf(str, "0x%08lx.%08lx", + (u_long)ntohl(u1.w), (u_long)ntohl(u2.w)); break; case T_ATM_PVC_ADDR: ==== //depot/projects/trustedbsd/base/lib/libatm/cache_key.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.7 2002/06/24 22:29:01 arr Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); /* * User Space Library Functions @@ -85,7 +85,7 @@ * Copy the addresses into a buffer for MD5 computation */ len = sizeof(struct in_addr) + ap->address_length; - if (len > sizeof(buff)) + if (len > (int)sizeof(buff)) len = sizeof(buff); bcopy(ip, buff, sizeof(struct in_addr)); bcopy(ap->address, &buff[sizeof(struct in_addr)], ==== //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.7 2002/06/24 22:29:01 arr Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); /* * User Space Library Functions @@ -73,18 +73,18 @@ char *p; { struct hostent *ip_host; - static struct sockaddr_in sin; + static struct sockaddr_in s; /* * Get IP address of specified host name */ - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; + bzero(&s, sizeof(s)); + s.sin_family = AF_INET; if (p[0] >= '0' && p[0] <= '9') { /* * IP address is in dotted decimal format */ - if ((sin.sin_addr.s_addr = inet_addr(p)) == -1) { + if ((s.sin_addr.s_addr = inet_addr(p)) == INADDR_NONE) { return((struct sockaddr_in *)0); } } else { @@ -96,9 +96,9 @@ ip_host->h_addrtype != AF_INET) { return((struct sockaddr_in *)0); } - sin.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0]; + s.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0]; } - return(&sin); + return(&s); } @@ -115,7 +115,7 @@ * char * pointer to a text-formatted string * */ -char * +const char * format_ip_addr(addr) struct in_addr *addr; { ==== //depot/projects/trustedbsd/base/lib/libatm/libatm.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.5 2002/03/22 09:22:15 obrien Exp $ + * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.6 2003/03/25 04:29:26 mdodd Exp $ * */ @@ -71,7 +71,7 @@ struct harp_timer *ht_next; /* Timer chain */ int ht_ticks; /* Seconds till exp */ int ht_mark; /* Processing flag */ - void (*ht_func)(); /* Function to call */ + void (*ht_func)(struct harp_timer *); /* Function to call */ }; typedef struct harp_timer Harp_timer; @@ -100,7 +100,7 @@ /* ip_addr.c */ extern struct sockaddr_in *get_ip_addr(char *); -extern char *format_ip_addr(struct in_addr *); +extern const char *format_ip_addr(struct in_addr *); /* ip_checksum.c */ extern short ip_checksum(char *, int); @@ -108,9 +108,9 @@ /* timer.c */ extern Harp_timer *harp_timer_head; extern int harp_timer_exec; -extern void timer_proc(); -extern int init_timer(); -extern int block_timer(); +extern void timer_proc(void); +extern int init_timer(void); +extern int block_timer(void); extern void enable_timer(int); ==== //depot/projects/trustedbsd/base/lib/libatm/timer.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.7 2002/06/30 23:36:21 naddy Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); /* * User Space Library Functions @@ -72,7 +72,7 @@ * */ static void -timer_tick() +timer_tick(void) { /* * Bump the timer flag @@ -96,10 +96,10 @@ * */ void -timer_proc() +timer_proc(void) { Harp_timer *htp; - void (*f)(); + void (*f)(Harp_timer *); /* * Reset marks in all timers on the queue @@ -188,7 +188,7 @@ /* * Set up signal handler */ - if (signal(SIGALRM, timer_tick) == SIG_ERR) { + if (signal(SIGALRM, (sig_t)timer_tick) == SIG_ERR) { return(errno); } ==== //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $"); #include @@ -43,6 +43,7 @@ */ __weak_reference(_atomic_lock_stub, _atomic_lock); __weak_reference(_spinlock_stub, _spinlock); +__weak_reference(_spinlock_stub, _spinunlock); __weak_reference(_spinlock_debug_stub, _spinlock_debug); @@ -65,6 +66,14 @@ } /* + * This function is a stub for the spinunlock function in libpthread. + */ +void +_spinunlock_stub(spinlock_t *lck) +{ +} + +/* * This function is a stub for the debug spinlock function in libpthread. */ void ==== //depot/projects/trustedbsd/base/lib/libc/include/spinlock.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.5 2002/03/21 22:47:52 obrien Exp $ + * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.6 2003/03/26 04:02:24 jeff Exp $ * * Lock definitions used in both libc and libpthread. * @@ -52,7 +52,7 @@ #define _SPINLOCK_INITIALIZER { 0, 0, 0, 0 } -#define _SPINUNLOCK(_lck) (_lck)->access_lock = 0 +#define _SPINUNLOCK(_lck) _spinunlock(_lck); #ifdef _LOCK_DEBUG #define _SPINLOCK(_lck) _spinlock_debug(_lck, __FILE__, __LINE__) #else @@ -65,6 +65,7 @@ __BEGIN_DECLS long _atomic_lock(volatile long *); void _spinlock(spinlock_t *); +void _spinunlock(spinlock_t *); void _spinlock_debug(spinlock_t *, char *, int); __END_DECLS ==== //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_spinlock.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.11 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.12 2003/03/26 04:02:24 jeff Exp $ * */ @@ -44,6 +44,12 @@ #include "pthread_private.h" +void +_spinunlock(spinlock_t *lck) +{ + lck->access_lock = 0; +} + /* * Lock a location for the running thread. Yield to allow other * threads to run if this thread is blocked because the lock is ==== //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.12 2002/09/16 08:45:36 mini Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.13 2003/03/26 04:02:24 jeff Exp $ * */ @@ -44,6 +44,13 @@ #include "thr_private.h" +void +_spinunlock(spinlock_t *lck) +{ + lck->access_lock = 0; +} + + /* * Lock a location for the running thread. Yield to allow other * threads to run if this thread is blocked because the lock is ==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.61 2003/02/24 22:53:21 ru Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.62 2003/03/25 22:20:02 silby Exp $ .\" .Dd January 27, 2000 .Dt FTPD 8 @@ -184,12 +184,15 @@ .Ar timeout seconds (the default is 15 minutes). .It Fl U -In previous versions of -.Nm , -when a passive mode client requested a data connection to the server, -the server would use data ports in the range 1024..4999. Now, by default, -the server will use data ports in the range 49152..65535. Specifying this -option will revert to the old behavior. +This option instructs ftpd to use data ports in the range of +IP_PORTRANGE_DEFAULT instead of in the range of IP_PORTRANGE_HIGH. +Such a change may be useful for some specific firewall configurations; +see +.Xr ip 4 +for more information. +.Pp +Note that option is a virtual no-op in FreeBSD 5.0 and above; both port +ranges are indentical by default. .It Fl u The default file creation mode mask is set to .Ar umask , ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.524 2003/03/22 04:37:16 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.527 2003/03/25 20:21:20 olgeni Exp $ 2000 @@ -183,7 +183,7 @@ default. This change greatly decreases the need for a static, centralized table of major number assignments to device drivers (a few drivers retain their old static major numbers for - compatability), and also reduces the possibility of running out + compatibility), and also reduces the possibility of running out of device major numbers. @@ -323,7 +323,7 @@ A number of changes have been made to the &man.cd.4; driver. The primary user-visible change is improved - compatability with ATAPI/USB/Firewire CDROM drives. + compatibility with ATAPI/USB/Firewire CDROM drives. &man.geom.4; is now mandatory; the NO_GEOM has been removed from the set of @@ -513,7 +513,8 @@ the Don't Fragment bit on outgoing packets. &man.ping.8; now supports a option to use - ICMP mask request or timestamp request messages instead of ICMP echo requests. + ICMP mask request or timestamp request messages instead of ICMP + echo requests. &man.ping.8; now supports a flag to set the Type of Service bits in outgoing packets. @@ -580,7 +581,7 @@ FILE has been updated to 3.41. &merged; - GCC has been updated to + GCC has been updated to 3.2.2 (release version). The ISC DHCP client has been @@ -590,7 +591,7 @@ form of KTH eBones) has been removed. Users requiring this functionality can still get it from the security/krb4 port - (or package). Kerberos IV compatability mode for Kerberos 5 + (or package). Kerberos IV compatibility mode for Kerberos 5 has been removed, and the k5program userland utilities have been renamed to ==== //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $ + * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.27 2003/03/26 05:49:42 mdodd Exp $ * */ @@ -65,15 +65,17 @@ #include #include #include +#include #include #include #include #include #include #include +#include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.27 2003/03/26 05:49:42 mdodd Exp $"); #endif @@ -92,7 +94,15 @@ #define ASN_IPADDR 0x40 #define ASN_TIMESTAMP 0x43 -static char *Var_Types[] = { "", "", "ASN_INTEGER", "", "ASN_OCTET", "ASN_NULL", "ASN_OBJID" }; +static const char *Var_Types[] = { + "", + "", + "ASN_INTEGER", + "", + "ASN_OCTET", + "ASN_NULL", + "ASN_OBJID" +}; /* * Define SNMP PDU types @@ -103,8 +113,15 @@ #define PDU_TYPE_SET 0xA3 #define PDU_TYPE_TRAP 0xA4 -static char *PDU_Types[] = { "GET REQUEST", "GETNEXT REQUEST", "GET RESPONSE", "SET REQUEST", - "TRAP" }; +static char *PDU_Types[] = { + "GET REQUEST", + "GETNEXT REQUEST", + "GET RESPONSE", + "SET REQUEST", + "TRAP", + " ?? ", + " ??? " +}; /* * Define TRAP codes @@ -235,7 +252,7 @@ {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 1 }}, #define MY_OBJID 11 {{ 7, 43, 6, 1, 4, 1, 9999, 1 }}, -#define SETPFX_OBJID 12 +#define SETPFX_OBJID 12 /* ATM Forum says 1=valid, 2=invalid, not 0! */ {{ 12, 43, 6, 1, 4, 1, 353, 2, 7, 1, 1, 3, 0 }}, #define ENTERPRISE_OBJID 13 {{ 8, 43, 6, 1, 4, 1, 3, 1, 1 }}, @@ -243,6 +260,8 @@ {{ 10, 43, 6, 1, 4, 1, 353, 2, 1, 4, 0 }}, #define ATMF_SYSID 15 {{ 12, 43, 6, 1, 4, 1, 353, 2, 1, 1, 1, 8, 0 }}, +#define MADGE_OBJECT1 16 /* I don't have a clue ... -RH */ + {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 99 }}, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 26 20:54:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D55FC37B405; Wed, 26 Mar 2003 20:54:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71D8E37B404 for ; Wed, 26 Mar 2003 20:54:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22AF643FA3 for ; Wed, 26 Mar 2003 20:54:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2R4sW0U002978 for ; Wed, 26 Mar 2003 20:54:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2R4sU31002975 for perforce@freebsd.org; Wed, 26 Mar 2003 20:54:30 -0800 (PST) Date: Wed, 26 Mar 2003 20:54:30 -0800 (PST) Message-Id: <200303270454.h2R4sU31002975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews X-Spam-Status: No, hits=-3.3 required=5.0 tests=AWL,HTML_00_10,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) X-Mailman-Approved-At: Wed, 26 Mar 2003 21:01:09 -0800 Subject: PERFORCE change 27455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2003 04:54:39 -0000 X-List-Received-Date: Thu, 27 Mar 2003 04:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=27455 Change 27455 by rwatson@rwatson_tislabs on 2003/03/26 20:54:00 Integ TrustedBSD MAC tree: loop back ipq changes, etc. May require some additional merging. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/gcc/FAQ#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/GNATS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/bugs.html#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config-ml.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config.if#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config.sub#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/faq.html#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/gnats.html#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/COPYING#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/md5.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/partition.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/sort.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/install-sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/libtool.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ltconfig#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/missing#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/mkdep#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/symlink-tree#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ylwrap#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdtoa/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/trustedbsd/mac/etc/printcap#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#5 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/atm_addr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/cache_key.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/ip_addr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/libatm.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/timer.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/_spinlock_stub.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/spinlock.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_spinlock.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spinlock.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.8#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#53 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/ilmid/ilmid.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dhcpctl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/dhclient/omshell/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/init/init.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mknod/mknod.8#6 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/refuse#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/refuse.README#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/ppp/ppp.conf.sample#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/amr.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bge.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ccd.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iir.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/intro.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/kld.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cx.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/dgb.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pcm.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tap.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tun.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ukbd.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/urio.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#21 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/trustedbsd/mac/share/man/man8/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#25 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/at_exit.9#2 delete .. //depot/projects/trustedbsd/mac/share/man/man9/at_fork.9#4 delete .. //depot/projects/trustedbsd/mac/share/man/man9/style.9#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_mib.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_mib.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#37 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#78 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#23 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#46 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aacreg.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aacvar.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx.reg#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde_lock.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/apm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/apm.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#27 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#36 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/SMP#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/smp.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_machdep.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/isa/orm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/bus_if.m#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#378 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#61 integrate .. //depot/projects/trustedbsd/mac/sys/modules/apm/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/apm/apm.c#9 delete .. //depot/projects/trustedbsd/mac/sys/pc98/apm/apm.h#2 delete .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#201 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#56 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#160 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#119 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#96 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tte.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/pci/ofw_pci.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tsb.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#232 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#184 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#26 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#1 branch .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#18 integrate .. //depot/projects/trustedbsd/mac/usr.bin/at/at.man#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#17 integrate .. //depot/projects/trustedbsd/mac/usr.bin/whois/whois.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/bundle.h#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/command.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/datalink.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ip.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ipv6cp.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ncpaddr.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ppp.8.m4#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/route.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rtadvd/rtadvd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfsmac.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/contrib/gdtoa/README#2 (text+ko) ==== @@ -320,7 +320,4 @@ Please send comments to David M. Gay - Bell Labs, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636, U.S.A. - dmg@research.bell-labs.com + dmg@acm.org ==== //depot/projects/trustedbsd/mac/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/trustedbsd/mac/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -28,15 +28,15 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + int #ifdef KR_headers gethex(sp, fpi, exp, bp, sign) @@ -50,6 +50,11 @@ int esign, havedig, irv, k, n, nbits, up; ULong L, lostbits, *x; Long e, e1; +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (!hexdig['0']) hexdig_init_D2A(); @@ -61,7 +66,7 @@ s = s0; decpt = 0; if (!hexdig[*s]) { - if (*s == '.') { + if (*s == decimalpoint) { decpt = ++s; if (!hexdig[*s]) goto ret0; @@ -80,7 +85,7 @@ } while(hexdig[*s]) s++; - if (*s == '.' && !decpt) { + if (*s == decimalpoint && !decpt) { decpt = ++s; while(hexdig[*s]) s++; @@ -120,7 +125,7 @@ n = 0; L = 0; while(s1 > s0) { - if (*--s1 == '.') + if (*--s1 == decimalpoint) continue; if (n == 32) { *x++ = L; ==== //depot/projects/trustedbsd/mac/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" @@ -118,7 +114,7 @@ switch(s[1]) { case 'x': case 'X': - switch(gethex(&s, &fpi, &exp, &bb, sign)) { + switch(i = gethex(&s, &fpi, &exp, &bb, sign)) { case STRTOG_NoNumber: s = s00; sign = 0; ==== //depot/projects/trustedbsd/mac/contrib/gdtoa/strtodg.c#2 (text+ko) ==== @@ -28,11 +28,7 @@ /* Please send bug reports to David M. Gay - Bell Laboratories, Room 2C-463 - 600 Mountain Avenue - Murray Hill, NJ 07974-0636 - U.S.A. - dmg@bell-labs.com + dmg@acm.org */ #include "gdtoaimp.h" ==== //depot/projects/trustedbsd/mac/contrib/gdtoa/xsum0.out#2 (text+ko) ==== @@ -1,9 +1,9 @@ -README 7150e50 13249 +README c9c34c1 13153 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 -g__fmt.c e29d67f1 2534 +g__fmt.c ee5f9be0 2439 g_ddfmt.c fcf94527 3790 g_dfmt.c f30e55a9 2533 g_ffmt.c 7c4ea96 2459 @@ -12,7 +12,7 @@ gdtoa.c 364a0d2 17017 gdtoa.h 1eb440de 4810 gdtoaimp.h 6a955ba 19106 -gethex.c ff3c434d 4981 +gethex.c 1310d1b3 5066 gmisc.c e1a268ea 2114 hd_init.c cf9a94e 1827 hexnan.c f53be1da 2988 @@ -26,9 +26,9 @@ strtoIg.c ec59c2fa 3484 strtoIx.c 8f8c9d 1990 strtoIxL.c 1313ff7f 1961 -strtod.c 1ad667 20076 +strtod.c fd6556c8 19985 strtodI.c e58338e0 4062 -strtodg.c 1caf3fa4 19553 +strtodg.c e04b9254 19458 strtof.c 1e7a787a 2202 strtopQ.c e232c542 2685 strtopd.c e865dc64 1701 ==== //depot/projects/trustedbsd/mac/etc/printcap#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ +# $FreeBSD: src/etc/printcap,v 1.13 2003/03/25 18:03:11 trhodes Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/doc/handbook/printing.html +# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.14 2002/08/13 10:30:55 blackend Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.15 2003/03/26 01:45:20 keramida Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -228,6 +228,19 @@ default: .B vi .sp +If the environment variable +.B MAIL_AGENT +is set, its value is used as the path + command line arguments of the +executable to be invoked for sending the problem report (which will be +provided via standard input). +.br +This can be useful if you either use a MTA other than sendmail or need +to provide additional parameters, such as the envelope sender on +machines without a valid FQDN. +.br +Default value: +.B /usr/sbin/sendmail -oi -t +.sp If the environment variable .B PR_FORM is set, then its value is used as the file name of the template for ==== //depot/projects/trustedbsd/mac/lib/libatm/Makefile#2 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.4 2000/01/14 07:57:22 rgrimes Exp $ +# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $ # # @@ -33,5 +33,6 @@ LDADD+= -lmd DPADD+= ${LIBMD} +WARNS?= 3 .include ==== //depot/projects/trustedbsd/mac/lib/libatm/atm_addr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.8 2002/06/24 22:29:01 arr Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.9 2003/03/25 04:29:26 mdodd Exp $"); #ifndef lint #if 0 /* original (broken) import id */ static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $"; @@ -183,6 +183,10 @@ val += c_value; out[out_len] = (u_char) val; out_len++; + if (out_len > len) + (void)fprintf(stderr, "%s() out_len > len (%d > %d)\n", + __func__, out_len, len); + break; case 4: @@ -305,7 +309,8 @@ u2.c[3] = atm_spans->aas_addr[7]; if (!(u1.w == 0 && u2.w == 0)) - sprintf(str, "0x%08lx.%08lx", ntohl(u1.w), ntohl(u2.w)); + sprintf(str, "0x%08lx.%08lx", + (u_long)ntohl(u1.w), (u_long)ntohl(u2.w)); break; case T_ATM_PVC_ADDR: ==== //depot/projects/trustedbsd/mac/lib/libatm/cache_key.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.7 2002/06/24 22:29:01 arr Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); /* * User Space Library Functions @@ -85,7 +85,7 @@ * Copy the addresses into a buffer for MD5 computation */ len = sizeof(struct in_addr) + ap->address_length; - if (len > sizeof(buff)) + if (len > (int)sizeof(buff)) len = sizeof(buff); bcopy(ip, buff, sizeof(struct in_addr)); bcopy(ap->address, &buff[sizeof(struct in_addr)], ==== //depot/projects/trustedbsd/mac/lib/libatm/ip_addr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.7 2002/06/24 22:29:01 arr Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); /* * User Space Library Functions @@ -73,18 +73,18 @@ char *p; { struct hostent *ip_host; - static struct sockaddr_in sin; + static struct sockaddr_in s; /* * Get IP address of specified host name */ - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; + bzero(&s, sizeof(s)); + s.sin_family = AF_INET; if (p[0] >= '0' && p[0] <= '9') { /* * IP address is in dotted decimal format */ - if ((sin.sin_addr.s_addr = inet_addr(p)) == -1) { + if ((s.sin_addr.s_addr = inet_addr(p)) == INADDR_NONE) { return((struct sockaddr_in *)0); } } else { @@ -96,9 +96,9 @@ ip_host->h_addrtype != AF_INET) { return((struct sockaddr_in *)0); } - sin.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0]; + s.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0]; } - return(&sin); + return(&s); } @@ -115,7 +115,7 @@ * char * pointer to a text-formatted string * */ -char * +const char * format_ip_addr(addr) struct in_addr *addr; { ==== //depot/projects/trustedbsd/mac/lib/libatm/libatm.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.5 2002/03/22 09:22:15 obrien Exp $ + * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.6 2003/03/25 04:29:26 mdodd Exp $ * */ @@ -71,7 +71,7 @@ struct harp_timer *ht_next; /* Timer chain */ int ht_ticks; /* Seconds till exp */ int ht_mark; /* Processing flag */ - void (*ht_func)(); /* Function to call */ + void (*ht_func)(struct harp_timer *); /* Function to call */ }; typedef struct harp_timer Harp_timer; @@ -100,7 +100,7 @@ /* ip_addr.c */ extern struct sockaddr_in *get_ip_addr(char *); -extern char *format_ip_addr(struct in_addr *); +extern const char *format_ip_addr(struct in_addr *); /* ip_checksum.c */ extern short ip_checksum(char *, int); @@ -108,9 +108,9 @@ /* timer.c */ extern Harp_timer *harp_timer_head; extern int harp_timer_exec; -extern void timer_proc(); -extern int init_timer(); -extern int block_timer(); +extern void timer_proc(void); +extern int init_timer(void); +extern int block_timer(void); extern void enable_timer(int); ==== //depot/projects/trustedbsd/mac/lib/libatm/timer.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.7 2002/06/30 23:36:21 naddy Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); /* * User Space Library Functions @@ -72,7 +72,7 @@ * */ static void -timer_tick() +timer_tick(void) { /* * Bump the timer flag @@ -96,10 +96,10 @@ * */ void -timer_proc() +timer_proc(void) { Harp_timer *htp; - void (*f)(); + void (*f)(Harp_timer *); /* * Reset marks in all timers on the queue @@ -188,7 +188,7 @@ /* * Set up signal handler */ - if (signal(SIGALRM, timer_tick) == SIG_ERR) { + if (signal(SIGALRM, (sig_t)timer_tick) == SIG_ERR) { return(errno); } ==== //depot/projects/trustedbsd/mac/lib/libc/gen/_spinlock_stub.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $"); #include @@ -43,6 +43,7 @@ */ __weak_reference(_atomic_lock_stub, _atomic_lock); __weak_reference(_spinlock_stub, _spinlock); +__weak_reference(_spinlock_stub, _spinunlock); __weak_reference(_spinlock_debug_stub, _spinlock_debug); @@ -65,6 +66,14 @@ } /* + * This function is a stub for the spinunlock function in libpthread. + */ +void +_spinunlock_stub(spinlock_t *lck) +{ +} + +/* * This function is a stub for the debug spinlock function in libpthread. */ void ==== //depot/projects/trustedbsd/mac/lib/libc/include/spinlock.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.5 2002/03/21 22:47:52 obrien Exp $ + * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.6 2003/03/26 04:02:24 jeff Exp $ * * Lock definitions used in both libc and libpthread. * @@ -52,7 +52,7 @@ #define _SPINLOCK_INITIALIZER { 0, 0, 0, 0 } -#define _SPINUNLOCK(_lck) (_lck)->access_lock = 0 +#define _SPINUNLOCK(_lck) _spinunlock(_lck); #ifdef _LOCK_DEBUG #define _SPINLOCK(_lck) _spinlock_debug(_lck, __FILE__, __LINE__) #else @@ -65,6 +65,7 @@ __BEGIN_DECLS long _atomic_lock(volatile long *); void _spinlock(spinlock_t *); +void _spinunlock(spinlock_t *); void _spinlock_debug(spinlock_t *, char *, int); __END_DECLS ==== //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_spinlock.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.11 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.12 2003/03/26 04:02:24 jeff Exp $ * */ @@ -44,6 +44,12 @@ #include "pthread_private.h" +void +_spinunlock(spinlock_t *lck) +{ + lck->access_lock = 0; +} + /* * Lock a location for the running thread. Yield to allow other * threads to run if this thread is blocked because the lock is ==== //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spinlock.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.12 2002/09/16 08:45:36 mini Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.13 2003/03/26 04:02:24 jeff Exp $ * */ @@ -44,6 +44,13 @@ #include "thr_private.h" +void +_spinunlock(spinlock_t *lck) +{ + lck->access_lock = 0; +} + + /* * Lock a location for the running thread. Yield to allow other * threads to run if this thread is blocked because the lock is ==== //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.8#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.61 2003/02/24 22:53:21 ru Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.62 2003/03/25 22:20:02 silby Exp $ .\" .Dd January 27, 2000 .Dt FTPD 8 @@ -184,12 +184,15 @@ .Ar timeout seconds (the default is 15 minutes). .It Fl U -In previous versions of -.Nm , -when a passive mode client requested a data connection to the server, -the server would use data ports in the range 1024..4999. Now, by default, -the server will use data ports in the range 49152..65535. Specifying this -option will revert to the old behavior. +This option instructs ftpd to use data ports in the range of +IP_PORTRANGE_DEFAULT instead of in the range of IP_PORTRANGE_HIGH. +Such a change may be useful for some specific firewall configurations; +see +.Xr ip 4 +for more information. +.Pp +Note that option is a virtual no-op in FreeBSD 5.0 and above; both port +ranges are indentical by default. .It Fl u The default file creation mode mask is set to .Ar umask , ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#53 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.524 2003/03/22 04:37:16 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.527 2003/03/25 20:21:20 olgeni Exp $ 2000 @@ -183,7 +183,7 @@ default. This change greatly decreases the need for a static, centralized table of major number assignments to device drivers (a few drivers retain their old static major numbers for - compatability), and also reduces the possibility of running out + compatibility), and also reduces the possibility of running out of device major numbers. @@ -323,7 +323,7 @@ A number of changes have been made to the &man.cd.4; driver. The primary user-visible change is improved - compatability with ATAPI/USB/Firewire CDROM drives. + compatibility with ATAPI/USB/Firewire CDROM drives. &man.geom.4; is now mandatory; the NO_GEOM has been removed from the set of @@ -513,7 +513,8 @@ the Don't Fragment bit on outgoing packets. &man.ping.8; now supports a option to use - ICMP mask request or timestamp request messages instead of ICMP echo requests. + ICMP mask request or timestamp request messages instead of ICMP + echo requests. &man.ping.8; now supports a flag to set the Type of Service bits in outgoing packets. @@ -580,7 +581,7 @@ FILE has been updated to 3.41. &merged; - GCC has been updated to + GCC has been updated to 3.2.2 (release version). The ISC DHCP client has been @@ -590,7 +591,7 @@ form of KTH eBones) has been removed. Users requiring this functionality can still get it from the security/krb4 port - (or package). Kerberos IV compatability mode for Kerberos 5 + (or package). Kerberos IV compatibility mode for Kerberos 5 has been removed, and the k5program userland utilities have been renamed to ==== //depot/projects/trustedbsd/mac/sbin/atm/ilmid/ilmid.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $ + * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.27 2003/03/26 05:49:42 mdodd Exp $ * */ @@ -65,15 +65,17 @@ #include #include #include +#include #include #include #include #include #include #include +#include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.27 2003/03/26 05:49:42 mdodd Exp $"); #endif @@ -92,7 +94,15 @@ #define ASN_IPADDR 0x40 #define ASN_TIMESTAMP 0x43 -static char *Var_Types[] = { "", "", "ASN_INTEGER", "", "ASN_OCTET", "ASN_NULL", "ASN_OBJID" }; +static const char *Var_Types[] = { + "", + "", + "ASN_INTEGER", + "", + "ASN_OCTET", + "ASN_NULL", + "ASN_OBJID" +}; /* * Define SNMP PDU types @@ -103,8 +113,15 @@ #define PDU_TYPE_SET 0xA3 #define PDU_TYPE_TRAP 0xA4 -static char *PDU_Types[] = { "GET REQUEST", "GETNEXT REQUEST", "GET RESPONSE", "SET REQUEST", - "TRAP" }; +static char *PDU_Types[] = { + "GET REQUEST", + "GETNEXT REQUEST", + "GET RESPONSE", + "SET REQUEST", + "TRAP", + " ?? ", + " ??? " +}; /* * Define TRAP codes @@ -235,7 +252,7 @@ {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 1 }}, #define MY_OBJID 11 {{ 7, 43, 6, 1, 4, 1, 9999, 1 }}, -#define SETPFX_OBJID 12 +#define SETPFX_OBJID 12 /* ATM Forum says 1=valid, 2=invalid, not 0! */ {{ 12, 43, 6, 1, 4, 1, 353, 2, 7, 1, 1, 3, 0 }}, #define ENTERPRISE_OBJID 13 {{ 8, 43, 6, 1, 4, 1, 3, 1, 1 }}, @@ -243,6 +260,8 @@ {{ 10, 43, 6, 1, 4, 1, 353, 2, 1, 4, 0 }}, #define ATMF_SYSID 15 {{ 12, 43, 6, 1, 4, 1, 353, 2, 1, 1, 1, 8, 0 }}, +#define MADGE_OBJECT1 16 /* I don't have a clue ... -RH */ + {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 99 }}, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 28 08:32:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 531D637B404; Fri, 28 Mar 2003 08:32:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4BB337B401 for ; Fri, 28 Mar 2003 08:32:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 758F643FA3 for ; Fri, 28 Mar 2003 08:32:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2SGWq0U021871 for ; Fri, 28 Mar 2003 08:32:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2SGWpIT021868 for perforce@freebsd.org; Fri, 28 Mar 2003 08:32:51 -0800 (PST) Date: Fri, 28 Mar 2003 08:32:51 -0800 (PST) Message-Id: <200303281632.h2SGWpIT021868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews X-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) Subject: PERFORCE change 27505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Mar 2003 16:32:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=27505 Change 27505 by rwatson@rwatson_tislabs on 2003/03/28 08:32:26 Fix guard define. Affected files ... .. //depot/projects/trustedbsd/misc/kugidfw/kugidfw.h#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kugidfw/kugidfw.h#2 (text+ko) ==== @@ -34,8 +34,8 @@ * $FreeBSD$ */ -#ifndef TEST_H -#define TEST_H +#ifndef KUGIDFW_H +#define KUGIDFW_H #include #include