PERFORCE change 169371 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Sat Oct 10 21:56:04 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=169371
Change 169371 by trasz at trasz_victim on 2009/10/10 21:55:11
IFC.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/openpam/doc/man/pam.conf.5#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tcsh/sh.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/ftpd#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/kde#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/other#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/sshd#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/system#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/telnetd#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/pam.d/xdm#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.subr#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/services#2 integrate
.. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes#4 integrate
.. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/soc2009/trasz_limits/include/langinfo.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/include/libgen.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/getdelim.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/sys/intro.2#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libpmc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/map_object.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/bce.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/bge.4#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/de.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/lindev.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/unix.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/urtw.4#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/zyd.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#10 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/fetch.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/store.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/atomic.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_da.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-ati.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_t3fw.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ppbus/lpt.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtw.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/concat/g_concat.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/label/g_label.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_events.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_move.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/elf_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/elf_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lock.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_acl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/elf64_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/pf/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/route.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_os_bsd.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_impl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/elf_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/errno.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/sequences#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/unknown1.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/tmpfs/h_tools.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/main.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/netstat.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/unix.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/whois/whois.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/cdcontrol/cdcontrol.c#2 integrate
Differences ...
==== //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
#include <paths.h>
#include <signal.h>
@@ -713,12 +713,7 @@
do_clearcmdentry = 1;
}
- find_command(argv[0], &cmdentry, 1, path);
- if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */
- exitstatus = 127;
- flushout(&errout);
- return;
- }
+ find_command(argv[0], &cmdentry, 0, path);
/* implement the bltin builtin here */
if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
for (;;) {
@@ -740,7 +735,7 @@
/* Fork off a child process if necessary. */
if (cmd->ncmd.backgnd
- || (cmdentry.cmdtype == CMDNORMAL
+ || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
&& ((flags & EV_EXIT) == 0 || have_traps()))
|| ((flags & EV_BACKCMD) != 0
&& (cmdentry.cmdtype != CMDBUILTIN
==== //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -429,6 +429,7 @@
outfmt(out2, "%s: %s\n", name, strerror(e));
}
entry->cmdtype = CMDUNKNOWN;
+ entry->u.index = 0;
return;
success:
==== //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $
.\"
.Dd May 31, 2009
.Dt SH 1
@@ -1227,6 +1227,9 @@
final value of
.Ar parameter
is substituted.
+Quoting inside
+.Ar word
+does not prevent field splitting or pathname expansion.
Only variables, not positional
parameters or special parameters, can be
assigned in this way.
==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 (text+ko) ====
@@ -1790,11 +1790,14 @@
/* We don't support those properties on FreeBSD. */
switch (prop) {
+ case ZFS_PROP_DEVICES:
+ case ZFS_PROP_ZONED:
case ZFS_PROP_SHAREISCSI:
- case ZFS_PROP_DEVICES:
- case ZFS_PROP_ACLMODE:
- case ZFS_PROP_ACLINHERIT:
case ZFS_PROP_ISCSIOPTIONS:
+ case ZFS_PROP_XATTR:
+ case ZFS_PROP_VSCAN:
+ case ZFS_PROP_NBMAND:
+ case ZFS_PROP_SHARESMB:
(void) snprintf(errbuf, sizeof (errbuf),
"property '%s' not supported on FreeBSD", propname);
ret = zfs_error(hdl, EZFS_PERM, errbuf);
==== //depot/projects/soc2009/trasz_limits/contrib/openpam/doc/man/pam.conf.5#2 (text) ====
@@ -109,7 +109,7 @@
.It Cm requisite
If this module succeeds, the result of the chain will be success
unless a later module fails.
-If it module fails, the chain is broken and the result is failure.
+If the module fails, the chain is broken and the result is failure.
.It Cm sufficient
If this module succeeds, the chain is broken and the result is
success.
==== //depot/projects/soc2009/trasz_limits/contrib/tcpdump/print-tcp.c#2 (text+ko) ====
@@ -124,6 +124,7 @@
{ TCPOPT_CCECHO, "" },
{ TCPOPT_SIGNATURE, "md5" },
{ TCPOPT_AUTH, "enhanced auth" },
+ { TCPOPT_UTO, "uto" },
{ 0, NULL }
};
@@ -613,6 +614,17 @@
*/
break;
+ case TCPOPT_UTO:
+ datalen = 2;
+ LENCHECK(datalen);
+ uint utoval = EXTRACT_16BITS(cp);
+ if (utoval & 0x0001)
+ utoval = (utoval >> 1) * 60;
+ else
+ utoval >>= 1;
+ (void)printf(" %u", utoval);
+ break;
+
default:
datalen = len - 2;
for (i = 0; i < datalen; ++i) {
==== //depot/projects/soc2009/trasz_limits/contrib/tcpdump/tcp.h#2 (text+ko) ====
@@ -83,6 +83,8 @@
#define TCPOLEN_SIGNATURE 18
#define TCP_SIGLEN 16 /* length of an option 19 digest */
#define TCPOPT_AUTH 20 /* Enhanced AUTH option */
+#define TCPOPT_UTO 28 /* tcp user timeout (rfc5482) */
+#define TCPOLEN_UTO 4
#define TCPOPT_TSTAMP_HDR \
(TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
==== //depot/projects/soc2009/trasz_limits/contrib/tcsh/sh.c#3 (text+ko) ====
@@ -1291,6 +1291,8 @@
/*
* Mop-up.
*/
+ /* Take care of these (especially HUP) here instead of inside flush. */
+ handle_pending_signals();
if (intty) {
if (loginsh) {
xprintf("logout\n");
==== //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#5 (text) ====
@@ -7,9 +7,9 @@
*
* A list of symbols which need munging is obtained as follows:
*
- * nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
+ * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
*
- * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.7 2009/10/01 17:12:52 des Exp $
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $
*/
#define a2port ssh_a2port
@@ -18,6 +18,7 @@
#define acss_setkey ssh_acss_setkey
#define acss_setsubkey ssh_acss_setsubkey
#define add_host_to_hostfile ssh_add_host_to_hostfile
+#define add_recv_bytes ssh_add_recv_bytes
#define addargs ssh_addargs
#define addr_match_list ssh_addr_match_list
#define ask_permission ssh_ask_permission
@@ -111,6 +112,8 @@
#define channel_open_message ssh_channel_open_message
#define channel_output_poll ssh_channel_output_poll
#define channel_permit_all_opens ssh_channel_permit_all_opens
+#define channel_post ssh_channel_post
+#define channel_pre ssh_channel_pre
#define channel_prepare_select ssh_channel_prepare_select
#define channel_print_adm_permitted_opens ssh_channel_print_adm_permitted_opens
#define channel_register_cleanup ssh_channel_register_cleanup
@@ -150,14 +153,19 @@
#define cipher_set_key_string ssh_cipher_set_key_string
#define cipher_set_keycontext ssh_cipher_set_keycontext
#define cipher_set_keyiv ssh_cipher_set_keyiv
+#define ciphers ssh_ciphers
#define ciphers_valid ssh_ciphers_valid
#define cleanhostname ssh_cleanhostname
#define cleanup_exit ssh_cleanup_exit
#define clear_cached_addr ssh_clear_cached_addr
#define colon ssh_colon
+#define compat13 ssh_compat13
+#define compat20 ssh_compat20
#define compat_cipher_proposal ssh_compat_cipher_proposal
#define compat_datafellows ssh_compat_datafellows
#define convtime ssh_convtime
+#define current_keys ssh_current_keys
+#define datafellows ssh_datafellows
#define debug ssh_debug
#define debug ssh_debug
#define debug2 ssh_debug2
@@ -175,6 +183,7 @@
#define dh_new_group14 ssh_dh_new_group14
#define dh_new_group_asc ssh_dh_new_group_asc
#define dh_pub_is_valid ssh_dh_pub_is_valid
+#define dispatch ssh_dispatch
#define dispatch_init ssh_dispatch_init
#define dispatch_protocol_error ssh_dispatch_protocol_error
#define dispatch_protocol_ignore ssh_dispatch_protocol_ignore
@@ -205,6 +214,7 @@
#define get_local_port ssh_get_local_port
#define get_peer_ipaddr ssh_get_peer_ipaddr
#define get_peer_port ssh_get_peer_port
+#define get_recv_bytes ssh_get_recv_bytes
#define get_remote_ipaddr ssh_get_remote_ipaddr
#define get_remote_name_or_ip ssh_get_remote_name_or_ip
#define get_remote_port ssh_get_remote_port
@@ -216,6 +226,7 @@
#define host_hash ssh_host_hash
#define hostfile_read_key ssh_hostfile_read_key
#define hpdelim ssh_hpdelim
+#define incoming_stream ssh_incoming_stream
#define init_rng ssh_init_rng
#define ipv64_normalise_mapped ssh_ipv64_normalise_mapped
#define kex_derive_keys ssh_kex_derive_keys
@@ -268,6 +279,7 @@
#define mac_init ssh_mac_init
#define mac_setup ssh_mac_setup
#define mac_valid ssh_mac_valid
+#define macs ssh_macs
#define match_host_and_ip ssh_match_host_and_ip
#define match_hostname ssh_match_hostname
#define match_list ssh_match_list
@@ -279,6 +291,7 @@
#define ms_subtract_diff ssh_ms_subtract_diff
#define ms_to_timeval ssh_ms_to_timeval
#define mysignal ssh_mysignal
+#define outgoing_stream ssh_outgoing_stream
#define packet_add_padding ssh_packet_add_padding
#define packet_backup_state ssh_packet_backup_state
#define packet_close ssh_packet_close
@@ -363,9 +376,13 @@
#define refresh_progress_meter ssh_refresh_progress_meter
#define replacearg ssh_replacearg
#define restore_uid ssh_restore_uid
+#define resume_in_progress ssh_resume_in_progress
+#define resume_kex ssh_resume_kex
#define rijndael_decrypt ssh_rijndael_decrypt
#define rijndael_encrypt ssh_rijndael_encrypt
#define rijndael_set_key ssh_rijndael_set_key
+#define roaming_read ssh_roaming_read
+#define roaming_write ssh_roaming_write
#define rsa_generate_additional_parameters ssh_rsa_generate_additional_parameters
#define rsa_private_decrypt ssh_rsa_private_decrypt
#define rsa_public_encrypt ssh_rsa_public_encrypt
@@ -393,6 +410,7 @@
#define tty_make_modes ssh_tty_make_modes
#define tty_parse_modes ssh_tty_parse_modes
#define tun_open ssh_tun_open
+#define umac_ctx ssh_umac_ctx
#define umac_delete ssh_umac_delete
#define umac_final ssh_umac_final
#define umac_new ssh_umac_new
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/ftpd#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.20 2009/10/05 09:28:54 des Exp $
#
# PAM configuration for the "ftpd" service
#
@@ -8,12 +8,12 @@
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
-#auth sufficient pam_ssh.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_krb5.so
account required pam_unix.so
# session
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/kde#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/kde,v 1.9 2009/10/05 09:28:54 des Exp $
#
# PAM configuration for the "kde" service
#
@@ -11,9 +11,9 @@
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_permit.so
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/other#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/other,v 1.13 2009/10/05 09:28:54 des Exp $
#
# PAM configuration for the "other" service
#
@@ -13,12 +13,12 @@
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_permit.so
# password
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/sshd#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/sshd,v 1.18 2009/10/05 09:28:54 des Exp $
#
# PAM configuration for the "sshd" service
#
@@ -13,12 +13,12 @@
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_permit.so
# password
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/system#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
+# $FreeBSD: src/etc/pam.d/system,v 1.3 2009/10/05 09:28:54 des Exp $
#
# System-wide defaults
#
@@ -12,12 +12,12 @@
auth required pam_unix.so no_warn try_first_pass nullok
# account
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_lastlog.so no_fail
# password
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/telnetd#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.10 2009/10/05 09:28:54 des Exp $
#
# PAM configuration for the "telnetd" service
#
@@ -13,12 +13,12 @@
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_login_access.so
account required pam_unix.so
# session
-#session optional pam_ssh.so
+#session optional pam_ssh.so want_agent
session required pam_lastlog.so no_fail
# password
==== //depot/projects/soc2009/trasz_limits/etc/pam.d/xdm#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $
+# $FreeBSD: src/etc/pam.d/xdm,v 1.12 2009/10/05 09:28:54 des Exp $
#
# PAM configuration for the "xdm" service
#
@@ -11,11 +11,11 @@
# account
account required pam_nologin.so
-#account required pam_krb5.so
+#account required pam_krb5.so
account required pam_unix.so
# session
-#session required pam_ssh.so want_agent
+#session required pam_ssh.so want_agent
session required pam_lastlog.so no_fail
# password
==== //depot/projects/soc2009/trasz_limits/etc/rc.subr#5 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.90 2009/09/17 19:05:47 dougb Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.91 2009/10/05 20:11:33 hrs Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -602,7 +602,7 @@
esac
eval _override_command=\$${name}_program
- command=${command:-${_override_command}}
+ command=${command:+${_override_command:-$command}}
_keywords="start stop restart rcvar $extra_commands"
rc_pid=
==== //depot/projects/soc2009/trasz_limits/etc/services#2 (text+ko) ====
@@ -16,7 +16,7 @@
# Kerberos services are for Kerberos v4, and are unofficial. Sites running
# v5 should uncomment v5 entries and comment v4 entries.
#
-# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
+# $FreeBSD: src/etc/services,v 1.114 2009/10/03 11:02:36 rpaulo Exp $
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
@@ -1521,6 +1521,8 @@
nfa 1155/udp #Network File Access
phone 1167/udp #conference calling
skkserv 1178/tcp #SKK (kanji input)
+openvpn 1194/tcp #OpenVPN
+openvpn 1194/udp #OpenVPN
lupa 1212/tcp
lupa 1212/udp
nerv 1222/tcp #SNI R&D network
==== //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes#4 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.276 2009/07/16 20:29:36 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $
%
=======================================================================
|| ||
@@ -18126,7 +18126,7 @@
commenting on rumors of womanizing.
%
Food for thought is no substitute for the real thing.
- -- Walt Kelly, "Putluck Pogo"
+ -- Walt Kelly, "Potluck Pogo"
%
Foolproof Operation:
No provision for adjustment.
==== //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes.sp.ok#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.9 2007/12/09 01:00:11 dougb Exp $
+# $FreeBSD: src/games/fortune/datfiles/fortunes.sp.ok,v 1.10 2009/10/06 02:13:32 dougb Exp $
AAAAAAAAAaaaaaaaaaaaaaaaccccccccckkkkkk
AAAARRRRGGGGHHHH
aafte
@@ -3300,6 +3300,7 @@
Postnews
Postpetroleum
potholes
+Potluck
potty
Poul
Pournelle
@@ -3376,7 +3377,6 @@
PUSHes
pushy
pussycats
-Putluck
Putt's
PVLC
PxP
==== //depot/projects/soc2009/trasz_limits/include/langinfo.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/langinfo.h,v 1.6 2002/09/18 05:54:25 mike Exp $
+ * $FreeBSD: src/include/langinfo.h,v 1.7 2009/10/05 07:11:19 edwin Exp $
*/
#ifndef _LANGINFO_H_
@@ -114,6 +114,20 @@
#define D_MD_ORDER 57 /* month/day order (local extension) */
#endif
+/* standalone months forms for %OB */
+#define ALTMON_1 58
+#define ALTMON_2 59
+#define ALTMON_3 60
+#define ALTMON_4 61
+#define ALTMON_5 62
+#define ALTMON_6 63
+#define ALTMON_7 64
+#define ALTMON_8 65
+#define ALTMON_9 66
+#define ALTMON_10 67
+#define ALTMON_11 68
+#define ALTMON_12 69
+
__BEGIN_DECLS
char *nl_langinfo(nl_item);
__END_DECLS
==== //depot/projects/soc2009/trasz_limits/include/libgen.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */
-/* $FreeBSD: src/include/libgen.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
+/* $FreeBSD: src/include/libgen.h,v 1.3 2009/10/06 14:05:57 rwatson Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller at courtesan.com>
@@ -36,6 +36,7 @@
__BEGIN_DECLS
char *basename(const char *);
+char *basename_r(const char *, char *);
char *dirname(const char *);
#if 0
char *regcmp(const char *, ...);
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -76,6 +76,7 @@
MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 \
arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3
+MLINKS+=basename.3 basename_r.3
MLINKS+=ctermid.3 ctermid_r.3
MLINKS+=devname.3 devname_r.3
MLINKS+=devname.3 fdevname.3
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#4 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $
*/
FBSD_1.0 {
@@ -367,6 +367,7 @@
};
FBSD_1.2 {
+ basename_r;
getpagesizes;
};
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.3#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.9 2009/10/06 14:05:57 rwatson Exp $
.\"
-.Dd October 12, 2006
+.Dd October 6, 2009
.Dt BASENAME 3
.Os
.Sh NAME
@@ -37,6 +37,8 @@
.In libgen.h
.Ft char *
.Fn basename "const char *path"
+.Ft char *
+.Fn basename_r "const char *path" "char *bname"
.Sh DESCRIPTION
The
.Fn basename
@@ -58,6 +60,12 @@
is a null pointer or the empty string, a pointer to the string
.Qq \&.
is returned.
+.Pp
+The
+.Fn basename_r
+variation accepts a buffer of at least
+.Dv MAXPATHLEN
+bytes in which to store the resulting component.
.Sh IMPLEMENTATION NOTES
The
.Fn basename
@@ -65,15 +73,17 @@
returns a pointer to internal storage space allocated on the first call
that will be overwritten
by subsequent calls.
+.Fn basename_r
+is therefore preferred for threaded applications.
.Sh RETURN VALUES
On successful completion,
.Fn basename
-returns a pointer to the last component of
+and
+.Fn basename_r
+return pointers to the last component of
.Fa path .
.Pp
-If
-.Fn basename
-fails, a null pointer is returned and the global variable
+If they fail, a null pointer is returned and the global variable
.Va errno
is set to indicate the error.
.Sh ERRORS
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/basename.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.8 2009/10/06 14:05:57 rwatson Exp $");
#include <errno.h>
#include <libgen.h>
@@ -40,18 +40,12 @@
#include <sys/param.h>
char *
-basename(path)
+basename_r(path, bname)
const char *path;
+ char *bname;
{
- static char *bname = NULL;
const char *endp, *startp;
- if (bname == NULL) {
- bname = (char *)malloc(MAXPATHLEN);
- if (bname == NULL)
- return(NULL);
- }
-
/* Empty or NULL string gets treated as "." */
if (path == NULL || *path == '\0') {
(void)strcpy(bname, ".");
@@ -82,3 +76,17 @@
bname[endp - startp + 1] = '\0';
return(bname);
}
+
+char *
+basename(path)
+ const char *path;
+{
+ static char *bname = NULL;
+
+ if (bname == NULL) {
+ bname = (char *)malloc(MAXPATHLEN);
+ if (bname == NULL)
+ return (NULL);
+ }
+ return (basename_r(path, bname));
+}
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/errlst.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.9 2007/01/09 00:27:53 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.10 2009/10/07 20:20:51 rwatson Exp $");
#include <stdio.h>
@@ -150,5 +150,6 @@
"Multihop attempted", /* 90 - EMULTIHOP */
"Link has been severed", /* 91 - ENOLINK */
"Protocol error", /* 92 - EPROTO */
+ "Capabilities insufficient", /* 93 - ENOTCAPABLE */
};
const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.3#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fts.3 8.5 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.24 2008/01/26 17:09:40 yar Exp $
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.25 2009/10/05 21:11:04 delphij Exp $
.\"
-.Dd January 26, 2008
+.Dd October 5, 2009
.Dt FTS 3
.Os
.Sh NAME
@@ -776,7 +776,7 @@
as follows:
.Bl -tag -width Er
.It Bq Er EINVAL
-The options were invalid.
+The options were invalid, or the list were empty.
.El
.Sh SEE ALSO
.Xr find 1 ,
==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/fts.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.30 2009/03/04 03:30:21 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.31 2009/10/05 21:11:04 delphij Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -124,6 +124,12 @@
return (NULL);
}
+ /* fts_open() requires at least one path */
+ if (*argv == NULL) {
+ errno = EINVAL;
+ return (NULL);
+ }
+
/* Allocate/initialize the stream. */
if ((priv = malloc(sizeof(*priv))) == NULL)
return (NULL);
==== //depot/projects/soc2009/trasz_limits/lib/libc/locale/nl_langinfo.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.18 2009/10/05 07:13:15 edwin Exp $");
#include <langinfo.h>
#include <limits.h>
@@ -93,6 +93,12 @@
case ABMON_9: case ABMON_10: case ABMON_11: case ABMON_12:
ret = (char*) __get_current_time_locale()->mon[_REL(ABMON_1)];
break;
+ case ALTMON_1: case ALTMON_2: case ALTMON_3: case ALTMON_4:
+ case ALTMON_5: case ALTMON_6: case ALTMON_7: case ALTMON_8:
+ case ALTMON_9: case ALTMON_10: case ALTMON_11: case ALTMON_12:
+ ret = (char*)
+ __get_current_time_locale()->alt_month[_REL(ALTMON_1)];
+ break;
case ERA:
/* XXX: need to be implemented */
ret = "";
==== //depot/projects/soc2009/trasz_limits/lib/libc/stdio/getdelim.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getdelim.c,v 1.2 2009/04/06 13:50:04 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getdelim.c,v 1.3 2009/10/04 19:43:36 das Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -120,8 +120,8 @@
goto error;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list