Date: Mon, 17 Feb 2003 16:05:11 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 25356 for review Message-ID: <200302180005.h1I05B6Q038990@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25356 Change 25356 by jmallett@jmallett_dalek on 2003/02/17 16:04:44 integrate from trunk. Affected files ... .. //depot/projects/mips/bin/sh/memalloc.c#3 integrate .. //depot/projects/mips/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_vprompt.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth2-pam-freebsd.c#5 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/mips/etc/newsyslog.conf#2 integrate .. //depot/projects/mips/etc/opieaccess#2 integrate .. //depot/projects/mips/etc/pam.d/ftpd#3 integrate .. //depot/projects/mips/etc/pam.d/login#3 integrate .. //depot/projects/mips/etc/pam.d/other#3 integrate .. //depot/projects/mips/etc/pam.d/sshd#5 integrate .. //depot/projects/mips/etc/pam.d/su#5 integrate .. //depot/projects/mips/etc/pam.d/telnetd#3 integrate .. //depot/projects/mips/etc/pam.d/xdm#3 integrate .. //depot/projects/mips/etc/rc.d/ipsec#2 integrate .. //depot/projects/mips/games/fortune/Notes#3 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/Makefile#3 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/Makefile#4 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/mips/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/mips/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/mips/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/mips/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/mips/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/mips/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/mips/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/mips/lib/libc/gen/semctl.c#2 integrate .. //depot/projects/mips/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/mips/lib/libc/gen/unvis.c#3 integrate .. //depot/projects/mips/lib/libc/i386/gen/getcontext.S#2 integrate .. //depot/projects/mips/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_get_ldt.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_set_ldt.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_vm86.c#2 integrate .. //depot/projects/mips/lib/libc/include/namespace.h#5 integrate .. //depot/projects/mips/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/mips/lib/libc/net/if_nametoindex.c#3 integrate .. //depot/projects/mips/lib/libc/net/name6.c#4 integrate .. //depot/projects/mips/lib/libc/net/res_query.c#2 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/mips/lib/libc/regex/engine.c#2 integrate .. //depot/projects/mips/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/mips/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/mips/lib/libc/rpc/crypt_client.c#2 integrate .. //depot/projects/mips/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/mips/lib/libc/rpc/mt_misc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/rand.c#4 integrate .. //depot/projects/mips/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/mips/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/mips/lib/libc/stdtime/localtime.c#3 integrate .. //depot/projects/mips/lib/libc/stdtime/strptime.c#2 integrate .. //depot/projects/mips/lib/libc/sys/sem.c#3 integrate .. //depot/projects/mips/lib/libdevinfo/devinfo_var.h#2 integrate .. //depot/projects/mips/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_init.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_kern.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigpending.c#2 integrate .. //depot/projects/mips/libexec/rpc.rstatd/rstat_proc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/mips/release/Makefile#13 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/mips/sbin/vinum/commands.c#3 integrate .. //depot/projects/mips/sbin/vinum/list.c#3 integrate .. //depot/projects/mips/sbin/vinum/vext.h#3 integrate .. //depot/projects/mips/share/man/man4/Makefile#9 integrate .. //depot/projects/mips/share/man/man4/mac.4#3 integrate .. //depot/projects/mips/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/mips/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/tx.4#2 integrate .. //depot/projects/mips/share/man/man4/miibus.4#2 integrate .. //depot/projects/mips/share/man/man4/wi.4#5 integrate .. //depot/projects/mips/share/man/man9/mutex.9#3 integrate .. //depot/projects/mips/sys/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/mips/sys/alpha/alpha/exception.s#2 integrate .. //depot/projects/mips/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#7 integrate .. //depot/projects/mips/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/mips/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/mips/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/mips/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/mips/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/mips/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/mips/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/mips/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/mips/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/mips/sys/ddb/db_command.c#3 integrate .. //depot/projects/mips/sys/ddb/db_ps.c#7 integrate .. //depot/projects/mips/sys/ddb/ddb.h#3 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/mips/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/mips/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/mips/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/mips/sys/dev/dgb/dgb.c#2 integrate .. //depot/projects/mips/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/mips/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/mips/sys/dev/isp/isp.c#4 integrate .. //depot/projects/mips/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/mips/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/mips/sys/dev/pci/pci.c#6 integrate .. //depot/projects/mips/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/mips/sys/dev/rc/rc.c#3 integrate .. //depot/projects/mips/sys/dev/rp/rp.c#4 integrate .. //depot/projects/mips/sys/dev/si/si.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio.c#4 integrate .. //depot/projects/mips/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/mips/sys/dev/vinum/vinumhdr.h#3 integrate .. //depot/projects/mips/sys/i386/i386/exception.s#5 integrate .. //depot/projects/mips/sys/i386/i386/genassym.c#7 integrate .. //depot/projects/mips/sys/i386/i386/i386-gdbstub.c#3 integrate .. //depot/projects/mips/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/mips/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/mips/sys/i386/i386/trap.c#7 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/i386/isa/cy.c#2 integrate .. //depot/projects/mips/sys/i386/isa/npx.c#5 integrate .. //depot/projects/mips/sys/i386/isa/spic.c#2 integrate .. //depot/projects/mips/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/mips/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/mips/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/mips/sys/ia64/ia32/ia32_misc.c#4 integrate .. //depot/projects/mips/sys/ia64/ia64/exception.s#5 integrate .. //depot/projects/mips/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/mips/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/mips/sys/ia64/ia64/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/ia64/include/param.h#2 integrate .. //depot/projects/mips/sys/kern/init_main.c#9 integrate .. //depot/projects/mips/sys/kern/kern_clock.c#6 integrate .. //depot/projects/mips/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#10 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#9 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#10 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#5 integrate .. //depot/projects/mips/sys/kern/kern_lock.c#6 integrate .. //depot/projects/mips/sys/kern/kern_resource.c#7 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#7 integrate .. //depot/projects/mips/sys/kern/kern_switch.c#7 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#8 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#11 integrate .. //depot/projects/mips/sys/kern/kern_time.c#5 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/mips/sys/kern/sched_ule.c#4 integrate .. //depot/projects/mips/sys/kern/subr_prof.c#5 integrate .. //depot/projects/mips/sys/kern/subr_smp.c#3 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#8 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#10 integrate .. //depot/projects/mips/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/mips/sys/kern/tty.c#4 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/mips/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/mips/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/mips/sys/net/if_sl.c#6 integrate .. //depot/projects/mips/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/mips/sys/net/ppp_tty.c#5 integrate .. //depot/projects/mips/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/mips/sys/pc98/pc98/sio.c#6 integrate .. //depot/projects/mips/sys/posix4/ksched.c#5 integrate .. //depot/projects/mips/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/trap.c#4 integrate .. //depot/projects/mips/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/exception.S#7 integrate .. //depot/projects/mips/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/mips/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/mips/sys/sys/bus.h#3 integrate .. //depot/projects/mips/sys/sys/dkstat.h#2 integrate .. //depot/projects/mips/sys/sys/proc.h#12 integrate .. //depot/projects/mips/sys/sys/resource.h#2 integrate .. //depot/projects/mips/sys/sys/resourcevar.h#5 integrate .. //depot/projects/mips/sys/sys/tty.h#2 integrate .. //depot/projects/mips/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#2 integrate .. //depot/projects/mips/usr.bin/login/login.c#5 integrate .. //depot/projects/mips/usr.bin/systat/devs.c#2 integrate .. //depot/projects/mips/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/mips/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/mips/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/mips/usr.bin/top/machine.c#2 integrate .. //depot/projects/mips/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.sh#5 integrate .. //depot/projects/mips/usr.sbin/adduser/rmuser.8#4 integrate .. //depot/projects/mips/usr.sbin/adduser/rmuser.sh#3 integrate .. //depot/projects/mips/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/mips/usr.sbin/iostat/iostat.c#2 integrate Differences ... ==== //depot/projects/mips/bin/sh/memalloc.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.20 2003/02/14 23:53:19 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.22 2003/02/17 03:51:44 tjr Exp $"); #include <sys/param.h> @@ -140,8 +140,8 @@ sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + blocksize); sp->prev = stackp; - stacknxt = sp->space; - stacknleft = blocksize; + stacknxt = (char *)ALIGN(sp->space); + stacknleft = blocksize - (stacknxt - sp->space); stackp = sp; INTON; } ==== //depot/projects/mips/bin/sh/nodes.c.pat#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.9 2003/02/14 23:53:19 tjr Exp $ + * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.11 2003/02/17 03:51:44 tjr Exp $ */ #include <sys/param.h> ==== //depot/projects/mips/contrib/openpam/lib/pam_vprompt.c#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_vprompt.c#9 $ */ #include <stdarg.h> @@ -66,7 +66,7 @@ r = pam_get_item(pamh, PAM_CONV, (const void **)&conv); if (r != PAM_SUCCESS) RETURNC(r); - if (conv == NULL) { + if (conv == NULL || conv->conv == NULL) { openpam_log(PAM_LOG_ERROR, "no conversation function"); RETURNC(PAM_SYSTEM_ERR); } ==== //depot/projects/mips/crypto/openssh/auth2-pam-freebsd.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include "includes.h" -RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.9 2003/02/03 14:10:28 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.10 2003/02/16 11:03:55 des Exp $"); #ifdef USE_PAM #include <security/pam_appl.h> @@ -188,8 +188,7 @@ struct pam_conv pam_conv = { pam_thread_conv, ctxt }; buffer_init(&buffer); - pam_err = pam_set_item(pam_handle, - PAM_CONV, (const void *)&pam_conv); + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&pam_conv); if (pam_err != PAM_SUCCESS) goto auth_fail; pam_err = pam_authenticate(pam_handle, 0); @@ -221,11 +220,24 @@ close(ctxt->pam_csock); } +static int +pam_null_conv(int n, + const struct pam_message **msg, + struct pam_response **resp, + void *data) +{ + + return (PAM_CONV_ERR); +} + +static struct pam_conv null_conv = { pam_null_conv, NULL }; + static void pam_cleanup(void *arg) { (void)arg; debug("PAM: cleanup"); + pam_set_item(pam_handle, PAM_CONV, (const void *)&null_conv); if (pam_cred_established) { pam_setcred(pam_handle, PAM_DELETE_CRED); pam_cred_established = 0; @@ -242,7 +254,6 @@ static int pam_init(const char *user) { - struct pam_conv no_conv = { NULL, NULL }; extern ServerOptions options; extern u_int utmp_len; const char *pam_rhost, *pam_user; @@ -258,7 +269,7 @@ pam_handle = NULL; } debug("PAM: initializing for \"%s\"", user); - pam_err = pam_start("sshd", user, &no_conv, &pam_handle); + pam_err = pam_start("sshd", user, &null_conv, &pam_handle); if (pam_err != PAM_SUCCESS) return (-1); pam_rhost = get_remote_name_or_ip(utmp_len, @@ -465,6 +476,10 @@ void do_pam_session(const char *user, const char *tty) { + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&null_conv); + if (pam_err != PAM_SUCCESS) + fatal("PAM: failed to set PAM_CONV: %s", + pam_strerror(pam_handle, pam_err)); debug("PAM: setting PAM_TTY to \"%s\"", tty); pam_err = pam_set_item(pam_handle, PAM_TTY, tty); if (pam_err != PAM_SUCCESS) @@ -480,6 +495,10 @@ void do_pam_setcred(int init) { + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&null_conv); + if (pam_err != PAM_SUCCESS) + fatal("PAM: failed to set PAM_CONV: %s", + pam_strerror(pam_handle, pam_err)); if (init) { debug("PAM: establishing credentials"); pam_err = pam_setcred(pam_handle, PAM_ESTABLISH_CRED); @@ -559,8 +578,7 @@ if (use_privsep) fatal("PAM: chauthtok not supprted with privsep"); - pam_err = pam_set_item(pam_handle, - PAM_CONV, (const void *)&pam_conv); + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&pam_conv); if (pam_err != PAM_SUCCESS) fatal("PAM: failed to set PAM_CONV: %s", pam_strerror(pam_handle, pam_err)); ==== //depot/projects/mips/etc/mtree/BSD.usr.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.271 2003/02/10 19:57:49 nectar Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.272 2003/02/15 23:05:48 keramida Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -542,8 +542,6 @@ i386 .. .. - catn - .. en.ISO8859-1 uname=root cat1 .. @@ -575,8 +573,6 @@ i386 .. .. - catn - .. .. ja uname=root cat1 @@ -597,8 +593,6 @@ .. cat9 .. - catn - .. /set uname=root man1 .. @@ -618,8 +612,6 @@ .. man9 .. - mann - .. .. man1 .. @@ -651,8 +643,6 @@ i386 .. .. - mann - .. .. me .. ==== //depot/projects/mips/etc/newsyslog.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.42 2002/09/21 12:07:35 markm Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.43 2003/02/16 13:07:20 des Exp $ # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -8,21 +8,21 @@ # future, these defaults may change to more conservative ones. # # logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] -/var/log/cron 600 3 100 * J +/var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J +/var/log/console.log 600 5 100 * J +/var/log/cron 600 3 100 * J +/var/log/daily.log 640 7 * @T00 J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J -/var/log/xferlog 600 7 100 * J /var/log/maillog 640 7 * @T00 J -/var/log/sendmail.st 640 10 * 168 B /var/log/messages 644 5 100 * J -/var/log/all.log 600 7 * @T00 J -/var/log/slip.log root:network 640 3 100 * J +/var/log/monthly.log 640 12 * $M1D0 J /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J +/var/log/sendmail.st 640 10 * 168 B +/var/log/slip.log root:network 640 3 100 * J +/var/log/weekly.log 640 5 1 $W6D0 J /var/log/wtmp 644 3 * @01T05 B -/var/log/daily.log 640 7 * @T00 J -/var/log/weekly.log 640 5 1 $W6D0 J -/var/log/monthly.log 640 12 * $M1D0 J -/var/log/console.log 600 5 100 * J +/var/log/xferlog 600 7 100 * J ==== //depot/projects/mips/etc/opieaccess#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/opieaccess,v 1.2 2001/08/14 23:51:58 ache Exp $ +# $FreeBSD: src/etc/opieaccess,v 1.4 2003/02/16 13:04:27 des Exp $ # # This file controls whether UNIX passwords are to be permitted. Rules # are matched in order, and the search terminates when the first matching ==== //depot/projects/mips/etc/pam.d/ftpd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.15 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.16 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "ftpd" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn #auth sufficient pam_krb5.so no_warn #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/login#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.12 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.13 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "login" service # @@ -8,7 +8,7 @@ auth required pam_nologin.so no_warn auth sufficient pam_self.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/other#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.7 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.8 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "other" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/sshd#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.12 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.13 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "sshd" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/su#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.11 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.12 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "su" service # @@ -9,7 +9,7 @@ auth sufficient pam_self.so no_warn auth requisite pam_group.so no_warn root_only fail_safe auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass auth_as_self #auth required pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/telnetd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.4 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.5 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "telnetd" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/xdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.5 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.6 2003/02/16 13:02:03 des Exp $ # # PAM configuration for the "xdm" service # @@ -19,5 +19,5 @@ # session #session required pam_kerberosIV.so #session required pam_krb5.so -#session required pam_ssh.so +#session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/mips/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.5 2003/02/16 20:46:08 mtm Exp $ # # PROVIDE: ipsec @@ -15,8 +15,6 @@ name="ipsec" rcvar=`set_rcvar` -# This will be overiden from rc.conf on FreeBSD. -ipsec_file="/etc/ipsec.conf" start_precmd="ipsec_prestart" start_cmd="ipsec_start" stop_precmd="test -f /etc/ipsec.conf" @@ -27,9 +25,11 @@ case ${OSTYPE} in FreeBSD) ipsec_program="/usr/sbin/setkey" + # ipsec_file is set by rc.conf ;; NetBSD) ipsec_program="/sbin/setkey" + ipsec_file="/etc/ipsec.conf" ;; esac ==== //depot/projects/mips/games/fortune/Notes#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Notes 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/Notes,v 1.2 2002/12/30 21:18:01 schweikh Exp $ +# $FreeBSD: src/games/fortune/Notes,v 1.3 2003/02/16 18:38:12 schweikh Exp $ Warning: The fortunes contained in the fortune database have been collected @@ -18,7 +18,7 @@ By default, fortune retrieves its fortune files from the directory /usr/share/games/fortune. A fortune file has two parts: the source file (which contains the fortunes themselves) and the data file which describes -the fortunes. The data fil always has the same name as the fortune file +the fortunes. The data file always has the same name as the fortune file with the string ".dat" concatenated, i.e. "fort" is the standard fortune database, and "fort.dat" is the data file which describes it. See strfile(8) for more information on creating the data files. ==== //depot/projects/mips/games/fortune/datfiles/fortunes#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.104 2003/02/11 21:38:02 wes Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.105 2003/02/16 18:38:12 schweikh Exp $ % -- Gifts for Children -- @@ -8958,7 +8958,7 @@ Now ... try to get something DONE! % Ken Thompson has an automobile which he helped design. Unlike most -automobiles, it has neither speedometer, nor gas gage, nor any of the +automobiles, it has neither speedometer, nor gas gauge, nor any of the numerous idiot lights which plague the modern driver. Rather, if the driver makes any mistake, a giant "?" lights up in the center of the dashboard. "The experienced driver", he says, "will usually know ==== //depot/projects/mips/lib/compat/compat4x.alpha/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.14 2003/02/15 16:26:09 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.15 2003/02/17 13:45:12 nectar Exp $ DISTRIBUTION= compat4x @@ -9,6 +9,7 @@ libcrypto.so.2 \ libedit.so.3 \ libfetch.so.2 \ + libgmp.so.3 \ libpam.so.1 \ libperl.so.3 \ libssl.so.1 \ ==== //depot/projects/mips/lib/compat/compat4x.i386/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.20 2003/02/15 16:26:10 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.21 2003/02/17 13:45:13 nectar Exp $ DISTRIBUTION= compat4x @@ -7,6 +7,7 @@ libc_r.so.4 \ libcrypto.so.1 \ libcrypto.so.2 \ + libgmp.so.3 \ libedit.so.3 \ libfetch.so.2 \ libpam.so.1 \ ==== //depot/projects/mips/lib/libc/db/btree/bt_put.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.2 2002/03/21 22:46:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.3 2003/02/16 17:29:09 nectar Exp $"); #include <sys/types.h> @@ -225,7 +225,7 @@ t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index >= index) ++t->bt_cursor.pg.index; - if (t->bt_order == NOT) + if (t->bt_order == NOT) { if (h->nextpg == P_INVALID) { if (index == NEXTINDEX(h) - 1) { t->bt_order = FORWARD; @@ -239,6 +239,7 @@ t->bt_last.pgno = h->pgno; } } + } mpool_put(t->bt_mp, h, MPOOL_DIRTY); ==== //depot/projects/mips/lib/libc/db/btree/bt_split.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.4 2002/03/23 18:22:40 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include <sys/types.h> @@ -672,8 +672,8 @@ * where we decide to try and copy too much onto the left page. * Make sure that doesn't happen. */ - if (skip <= off && - used + nbytes + sizeof(indx_t) >= full || nxt == top - 1) { + if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) + || nxt == top - 1) { --off; break; } ==== //depot/projects/mips/lib/libc/db/hash/hash_bigkey.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.4 2002/03/21 22:46:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); /* * PACKAGE: hash @@ -123,7 +123,7 @@ if (!bufp) return (-1); n = p[0]; - if (!key_size) + if (!key_size) { if (FREESPACE(p)) { move_bytes = MIN(FREESPACE(p), val_size); off = OFFSET(p) - move_bytes; @@ -136,6 +136,7 @@ OFFSET(p) = off; } else p[n - 2] = FULL_KEY; + } p = (u_int16_t *)bufp->page; cp = bufp->page; bufp->flags |= BUF_MOD; ==== //depot/projects/mips/lib/libc/db/hash/hash_func.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.4 2002/03/22 09:18:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include <sys/types.h> @@ -47,9 +47,9 @@ #include "page.h" #include "extern.h" -static u_int32_t hash1(const void *, size_t); -static u_int32_t hash2(const void *, size_t); -static u_int32_t hash3(const void *, size_t); +static u_int32_t hash1(const void *, size_t) __unused; +static u_int32_t hash2(const void *, size_t) __unused; +static u_int32_t hash3(const void *, size_t) __unused; static u_int32_t hash4(const void *, size_t); /* Global default hash function */ ==== //depot/projects/mips/lib/libc/db/recno/rec_close.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.6 2002/03/22 21:52:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.7 2003/02/16 17:29:09 nectar Exp $"); #include "namespace.h" #include <sys/types.h> @@ -83,13 +83,14 @@ if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize)) status = RET_ERROR; - if (!F_ISSET(t, R_INMEM)) + if (!F_ISSET(t, R_INMEM)) { if (F_ISSET(t, R_CLOSEFP)) { if (fclose(t->bt_rfp)) status = RET_ERROR; } else if (_close(t->bt_rfd)) status = RET_ERROR; + } if (__bt_close(dbp) == RET_ERROR) status = RET_ERROR; ==== //depot/projects/mips/lib/libc/db/recno/rec_seq.c#2 (text+ko) ==== @@ -31,11 +31,12 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> #ifndef lint -static char sccsid[] = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; +/* XXX use __SCCSID */ +static char sccsid[] __unused = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; #endif /* not lint */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.4 2002/03/22 21:52:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include <sys/types.h> ==== //depot/projects/mips/lib/libc/gen/getgrouplist.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.12 2002/09/08 04:43:28 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.13 2003/02/16 17:29:09 nectar Exp $"); /* * get credential @@ -69,7 +69,7 @@ * Scan the group file to find additional groups. */ setgrent(); - while (grp = getgrent()) { + while ((grp = getgrent()) != NULL) { for (i = 0; i < ngroups; i++) { if (grp->gr_gid == groups[i]) goto skip; ==== //depot/projects/mips/lib/libc/gen/getpwent.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* LIBC_SCCS and not lint */ /* $NetBSD: getpwent.c,v 1.40.2.2 1999/04/27 22:09:45 perry Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.67 2002/05/07 23:26:00 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.68 2003/02/16 17:29:09 nectar Exp $"); #include "un-namespace.h" #include <sys/param.h> @@ -52,6 +52,7 @@ #include <string.h> #include <limits.h> #include <nsswitch.h> +#include <netdb.h> #ifdef HESIOD #include <hesiod.h> #endif @@ -64,10 +65,6 @@ #endif #include "un-namespace.h" -extern void setnetgrent(char *); -extern int getnetgrent(char **, char **, char **); -extern int innetgr(const char *, const char *, const char *, const char *); - #include "pw_scan.h" #if defined(YP) || defined(HESIOD) ==== //depot/projects/mips/lib/libc/gen/semctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.8 2002/08/11 19:31:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.9 2003/02/16 17:29:09 nectar Exp $"); #include <sys/types.h> #include <sys/ipc.h> @@ -35,6 +35,8 @@ #include <stdarg.h> #include <stdlib.h> +extern int __semctl(int semid, int semnum, int cmd, union semun *arg); + int semctl(int semid, int semnum, int cmd, ...) { va_list ap; ==== //depot/projects/mips/lib/libc/gen/sysctl.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.4 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include <sys/param.h> #include <sys/sysctl.h> @@ -47,6 +47,9 @@ #include <unistd.h> #include <string.h> +extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, + void *newp, size_t newlen); + int sysctl(name, namelen, oldp, oldlenp, newp, newlen) int *name; ==== //depot/projects/mips/lib/libc/gen/unvis.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.7 2003/01/10 02:46:32 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.8 2003/02/16 17:29:09 nectar Exp $"); #include <sys/types.h> #include <ctype.h> @@ -56,7 +56,7 @@ #define S_HTTP 0x080 /* %HEXHEX escape */ #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') -#define ishex(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '9' || ((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f') +#define ishex(c) ((((u_char)(c)) >= '0' && ((u_char)(c)) <= '9') || (((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f')) /* * unvis - decode characters previously encoded by vis ==== //depot/projects/mips/lib/libc/i386/gen/getcontext.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/getcontext.S,v 1.3 2002/09/16 19:24:31 mini Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/getcontext.S,v 1.4 2003/02/17 07:47:13 mini Exp $"); /* * Where do we define these? @@ -61,7 +61,7 @@ pushl $0 /* oset = NULL */ pushl %eax /* set = &ucp->uc_sigmask */ pushl $3 /* how = SIG_SETMASK */ - call PIC_PLT(CNAME(_sigprocmask)) + call PIC_PLT(CNAME(sigprocmask)) addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ ==== //depot/projects/mips/lib/libc/i386/gen/signalcontext.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302180005.h1I05B6Q038990>