Date: Sat, 31 May 2003 15:16:18 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32233 for review Message-ID: <200305312216.h4VMGIs8044794@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32233 Change 32233 by marcel@marcel_nfs on 2003/05/31 15:15:37 IFC @32228 (contains libpam snafu that's breaking builds) Affected files ... .. //depot/projects/ia64/Makefile.inc1#64 integrate .. //depot/projects/ia64/bin/sh/expand.c#10 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#28 integrate .. //depot/projects/ia64/lib/Makefile#26 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#12 integrate .. //depot/projects/ia64/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_close.c#3 integrate .. //depot/projects/ia64/lib/libpam/libpam/security/pam_mod_misc.h#5 integrate .. //depot/projects/ia64/lib/libpam/modules/modules.inc#17 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_guest/Makefile#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_guest/pam_guest.8#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_guest/pam_guest.c#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#12 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opie/pam_opie.c#8 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#8 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_tacplus/pam_tacplus.c#7 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#15 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#6 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/map_object.c#6 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.1#9 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#16 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#7 integrate .. //depot/projects/ia64/share/man/man8/MAKEDEV.8#2 integrate .. //depot/projects/ia64/share/man/man9/Makefile#24 integrate .. //depot/projects/ia64/share/man/man9/VFS_CHECKEXP.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_FHTOVP.9#3 integrate .. //depot/projects/ia64/share/man/man9/VFS_MOUNT.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/ia64/share/man/man9/VFS_START.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_STATFS.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_SYNC.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_UNMOUNT.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_VGET.9#5 integrate .. //depot/projects/ia64/share/man/man9/VFS_VPTOFH.9#2 integrate .. //depot/projects/ia64/share/man/man9/VOP_ACCESS.9#8 integrate .. //depot/projects/ia64/share/man/man9/VOP_ACLCHECK.9#6 integrate .. //depot/projects/ia64/share/man/man9/VOP_ADVLOCK.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_BWRITE.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_CREATE.9#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_FSYNC.9#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#7 integrate .. //depot/projects/ia64/share/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/ia64/share/man/man9/VOP_INACTIVE.9#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_IOCTL.9#7 integrate .. //depot/projects/ia64/share/man/man9/VOP_LINK.9#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_LOOKUP.9#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_OPENCLOSE.9#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/ia64/share/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/ia64/share/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_READDIR.9#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_READLINK.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/ia64/share/man/man9/VOP_REMOVE.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_RENAME.9#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_STRATEGY.9#3 integrate .. //depot/projects/ia64/share/man/man9/atomic.9#3 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#1 branch .. //depot/projects/ia64/share/man/man9/devclass.9#2 integrate .. //depot/projects/ia64/share/man/man9/devclass_find.9#2 integrate .. //depot/projects/ia64/share/man/man9/device.9#3 integrate .. //depot/projects/ia64/share/man/man9/kobj.9#3 integrate .. //depot/projects/ia64/share/man/man9/ktr.9#4 integrate .. //depot/projects/ia64/share/man/man9/make_dev.9#3 integrate .. //depot/projects/ia64/share/man/man9/namei.9#5 integrate .. //depot/projects/ia64/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#8 integrate .. //depot/projects/ia64/share/man/man9/vget.9#4 integrate .. //depot/projects/ia64/share/man/man9/vnode.9#10 integrate .. //depot/projects/ia64/share/man/man9/vput.9#2 integrate .. //depot/projects/ia64/share/man/man9/vref.9#3 integrate .. //depot/projects/ia64/share/man/man9/vrele.9#3 integrate .. //depot/projects/ia64/share/man/man9/zone.9#9 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#14 integrate .. //depot/projects/ia64/share/termcap/termcap.src#15 integrate .. //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/locore.S#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/ia64/sys/amd64/ia32/Makefile#2 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_syscalls.c#1 branch .. //depot/projects/ia64/sys/amd64/ia32/syscalls.conf#2 integrate .. //depot/projects/ia64/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/ia64/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#11 integrate .. //depot/projects/ia64/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/ia64/sys/cam/cam.c#3 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#10 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#15 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#13 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.c#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_socket.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_socket.h#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stat.c#7 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#12 integrate .. //depot/projects/ia64/sys/conf/files.amd64#7 integrate .. //depot/projects/ia64/sys/conf/files.i386#37 integrate .. //depot/projects/ia64/sys/conf/files.pc98#31 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#29 integrate .. //depot/projects/ia64/sys/ddb/db_break.c#4 integrate .. //depot/projects/ia64/sys/ddb/db_input.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#8 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#4 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#11 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#9 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#23 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#19 integrate .. //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#9 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#14 integrate .. //depot/projects/ia64/sys/dev/exca/exca.c#6 integrate .. //depot/projects/ia64/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#16 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.c#8 integrate .. //depot/projects/ia64/sys/dev/mcd/mcd.c#6 integrate .. //depot/projects/ia64/sys/dev/md/md.c#29 integrate .. //depot/projects/ia64/sys/dev/mii/bmtphy.c#4 integrate .. //depot/projects/ia64/sys/dev/mii/dcphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/lxtphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/mii_physubr.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/mlphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/nsgphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/pnphy.c#7 integrate .. //depot/projects/ia64/sys/dev/musycc/musycc.c#6 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#26 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#20 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#44 integrate .. //depot/projects/ia64/sys/dev/streams/streams.c#10 integrate .. //depot/projects/ia64/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/usb_port.h#10 integrate .. //depot/projects/ia64/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe.c#9 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#27 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#21 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vfsops.c#9 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#11 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#11 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#14 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#12 integrate .. //depot/projects/ia64/sys/geom/geom.h#31 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#14 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#7 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#35 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#36 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#35 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_mirror.c#7 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#24 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#28 integrate .. //depot/projects/ia64/sys/geom/geom_slice.h#14 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#28 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#6 integrate .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_trig.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#42 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#14 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/i386-gdbstub.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/math_emulate.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#17 integrate .. //depot/projects/ia64/sys/i386/isa/ctx.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/gpib.c#9 integrate .. //depot/projects/ia64/sys/i386/isa/if_cx.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/wt.c#8 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#14 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#9 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#8 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#8 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2fsm.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l3fsm.c#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#75 integrate .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#55 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#25 integrate .. //depot/projects/ia64/sys/ia64/include/_regset.h#6 integrate .. //depot/projects/ia64/sys/isa/fd.c#16 integrate .. //depot/projects/ia64/sys/isa/pnp.c#5 integrate .. //depot/projects/ia64/sys/isa/ppc.c#6 integrate .. //depot/projects/ia64/sys/isa/psm.c#13 integrate .. //depot/projects/ia64/sys/isa/vga_isa.c#6 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_lookup.c#5 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#54 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#25 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#34 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#52 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#22 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#50 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#42 integrate .. //depot/projects/ia64/sys/modules/Makefile#50 integrate .. //depot/projects/ia64/sys/modules/geom/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_apple/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_bde/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_bsd/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_gpt/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_mbr/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_pc98/Makefile#1 branch .. //depot/projects/ia64/sys/modules/geom/geom_sunlabel/Makefile#1 branch .. //depot/projects/ia64/sys/net/if_atmsubr.c#11 integrate .. //depot/projects/ia64/sys/net/if_ef.c#10 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#27 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#41 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#13 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#13 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/ia64/sys/pci/alpm.c#5 integrate .. //depot/projects/ia64/sys/pci/if_de.c#11 integrate .. //depot/projects/ia64/sys/pci/if_devar.h#4 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#16 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#31 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#15 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#15 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#19 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#23 integrate .. //depot/projects/ia64/sys/pci/ncr.c#8 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#17 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#17 integrate .. //depot/projects/ia64/sys/sys/buf.h#21 integrate .. //depot/projects/ia64/sys/sys/chio.h#2 integrate .. //depot/projects/ia64/sys/sys/devicestat.h#5 integrate .. //depot/projects/ia64/sys/sys/uuid.h#7 integrate .. //depot/projects/ia64/sys/sys/vnode.h#30 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#21 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#34 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#25 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#27 integrate .. //depot/projects/ia64/sys/vm/uma_int.h#12 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#28 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#55 integrate .. //depot/projects/ia64/usr.bin/vgrind/vgrind.sh#3 integrate .. //depot/projects/ia64/usr.sbin/diskinfo/diskinfo.8#3 integrate .. //depot/projects/ia64/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/ia64/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/ia64/usr.sbin/setfmac/setfsmac.8#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#11 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#20 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#21 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#64 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.362 2003/05/21 21:47:20 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.363 2003/05/31 21:29:38 obrien Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -640,11 +640,14 @@ _strfile= games/fortune/strfile .endif +.if !defined(NO_CXX) +_gperf= gnu/usr.bin/gperf .if ${BOOTSTRAPPING} < 500113 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac .endif +.endif .if ( ${BOOTSTRAPPING} < 450005 || \ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 )) @@ -670,7 +673,7 @@ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ usr.sbin/config ${_kbdcontrol} \ - gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo + ${_gperf} ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/ia64/bin/sh/expand.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.42 2003/03/15 07:56:59 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.43 2003/05/31 06:27:57 fenner Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -437,6 +437,7 @@ char const *syntax = quoted? DQSYNTAX : BASESYNTAX; int saveherefd; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int nnl; INTOFF; saveifs = ifsfirst; @@ -454,6 +455,8 @@ p = in.buf; lastc = '\0'; + nnl = 0; + /* Don't copy trailing newlines */ for (;;) { if (--in.nleft < 0) { if (in.fd < 0) @@ -469,14 +472,18 @@ if (lastc != '\0') { if (quotes && syntax[(int)lastc] == CCTL) STPUTC(CTLESC, dest); - STPUTC(lastc, dest); + if (lastc == '\n') { + nnl++; + } else { + while (nnl > 0) { + nnl--; + STPUTC('\n', dest); + } + STPUTC(lastc, dest); + } } } - /* Eat all trailing newlines */ - for (p--; lastc == '\n'; lastc = *--p) - STUNPUTC(dest); - if (in.fd >= 0) close(in.fd); if (in.buf) ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#28 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.110 2003/03/15 02:10:53 grog Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.111 2003/05/31 16:27:53 hoek Exp $ % -- Gifts for Children -- @@ -6918,7 +6918,7 @@ I gave up Smoking, Drinking and Sex. It was the most *__________horrifying* 20 minutes of my life! % -'I generally avoid temptation unless I can't resist it." +"I generally avoid temptation unless I can't resist it." -- Mae West % I get up each morning, gather my wits. @@ -9476,7 +9476,7 @@ Magnetism, n.: Something acting upon a magnet. -The two definition immediately foregoing are condensed from the works +The two definitions immediately foregoing are condensed from the works of one thousand eminent scientists, who have illuminated the subject with a great white light, to the inexpressible advancement of human knowledge. @@ -11761,7 +11761,7 @@ do all that I can to protect the environment of this great nation of ours, and put prayer back in the schools, where it belongs. What we need is jobs, not empty promises. I realize I'm risking my political -career be being so outspoken on a sensitive issue such as the MX, but +career by being so outspoken on a sensitive issue such as the MX, but that's just the kind of straight-talking honest person I am, and I can't help it. -- Dave Barry, "On Presidential Politics" @@ -15112,7 +15112,7 @@ "We had it tough ... I had to get up at 9 o'clock at night, half an hour before I went to bed, eat a lump of dry poison, work 29 hours down mill, and when we came home our Dad would kill us, and dance about on -our grave singing Haleleuia ..." +our grave singing Halleluja ..." -- Monty Python % We have met the enemy, and he is us. ==== //depot/projects/ia64/lib/Makefile#26 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.157 2003/05/19 15:51:59 des Exp $ +# $FreeBSD: src/lib/Makefile,v 1.158 2003/05/31 18:43:17 mtm Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,8 +29,8 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - ${_libstand} ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ - libwrap libxpg4 liby libz + ${_libstand} ${_libtelnet} ${_libthr} libufs libugidfw libusbhid \ + ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -66,6 +66,9 @@ .if !defined(NOLIBPTHREAD) _libpthread= libpthread .endif +.if !defined(NOLIBTHR) +_libthr= libthr +.endif .endif .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.6 2003/01/11 07:24:54 marcel Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.7 2003/05/31 19:42:51 marcel Exp $ SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \ ==== //depot/projects/ia64/lib/libc/stdlib/random.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)random.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/random.3,v 1.17 2001/09/07 14:46:36 asmodai Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/random.3,v 1.18 2003/05/31 21:14:41 schweikh Exp $ .\" .Dd June 4, 1993 .Dt RANDOM 3 @@ -100,7 +100,7 @@ .Pp The .Fn srandomdev -routine initialize a state array using +routine initializes a state array using the .Xr random 4 random number device which returns good random numbers, suitable for cryptographic use. ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_close.c#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_r/uthread/uthread_close.c,v 1.13 2002/08/29 23:06:06 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.15 2003/05/31 05:23:20 ru Exp $ */ #include <errno.h> #include <stdlib.h> @@ -49,9 +49,11 @@ struct stat sb; struct fd_table_entry *entry; - if ((fd == _thread_kern_pipe[0]) || (fd == _thread_kern_pipe[1])) { + if ((fd == _thread_kern_pipe[0]) || (fd == _thread_kern_pipe[1]) || + (_thread_fd_table[fd] == NULL)) { /* - * Don't allow silly programs to close the kernel pipe. + * Don't allow silly programs to close the kernel pipe + * and non-active descriptors. */ errno = EBADF; ret = -1; @@ -96,6 +98,10 @@ _thread_fd_table[fd] = NULL; free(entry); + /* Drop stale pthread stdio descriptor flags. */ + if (fd < 3) + _pthread_stdio_flags[fd] = -1; + /* Close the file descriptor: */ ret = __sys_close(fd); } ==== //depot/projects/ia64/lib/libpam/libpam/security/pam_mod_misc.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.11 2003/05/01 15:08:55 des Exp $ + * $FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.12 2003/05/31 16:56:35 des Exp $ */ #ifndef PAM_MOD_MISC_H @@ -31,33 +31,15 @@ #include <sys/cdefs.h> -/* Standard options +/* + * Common option names */ -enum opt { PAM_OPT_DEBUG, PAM_OPT_NO_WARN, PAM_OPT_ECHO_PASS, - PAM_OPT_USE_FIRST_PASS, PAM_OPT_TRY_FIRST_PASS, PAM_OPT_USE_MAPPED_PASS, - PAM_OPT_TRY_MAPPED_PASS, PAM_OPT_EXPOSE_ACCOUNT, - PAM_OPT_STD_MAX /* XXX */ }; - -#define PAM_MAX_OPTIONS 32 - -struct opttab { - const char *name; - int value; -}; - -struct options { - struct { - const char *name; - int bool; - char *arg; - } opt[PAM_MAX_OPTIONS]; -}; +#define PAM_OPT_NULLOK "nullok" +#define PAM_OPT_AUTH_AS_SELF "auth_as_self" +#define PAM_OPT_ECHO_PASS "echo_pass" +#define PAM_OPT_DEBUG "debug" __BEGIN_DECLS -void pam_std_option(struct options *, struct opttab *, int, const char **); -int pam_test_option(struct options *, enum opt, char **); -void pam_set_option(struct options *, enum opt); -void pam_clear_option(struct options *, enum opt); void _pam_verbose_error(pam_handle_t *, int, const char *, const char *, const char *, ...); __END_DECLS ==== //depot/projects/ia64/lib/libpam/modules/modules.inc#17 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.17 2003/05/19 15:51:59 des Exp $ +# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.18 2003/05/31 16:52:57 des Exp $ MODULES = MODULES += pam_chroot MODULES += pam_deny MODULES += pam_echo MODULES += pam_exec -MODULES += pam_ftp MODULES += pam_ftpusers MODULES += pam_group +MODULES += pam_guest .if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) MODULES += pam_krb5 MODULES += pam_ksu ==== //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#12 (text+ko) ==== @@ -6,7 +6,7 @@ * Copyright (c) Nicolas Williams, 2001. All rights reserved. * Copyright (c) Perot Systems Corporation, 2001. All rights reserved. * Copyright (c) Mark R V Murray, 2001. All rights reserved. - * Copyright (c) Networks Associates Technology, Inc., 2002. + * Copyright (c) Networks Associates Technology, Inc., 2002-2003. * All rights reserved. * * Portions of this software were developed for the FreeBSD Project by @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.16 2003/03/08 10:30:49 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.18 2003/05/31 17:19:03 des Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -71,6 +71,7 @@ #include <security/pam_appl.h> #include <security/pam_modules.h> #include <security/pam_mod_misc.h> +#include <security/openpam.h> #define COMPAT_HEIMDAL /* #define COMPAT_MIT */ @@ -84,29 +85,17 @@ #define PASSWORD_PROMPT "Password:" #define NEW_PASSWORD_PROMPT "New Password:" -enum { - PAM_OPT_AUTH_AS_SELF = PAM_OPT_STD_MAX, - PAM_OPT_CCACHE, - PAM_OPT_FORWARDABLE, - PAM_OPT_NO_CCACHE, - PAM_OPT_REUSE_CCACHE -}; +#define PAM_OPT_CCACHE "ccache" +#define PAM_OPT_FORWARDABLE "forwardable" +#define PAM_OPT_NO_CCACHE "no_ccache" +#define PAM_OPT_REUSE_CCACHE "reuse_ccache" -static struct opttab other_options[] = { - { "auth_as_self", PAM_OPT_AUTH_AS_SELF }, - { "ccache", PAM_OPT_CCACHE }, - { "forwardable", PAM_OPT_FORWARDABLE }, - { "no_ccache", PAM_OPT_NO_CCACHE }, - { "reuse_ccache", PAM_OPT_REUSE_CCACHE }, - { NULL, 0 } -}; - /* * authentication management */ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; krb5_context pam_context; @@ -114,16 +103,11 @@ krb5_principal princ; krb5_ccache ccache; krb5_get_init_creds_opt opts; - struct options options; struct passwd *pwd; int retval; const char *sourceuser, *user, *pass, *service; char *principal, *princ_name, *ccache_name, luser[32], *srvdup; - pam_std_option(&options, other_options, argc, argv); - - PAM_LOG("Options processed"); - retval = pam_get_user(pamh, &user, USER_PROMPT); if (retval != PAM_SUCCESS) return (retval); @@ -153,7 +137,7 @@ krb5_get_init_creds_opt_init(&opts); - if (pam_test_option(&options, PAM_OPT_FORWARDABLE, NULL)) + if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE)) krb5_get_init_creds_opt_set_forwardable(&opts, 1); PAM_LOG("Credentials initialised"); @@ -168,7 +152,7 @@ PAM_LOG("Done krb5_cc_register()"); /* Get principal name */ - if (pam_test_option(&options, PAM_OPT_AUTH_AS_SELF, NULL)) + if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) asprintf(&principal, "%s/%s", sourceuser, user); else principal = strdup(user); @@ -288,7 +272,7 @@ goto cleanup; } krbret = verify_krb_v5_tgt(pam_context, ccache, srvdup, - pam_test_option(&options, PAM_OPT_FORWARDABLE, NULL)); + openpam_get_option(pamh, PAM_OPT_FORWARDABLE) ? 1 : 0); free(srvdup); if (krbret == -1) { PAM_VERBOSE_ERROR("Kerberos 5 error"); @@ -348,7 +332,7 @@ PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { #if 1 return (PAM_SUCCESS); @@ -360,19 +344,14 @@ krb5_creds creds; krb5_ccache ccache_temp, ccache_perm; krb5_cc_cursor cursor; - struct options options; struct passwd *pwd = NULL; int retval; - char *user; - char *cache_name, *cache_env_name, *p, *q; + const char *cache_name, *q, *user; + char *cache_name_buf = NULL, *p; uid_t euid; gid_t egid; - pam_std_option(&options, other_options, argc, argv); - - PAM_LOG("Options processed"); - if (flags & PAM_DELETE_CRED) return (PAM_SUCCESS); @@ -443,10 +422,11 @@ PAM_LOG("Done setegid() & seteuid()"); /* Get the cache name */ - cache_name = NULL; - pam_test_option(&options, PAM_OPT_CCACHE, &cache_name); - if (cache_name == NULL) - asprintf(&cache_name, "FILE:/tmp/krb5cc_%d", pwd->pw_uid); + cache_name = openpam_get_option(pamh, PAM_OPT_CCACHE); + if (cache_name == NULL) { + asprintf(&cache_name_buf, "FILE:/tmp/krb5cc_%d", pwd->pw_uid); + cache_name = cache_name_buf; + } p = calloc(PATH_MAX + 16, sizeof(char)); q = cache_name; @@ -562,17 +542,9 @@ PAM_LOG("Cache closed"); - cache_env_name = malloc(strlen(cache_name) + 12); - if (!cache_env_name) { - PAM_LOG("Error malloc(): failure"); - krb5_cc_destroy(pam_context, ccache_perm); - retval = PAM_BUF_ERR; - goto cleanup2; - } - - sprintf(cache_env_name, "KRB5CCNAME=%s", cache_name); - if ((retval = pam_putenv(pamh, cache_env_name)) != 0) { - PAM_LOG("Error pam_putenv(): %s", pam_strerror(pamh, retval)); + retval = pam_setenv(pamh, "KRB5CCNAME", cache_name, 1); + if (retval != PAM_SUCCESS) { + PAM_LOG("Error pam_setenv(): %s", pam_strerror(pamh, retval)); krb5_cc_destroy(pam_context, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; @@ -592,6 +564,9 @@ PAM_LOG("Done seteuid() & setegid()"); + if (cache_name_buf != NULL) + free(cache_name_buf); + return (retval); #endif } @@ -601,20 +576,15 @@ */ PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; krb5_context pam_context; krb5_ccache ccache; krb5_principal princ; - struct options options; int retval; const char *user, *ccache_name; - pam_std_option(&options, other_options, argc, argv); - - PAM_LOG("Options processed"); - retval = pam_get_item(pamh, PAM_USER, (const void **)&user); if (retval != PAM_SUCCESS) return (retval); @@ -677,7 +647,7 @@ */ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; krb5_context pam_context; @@ -685,15 +655,10 @@ krb5_principal princ; krb5_get_init_creds_opt opts; krb5_data result_code_string, result_string; - struct options options; int result_code, retval; const char *user, *pass; char *princ_name, *passdup; - pam_std_option(&options, other_options, argc, argv); - - PAM_LOG("Options processed"); - if (!(flags & PAM_UPDATE_AUTHTOK)) return (PAM_AUTHTOK_ERR); ==== //depot/projects/ia64/lib/libpam/modules/pam_opie/pam_opie.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright 2000 James Bloom * All rights reserved. * Based upon code Copyright 1998 Juniper Networks, Inc. - * Copyright (c) 2001,2002 Networks Associates Technology, Inc. + * Copyright (c) 2001-2003 Networks Associates Technology, Inc. * All rights reserved. * * Portions of this software were developed for the FreeBSD Project by @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_opie/pam_opie.c,v 1.23 2002/07/30 08:32:03 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_opie/pam_opie.c,v 1.25 2003/05/31 17:19:03 des Exp $"); #include <sys/types.h> #include <opie.h> @@ -52,23 +52,13 @@ #include <security/pam_modules.h> #include <security/pam_mod_misc.h> -enum { - PAM_OPT_AUTH_AS_SELF = PAM_OPT_STD_MAX, - PAM_OPT_NO_FAKE_PROMPTS -}; - -static struct opttab other_options[] = { - { "auth_as_self", PAM_OPT_AUTH_AS_SELF }, - { "no_fake_prompts", PAM_OPT_NO_FAKE_PROMPTS }, - { NULL, 0 } -}; +#define PAM_OPT_NO_FAKE_PROMPTS "no_fake_prompts" PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { struct opie opie; - struct options options; struct passwd *pwd; int retval, i; const char *(promptstr[]) = { "%s\nPassword: ", "%s\nPassword [echo on]: "}; @@ -77,12 +67,8 @@ char *response; int style; - pam_std_option(&options, other_options, argc, argv); - - PAM_LOG("Options processed"); - user = NULL; - if (pam_test_option(&options, PAM_OPT_AUTH_AS_SELF, NULL)) { + if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) { if ((pwd = getpwnam(getlogin())) == NULL) return (PAM_AUTH_ERR); user = pwd->pw_name; @@ -108,7 +94,7 @@ */ /* XXX generates a const warning because of incorrect prototype */ if (opiechallenge(&opie, (char *)user, challenge) != 0 && - pam_test_option(&options, PAM_OPT_NO_FAKE_PROMPTS, NULL)) + openpam_get_option(pamh, PAM_OPT_NO_FAKE_PROMPTS)) return (PAM_AUTH_ERR); /* ==== //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#8 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright 1998 Juniper Networks, Inc. * All rights reserved. - * Copyright (c) 2001,2002 Networks Associates Technology, Inc. + * Copyright (c) 2001-2003 Networks Associates Technology, Inc. * All rights reserved. * * Portions of this software were developed for the FreeBSD Project by @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.13 2002/10/28 10:28:46 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.15 2003/05/31 17:19:03 des Exp $"); #include <sys/param.h> #include <pwd.h> @@ -51,18 +51,9 @@ #include <security/pam_modules.h> #include <security/pam_mod_misc.h> -enum { - PAM_OPT_CONF = PAM_OPT_STD_MAX, - PAM_OPT_TEMPLATE_USER, - PAM_OPT_NAS_ID -}; - -static struct opttab other_options[] = { - { "conf", PAM_OPT_CONF }, - { "template_user", PAM_OPT_TEMPLATE_USER }, - { "nas_id", PAM_OPT_NAS_ID }, - { NULL, 0 } -}; +#define PAM_OPT_CONF "conf" +#define PAM_OPT_TEMPLATE_USER "template_user" +#define PAM_OPT_NAS_ID "nas_id" #define MAX_CHALLENGE_MSGS 10 #define PASSWORD_PROMPT "RADIUS Password:" @@ -218,25 +209,17 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { - struct options options; struct rad_handle *radh; const char *user, *tmpuser, *pass; - char *conf_file, *template_user, *nas_id; + const char *conf_file, *template_user, *nas_id; int retval; int e; - pam_std_option(&options, other_options, argc, argv); - - PAM_LOG("Options processed"); - - conf_file = NULL; - pam_test_option(&options, PAM_OPT_CONF, &conf_file); - template_user = NULL; - pam_test_option(&options, PAM_OPT_TEMPLATE_USER, &template_user); - nas_id = NULL; - pam_test_option(&options, PAM_OPT_NAS_ID, &nas_id); + conf_file = openpam_get_option(pamh, PAM_OPT_CONF); + template_user = openpam_get_option(pamh, PAM_OPT_TEMPLATE_USER); + nas_id = openpam_get_option(pamh, PAM_OPT_NAS_ID); retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) ==== //depot/projects/ia64/lib/libpam/modules/pam_tacplus/pam_tacplus.c#7 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright 1998 Juniper Networks, Inc. * All rights reserved. - * Copyright (c) 2001,2002 Networks Associates Technology, Inc. + * Copyright (c) 2001-2003 Networks Associates Technology, Inc. * All rights reserved. * * Portions of this software were developed for the FreeBSD Project by @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.c,v 1.12 2002/04/12 22:27:24 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_tacplus/pam_tacplus.c,v 1.14 2003/05/31 17:19:03 des Exp $"); #include <sys/param.h> @@ -52,17 +52,9 @@ #include <security/pam_modules.h> #include <security/pam_mod_misc.h> -enum { - PAM_OPT_CONF = PAM_OPT_STD_MAX, - PAM_OPT_TEMPLATE_USER -}; +#define PAM_OPT_CONF "conf" +#define PAM_OPT_TEMPLATE_USER "template_user" -static struct opttab other_options[] = { - { "conf", PAM_OPT_CONF }, - { "template_user", PAM_OPT_TEMPLATE_USER }, - { NULL, 0 } -}; - typedef int (*set_func)(struct tac_handle *, const char *); static int do_item(pam_handle_t *, struct tac_handle *, int, @@ -115,22 +107,14 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, - int argc, const char *argv[]) + int argc __unused, const char *argv[] __unused) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305312216.h4VMGIs8044794>