Date: Mon, 11 Jun 2007 04:10:21 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 121382 for review Message-ID: <200706110410.l5B4ALdV065736@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121382 Change 121382 by rwatson@rwatson_zoo on 2007/06/11 04:09:59 Integrate TrustedBSD base from FreeBSD CVS: - pam_nologin uses accounting not authentication PAM hooks - 802.11 infrastructure improvments Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#83 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/ftpd#8 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/gdm#7 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/imap#5 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/kde#6 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/login#12 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/other#9 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/pop3#5 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/rsh#5 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/sshd#11 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/telnetd#6 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/xdm#9 integrate .. //depot/projects/trustedbsd/base/include/histedit.h#5 integrate .. //depot/projects/trustedbsd/base/include/paths.h#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/regcomp.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/regerror.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/regexec.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/regfree.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libedit/editline.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libedit/el.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libedit/el.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libedit/term.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libedit/term.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_nologin/pam_nologin.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#31 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#33 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/kdb.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/README.quirks#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#56 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#89 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#118 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#40 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#73 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#62 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#51 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sun4v#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awivar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ess.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/mss.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb16.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb8.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/als4000.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/aureal.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cs4281.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/csapcm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ds1.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx-pcm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/fm801.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro3.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/neomagic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/solo.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/t4dwave.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/vibes.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio_pcm.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axereg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdce.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdcereg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rumreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_uralvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umct.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#61 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_status.c#22 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_packet.c#4 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#56 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/kdb.h#4 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#68 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/cpufunc.h#15 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/kdb.h#5 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/vmparam.h#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#66 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#55 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#73 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#68 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#69 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#89 integrate .. //depot/projects/trustedbsd/base/sys/modules/bge/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/mii/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/modules/wlan_scan_ap/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/wlan_scan_sta/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_media.h#22 integrate .. //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.h#13 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_acl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto_none.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto_tkip.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ht.c#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ht.h#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#27 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.h#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#23 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#18 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_power.c#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_power.h#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.h#14 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_radiotap.h#8 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_regdomain.c#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_regdomain.h#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan.c#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan.h#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan_ap.c#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan_sta.c#1 branch .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#77 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#31 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#46 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/cpu.h#15 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/md_var.h#8 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_interface.c#6 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/syncicache.c#6 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/uio_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/DEFAULTS#5 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/kdb.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/conf/DEFAULTS#5 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/kdb.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#68 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#86 integrate .. //depot/projects/trustedbsd/base/sys/sys/resourcevar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#49 integrate .. //depot/projects/trustedbsd/base/sys/sys/vmmeter.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#40 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#69 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#75 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#46 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#25 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_phys.c#1 branch .. //depot/projects/trustedbsd/base/sys/vm/vm_phys.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#57 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/main.c#19 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/netstat.1#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/netstat.h#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/sctp.c#1 branch Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#83 (text+ko) ==== @@ -21,6 +21,24 @@ developers choose to disable these features on build machines to maximize performance. +20070610: + The pam_nologin(8) module ceases to provide an authentication + function and starts providing an account management function. + Consequent changes to /etc/pam.d should be brought in using + mergemaster(8). Third-party files in /usr/local/etc/pam.d may + need manual editing as follows. Locate this line (or similar): + + auth required pam_nologin.so no_warn + + and change it according to this example: + + account required pam_nologin.so no_warn + + That is, the first word needs to be changed from "auth" to + "account". The new line can be moved to the account section + within the file for clarity. Not updating pam.conf(5) files + will result in nologin(5) ignored by the respective services. + 20070529: The ether_ioctl() function has been synchronized with ioctl(2) and ifnet.if_ioctl. Due to that, the size of one of its arguments @@ -801,4 +819,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ +$FreeBSD: src/UPDATING,v 1.493 2007/06/10 18:57:18 yar Exp $ ==== //depot/projects/trustedbsd/base/etc/pam.d/ftpd#8 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "ftpd" service # # 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 allow_local #auth sufficient pam_krb5.so no_warn @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/etc/pam.d/gdm#7 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "gdm" service # # auth -auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/etc/pam.d/imap#5 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/imap,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/imap,v 1.6 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "imap" service # # auth -#auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass + +# account +#account required pam_nologin.so ==== //depot/projects/trustedbsd/base/etc/pam.d/kde#6 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "kde" service # # auth -auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/etc/pam.d/login#12 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.16 2003/06/14 12:35:05 des Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.17 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "login" service # # auth -auth required pam_nologin.so no_warn auth sufficient pam_self.so no_warn auth include system # account account requisite pam_securetty.so +account required pam_nologin.so account include system # session ==== //depot/projects/trustedbsd/base/etc/pam.d/other#9 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "other" service # # 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 allow_local #auth sufficient pam_krb5.so no_warn try_first_pass @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_login_access.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/etc/pam.d/pop3#5 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/pop3,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/pop3,v 1.6 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "pop3" service # # auth -#auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass + +# account +#account required pam_nologin.so ==== //depot/projects/trustedbsd/base/etc/pam.d/rsh#5 (text+ko) ==== @@ -1,14 +1,14 @@ # -# $FreeBSD: src/etc/pam.d/rsh,v 1.5 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/rsh,v 1.6 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "rsh" service # # auth -auth required pam_nologin.so no_warn auth required pam_rhosts.so no_warn # account +account required pam_nologin.so account required pam_unix.so # session ==== //depot/projects/trustedbsd/base/etc/pam.d/sshd#11 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "sshd" service # # 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 allow_local #auth sufficient pam_krb5.so no_warn try_first_pass @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_login_access.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/etc/pam.d/telnetd#6 (text+ko) ==== @@ -1,11 +1,10 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "telnetd" service # # 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 allow_local #auth sufficient pam_krb5.so no_warn try_first_pass @@ -13,6 +12,7 @@ auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_login_access.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/etc/pam.d/xdm#9 (text+ko) ==== @@ -1,16 +1,16 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $ # # PAM configuration for the "xdm" service # # auth -auth required pam_nologin.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass auth required pam_unix.so no_warn try_first_pass # account +account required pam_nologin.so #account required pam_krb5.so account required pam_unix.so ==== //depot/projects/trustedbsd/base/include/histedit.h#5 (text+ko) ==== @@ -30,8 +30,8 @@ * SUCH DAMAGE. * * @(#)histedit.h 8.2 (Berkeley) 1/3/94 - * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $ - * $FreeBSD: src/include/histedit.h,v 1.10 2005/08/07 20:51:52 stefanf Exp $ + * $NetBSD: histedit.h,v 1.31 2006/12/15 22:13:33 christos Exp $ + * $FreeBSD: src/include/histedit.h,v 1.11 2007/06/10 19:06:09 stefanf Exp $ */ /* @@ -104,7 +104,7 @@ * Low level editline access functions */ int el_set(EditLine *, int, ...); -int el_get(EditLine *, int, void *); +int el_get(EditLine *, int, ...); #if 0 unsigned char _el_fn_complete(EditLine *, int); #endif @@ -130,6 +130,9 @@ #define EL_CLIENTDATA 14 /* , void *); */ #define EL_UNBUFFERED 15 /* , int); */ #define EL_PREP_TERM 16 /* , int); */ +#define EL_GETTC 17 /* , const char *, ..., NULL); */ +#define EL_GETFP 18 /* , int, FILE **) */ +#define EL_SETFP 19 /* , int, FILE *) */ #define EL_BUILTIN_GETCFN (NULL) ==== //depot/projects/trustedbsd/base/include/paths.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.25 2004/01/04 17:17:46 iedowse Exp $ + * $FreeBSD: src/include/paths.h,v 1.26 2007/06/11 02:21:18 simokawa Exp $ */ #ifndef _PATHS_H_ @@ -61,6 +61,7 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_FWMEM "/dev/fwmem" #define _PATH_HALT "/sbin/halt" #define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" ==== //depot/projects/trustedbsd/base/lib/libc/powerpc/gen/syncicache.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.2 2004/01/21 05:04:25 grehan Exp $"; + "$FreeBSD: src/lib/libc/powerpc/gen/syncicache.c,v 1.4 2007/06/10 16:32:08 marcel Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -45,6 +45,7 @@ #include <sys/sysctl.h> #include <machine/cpu.h> +#include <machine/md_var.h> #if defined(_KERNEL) || defined(_STANDALONE) #ifndef CACHELINESIZE ==== //depot/projects/trustedbsd/base/lib/libc/regex/regcomp.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.35 2007/01/09 00:28:04 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.36 2007/06/11 03:05:54 delphij Exp $"); #include <sys/types.h> #include <stdio.h> @@ -178,10 +178,9 @@ = #define REG_DUMP 0200 */ int /* 0 success, otherwise REG_something */ -regcomp(preg, pattern, cflags) -regex_t * __restrict preg; -const char * __restrict pattern; -int cflags; +regcomp(regex_t * __restrict preg, + const char * __restrict pattern, + int cflags) { struct parse pa; struct re_guts *g; @@ -289,9 +288,8 @@ == static void p_ere(struct parse *p, int stop); */ static void -p_ere(p, stop) -struct parse *p; -int stop; /* character this ERE should end at */ +p_ere(struct parse *p, + int stop) /* character this ERE should end at */ { char c; sopno prevback; @@ -335,8 +333,7 @@ == static void p_ere_exp(struct parse *p); */ static void -p_ere_exp(p) -struct parse *p; +p_ere_exp(struct parse *p) { char c; wint_t wc; @@ -487,8 +484,7 @@ == static void p_str(struct parse *p); */ static void -p_str(p) -struct parse *p; +p_str(struct parse *p) { (void)REQUIRE(MORE(), REG_EMPTY); while (MORE()) @@ -506,10 +502,9 @@ * The amount of lookahead needed to avoid this kludge is excessive. */ static void -p_bre(p, end1, end2) -struct parse *p; -int end1; /* first terminating character */ -int end2; /* second terminating character */ +p_bre(struct parse *p, + int end1, /* first terminating character */ + int end2) /* second terminating character */ { sopno start = HERE(); int first = 1; /* first subexpression? */ @@ -539,9 +534,8 @@ == static int p_simp_re(struct parse *p, int starordinary); */ static int /* was the simple RE an unbackslashed $? */ -p_simp_re(p, starordinary) -struct parse *p; -int starordinary; /* is a leading * an ordinary character? */ +p_simp_re(struct parse *p, + int starordinary) /* is a leading * an ordinary character? */ { int c; int count; @@ -660,8 +654,7 @@ == static int p_count(struct parse *p); */ static int /* the value */ -p_count(p) -struct parse *p; +p_count(struct parse *p) { int count = 0; int ndigits = 0; @@ -680,8 +673,7 @@ == static void p_bracket(struct parse *p); */ static void -p_bracket(p) -struct parse *p; +p_bracket(struct parse *p) { cset *cs; wint_t ch; @@ -733,9 +725,7 @@ == static void p_b_term(struct parse *p, cset *cs); */ static void -p_b_term(p, cs) -struct parse *p; -cset *cs; +p_b_term(struct parse *p, cset *cs) { char c; wint_t start, finish; @@ -810,9 +800,7 @@ == static void p_b_cclass(struct parse *p, cset *cs); */ static void -p_b_cclass(p, cs) -struct parse *p; -cset *cs; +p_b_cclass(struct parse *p, cset *cs) { char *sp = p->next; size_t len; @@ -842,9 +830,7 @@ * This implementation is incomplete. xxx */ static void -p_b_eclass(p, cs) -struct parse *p; -cset *cs; +p_b_eclass(struct parse *p, cset *cs) { wint_t c; @@ -857,8 +843,7 @@ == static char p_b_symbol(struct parse *p); */ static wint_t /* value of symbol */ -p_b_symbol(p) -struct parse *p; +p_b_symbol(struct parse *p) { wint_t value; @@ -877,9 +862,8 @@ == static char p_b_coll_elem(struct parse *p, int endc); */ static wint_t /* value of collating element */ -p_b_coll_elem(p, endc) -struct parse *p; -wint_t endc; /* name ended by endc,']' */ +p_b_coll_elem(struct parse *p, + wint_t endc) /* name ended by endc,']' */ { char *sp = p->next; struct cname *cp; @@ -913,8 +897,7 @@ == static char othercase(int ch); */ static wint_t /* if no counterpart, return ch */ -othercase(ch) -wint_t ch; +othercase(wint_t ch) { assert(iswalpha(ch)); if (iswupper(ch)) @@ -932,9 +915,7 @@ * Boy, is this implementation ever a kludge... */ static void -bothcases(p, ch) -struct parse *p; -wint_t ch; +bothcases(struct parse *p, wint_t ch) { char *oldnext = p->next; char *oldend = p->end; @@ -961,9 +942,7 @@ == static void ordinary(struct parse *p, int ch); */ static void -ordinary(p, ch) -struct parse *p; -wint_t ch; +ordinary(struct parse *p, wint_t ch) { cset *cs; @@ -990,8 +969,7 @@ * Boy, is this implementation ever a kludge... */ static void -nonnewline(p) -struct parse *p; +nonnewline(struct parse *p) { char *oldnext = p->next; char *oldend = p->end; @@ -1014,11 +992,10 @@ == static void repeat(struct parse *p, sopno start, int from, int to); */ static void -repeat(p, start, from, to) -struct parse *p; -sopno start; /* operand from here to end of strip */ -int from; /* repeated from this number */ -int to; /* to this number of times (maybe INFINITY) */ +repeat(struct parse *p, + sopno start, /* operand from here to end of strip */ + int from, /* repeated from this number */ + int to) /* to this number of times (maybe INFINITY) */ { sopno finish = HERE(); # define N 2 @@ -1087,8 +1064,7 @@ - character can't be converted. Returns the number of bytes consumed. */ static wint_t -wgetnext(p) -struct parse *p; +wgetnext(struct parse *p) { mbstate_t mbs; wchar_t wc; @@ -1111,9 +1087,7 @@ == static int seterr(struct parse *p, int e); */ static int /* useless but makes type checking happy */ -seterr(p, e) -struct parse *p; -int e; +seterr(struct parse *p, int e) { if (p->error == 0) /* keep earliest error condition */ p->error = e; @@ -1127,8 +1101,7 @@ == static cset *allocset(struct parse *p); */ static cset * -allocset(p) -struct parse *p; +allocset(struct parse *p) { cset *cs, *ncs; @@ -1149,9 +1122,7 @@ == static void freeset(struct parse *p, cset *cs); */ static void -freeset(p, cs) -struct parse *p; -cset *cs; +freeset(struct parse *p, cset *cs) { cset *top = &p->g->sets[p->g->ncsets]; @@ -1168,8 +1139,7 @@ - returning it if so, otherwise returning OUT. */ static wint_t -singleton(cs) -cset *cs; +singleton(cset *cs) { wint_t i, s, n; @@ -1191,10 +1161,7 @@ - CHadd - add character to character set. */ static void -CHadd(p, cs, ch) -struct parse *p; -cset *cs; -wint_t ch; +CHadd(struct parse *p, cset *cs, wint_t ch) { wint_t nch, *newwides; assert(ch >= 0); @@ -1222,10 +1189,7 @@ - CHaddrange - add all characters in the range [min,max] to a character set. */ static void -CHaddrange(p, cs, min, max) -struct parse *p; -cset *cs; -wint_t min, max; +CHaddrange(struct parse *p, cset *cs, wint_t min, wint_t max) { crange *newranges; @@ -1249,10 +1213,7 @@ - CHaddtype - add all characters of a certain type to a character set. */ static void -CHaddtype(p, cs, wct) -struct parse *p; -cset *cs; -wctype_t wct; +CHaddtype(struct parse *p, cset *cs, wctype_t wct) { wint_t i; wctype_t *newtypes; @@ -1275,10 +1236,9 @@ == static sopno dupl(struct parse *p, sopno start, sopno finish); */ static sopno /* start of duplicate */ -dupl(p, start, finish) -struct parse *p; -sopno start; /* from here */ -sopno finish; /* to this less one */ +dupl(struct parse *p, + sopno start, /* from here */ + sopno finish) /* to this less one */ { sopno ret = HERE(); sopno len = finish - start; @@ -1303,10 +1263,7 @@ * some changes to the data structures. Maybe later. */ static void -doemit(p, op, opnd) -struct parse *p; -sop op; -size_t opnd; +doemit(struct parse *p, sop op, size_t opnd) { /* avoid making error situations worse */ if (p->error != 0) @@ -1329,11 +1286,7 @@ == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos); */ static void -doinsert(p, op, opnd, pos) -struct parse *p; -sop op; -size_t opnd; -sopno pos; +doinsert(struct parse *p, sop op, size_t opnd, sopno pos) { sopno sn; sop s; @@ -1369,10 +1322,7 @@ == static void dofwd(struct parse *p, sopno pos, sop value); */ static void -dofwd(p, pos, value) -struct parse *p; -sopno pos; -sop value; +dofwd(struct parse *p, sopno pos, sop value) { /* avoid making error situations worse */ if (p->error != 0) @@ -1387,9 +1337,7 @@ == static void enlarge(struct parse *p, sopno size); */ static void -enlarge(p, size) -struct parse *p; -sopno size; +enlarge(struct parse *p, sopno size) { sop *sp; @@ -1410,9 +1358,7 @@ == static void stripsnug(struct parse *p, struct re_guts *g); */ static void -stripsnug(p, g) -struct parse *p; -struct re_guts *g; +stripsnug(struct parse *p, struct re_guts *g) { g->nstates = p->slen; g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop)); @@ -1433,9 +1379,7 @@ * Note that must and mlen got initialized during setup. */ static void -findmust(p, g) -struct parse *p; -struct re_guts *g; +findmust(struct parse *p, struct re_guts *g) { sop *scan; sop *start; @@ -1609,9 +1553,7 @@ * re paths. */ static int -altoffset(scan, offset) -sop *scan; -int offset; +altoffset(sop *scan, int offset) { int largest; int try; @@ -1686,9 +1628,7 @@ * the value of the character from the text that was mismatched. */ static void -computejumps(p, g) -struct parse *p; -struct re_guts *g; +computejumps(struct parse *p, struct re_guts *g) { int ch; int mindex; @@ -1732,9 +1672,7 @@ * the search algorithm works. */ static void -computematchjumps(p, g) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706110410.l5B4ALdV065736>