PERFORCE change 169263 for review
Robert Watson
rwatson at FreeBSD.org
Tue Oct 6 12:47:57 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=169263
Change 169263 by rwatson at rwatson_freebsd_capabilities on 2009/10/06 12:47:23
Integrate TrustedBSD capabilities branch.
Affected files ...
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.platform#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-pam.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-passwd.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth1.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-kbdint.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/config.h.in#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/defines.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/gss-genr.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/includes.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kex.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kex.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/kexgexs.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_wrap.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/monitor_wrap.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/packet.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/packet.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/readconf.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/readconf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/servconf.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/serverloop.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/session.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.1#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-agent.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh-keygen.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.1#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_config.5#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_namespace.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshconnect2.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.8#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config.5#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshlogin.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/version.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/ftpd#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/kde#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/other#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/sshd#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/system#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/telnetd#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/pam.d/xdm#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/defaultroute#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routing#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/static_arp#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/services#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/include/langinfo.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/nl_langinfo.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/getdelim.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/share/misc/man2hwnotes.pl#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/libexec/sftp-server/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/ssh/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.sbin/sshd/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/de.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/unix.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/urtw.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/zyd.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/fetch.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/store.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-src.dot#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/cpufunc.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#19 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-ati.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_common.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpt.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/uart/uart_tty.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_events.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_init.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_move.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/vinum/geom_vinum_subr.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/elf_machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/vm_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/cpufunc.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/elf_machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_proc.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_acl_posix1e.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_usrreq.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_acl.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_default.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/elf64_machdep.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfslockd/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/route.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netipsec/xform_esp.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_impl.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/pmc.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/vnode.h#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#15 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_page.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_page.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/errors/backquote-error2.0#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/mmap/mmap.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/calendar/calendars/calendar.freebsd#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/main.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/netstat.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/unix.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/whois/whois.c#2 integrate
Differences ...
==== //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -82,7 +82,6 @@
STATIC struct heredoc *heredoclist; /* list of here documents to read */
-STATIC int parsebackquote; /* nonzero if we are inside backquotes */
STATIC int doprompt; /* if set, prompt the user */
STATIC int needprompt; /* true if interactive and at start of line */
STATIC int lasttoken; /* last token read */
@@ -1043,7 +1042,7 @@
endword:
if (syntax == ARISYNTAX)
synerror("Missing '))'");
- if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+ if (syntax != BASESYNTAX && eofmark == NULL)
synerror("Unterminated quoted string");
if (varnest != 0) {
startlinno = plinno;
@@ -1303,7 +1302,6 @@
parsebackq: {
struct nodelist **nlpp;
- int savepbq;
union node *n;
char *volatile str;
struct jmploc jmploc;
@@ -1311,11 +1309,9 @@
int savelen;
int saveprompt;
- savepbq = parsebackquote;
if (setjmp(jmploc.loc)) {
if (str)
ckfree(str);
- parsebackquote = 0;
handler = savehandler;
longjmp(handler->loc, 1);
}
@@ -1397,7 +1393,6 @@
nlpp = &(*nlpp)->next;
*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
(*nlpp)->next = NULL;
- parsebackquote = oldstyle;
if (oldstyle) {
saveprompt = doprompt;
@@ -1433,7 +1428,6 @@
str = NULL;
INTON;
}
- parsebackquote = savepbq;
handler = savehandler;
if (arinest || dblquote)
USTPUTC(CTLBACKQ | CTLQUOTE, out);
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ChangeLog#4 (text+ko) ====
@@ -1,3 +1,282 @@
+20090926
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+ [contrib/suse/openssh.spec] Update for release
+ - (djm) [README] update relnotes URL
+ - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
+ - (djm) Release 5.3p1
+
+20090911
+ - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
+ 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch
+ from jbasney at ncsa uiuc edu.
+
+20090908
+ - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
+ (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@
+
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+ krb5-config if it's not in the location specified by --with-kerberos5.
+ Patch from jchadima at redhat.
+
+20090829
+ - (dtucker) [README.platform] Add text about development packages, based on
+ text from Chris Pepper in bug #1631.
+
+20090828
+ - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
+ causes problems in some Tru64 configurations.
+ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
+ and mention PAM as another provider for ChallengeResponseAuthentication;
+ bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+ attempting atomic rename(); ok dtucker@
+ - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
+ in argv, so pass them in the environment; ok dtucker@
+ - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
+ the pty master on Solaris, since it never succeeds and can hang if large
+ amounts of data is sent to the slave (eg a copy-paste). Based on a patch
+ originally from Doke Scott, ok djm@
+ - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
+ size a compile-time option and set it to 64k on Cygwin, since Corinna
+ reports that it makes a significant difference to performance. ok djm@
+ - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.
+
+20090820
+ - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
+ using it since the type conflicts can cause problems on FreeBSD. Patch
+ from Jonathan Chen.
+ - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
+ the setpcred call on AIX to immediately before the permanently_set_uid().
+ Ensures that we still have privileges when we call chroot and
+ pam_open_sesson. Based on a patch from David Leonard.
+
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+ zlib, which should make the errors slightly more meaningful on platforms
+ where there's separate "-devel" packages for those.
+ - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
+ PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders.
+
+20090729
+ - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
+ function. Patch from Corinna Vinschen.
+
+20090713
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
+ fits into 16 bits to work around a bug in glibc's resolver where it masks
+ off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob.
+
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+ prevents configure complaining on older BSDs.
+ - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
+ from Corinna Vinschen.
+ - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
+ logout to after the session close. Patch from Anicka Bernathova,
+ originally from Andreas Schwab via Novelll ok djm.
+
+20090707
+ - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
+ scripts and fix usage of eval. Patch from Corinna Vinschen.
+
+20090705
+ - (dtucker) OpenBSD CVS Sync
+ - andreas at cvs.openbsd.org 2009/06/27 09:29:06
+ [packet.h packet.c]
+ packet_bacup_state() and packet_restore_state() will be used to
+ temporarily save the current state ren resuming a suspended connection.
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/06/27 09:32:43
+ [roaming_common.c roaming.h]
+ It may be necessary to retransmit some data when resuming, so add it
+ to a buffer when roaming is enabled.
+ Most of this code was written by Martin Forssen, maf at appgate dot com.
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/06/27 09:35:06
+ [readconf.h readconf.c]
+ Add client option UseRoaming. It doesn't do anything yet but will
+ control whether the client tries to use roaming if enabled on the
+ server. From Martin Forssen.
+ ok markus@
+ - markus at cvs.openbsd.org 2009/06/30 14:54:40
+ [version.h]
+ crank version; ok deraadt
+ - dtucker at cvs.openbsd.org 2009/07/02 02:11:47
+ [ssh.c]
+ allow for long home dir paths (bz #1615). ok deraadt
+ (based in part on a patch from jchadima at redhat)
+ - stevesk at cvs.openbsd.org 2009/07/05 19:28:33
+ [clientloop.c]
+ only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
+ ok deraadt@ markus@
+
+20090622
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker at cvs.openbsd.org 2009/06/22 05:39:28
+ [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
+ alphabetize includes; reduces diff vs portable and style(9).
+ ok stevesk djm
+ (Id sync only; these were already in order in -portable)
+
+20090621
+ - (dtucker) OpenBSD CVS Sync
+ - markus at cvs.openbsd.org 2009/03/17 21:37:00
+ [ssh.c]
+ pass correct argv[0] to openlog(); ok djm@
+ - jmc at cvs.openbsd.org 2009/03/19 15:15:09
+ [ssh.1]
+ for "Ciphers", just point the reader to the keyword in ssh_config(5), just
+ as we do for "MACs": this stops us getting out of sync when the lists
+ change;
+ fixes documentation/6102, submitted by Peter J. Philipp
+ alternative fix proposed by djm
+ ok markus
+ - tobias at cvs.openbsd.org 2009/03/23 08:31:19
+ [ssh-agent.c]
+ Fixed a possible out-of-bounds memory access if the environment variable
+ SHELL is shorter than 3 characters.
+ with input by and ok dtucker
+ - tobias at cvs.openbsd.org 2009/03/23 19:38:04
+ [ssh-agent.c]
+ My previous commit didn't fix the problem at all, so stick at my first
+ version of the fix presented to dtucker.
+ Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
+ ok dtucker
+ - sobrado at cvs.openbsd.org 2009/03/26 08:38:39
+ [sftp-server.8 sshd.8 ssh-agent.1]
+ fix a few typographical errors found by spell(1).
+ ok dtucker@, jmc@
+ - stevesk at cvs.openbsd.org 2009/04/13 19:07:44
+ [sshd_config.5]
+ fix possessive; ok djm@
+ - stevesk at cvs.openbsd.org 2009/04/14 16:33:42
+ [sftp-server.c]
+ remove unused option character from getopt() optstring; ok markus@
+ - jj at cvs.openbsd.org 2009/04/14 21:10:54
+ [servconf.c]
+ Fixed a few the-the misspellings in comments. Skipped a bunch in
+ binutils,gcc and so on. ok jmc@
+ - stevesk at cvs.openbsd.org 2009/04/17 19:23:06
+ [session.c]
+ use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
+ ok djm@ markus@
+ - stevesk at cvs.openbsd.org 2009/04/17 19:40:17
+ [sshd_config.5]
+ clarify that even internal-sftp needs /dev/log for logging to work; ok
+ markus@
+ - jmc at cvs.openbsd.org 2009/04/18 18:39:10
+ [sshd_config.5]
+ tweak previous; ok stevesk
+ - stevesk at cvs.openbsd.org 2009/04/21 15:13:17
+ [sshd_config.5]
+ clarify we cd to user's home after chroot; ok markus@ on
+ earlier version; tweaks and ok jmc@
+ - andreas at cvs.openbsd.org 2009/05/25 06:48:01
+ [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c
+ monitor.c]
+ Put the globals in packet.c into a struct and don't access it directly
+ from other files. No functional changes.
+ ok markus@ djm@
+ - andreas at cvs.openbsd.org 2009/05/27 06:31:25
+ [canohost.h canohost.c]
+ Add clear_cached_addr(), needed for upcoming changes allowing the peer
+ address to change.
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/05/27 06:33:39
+ [clientloop.c]
+ Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger
+ change from Martin Forssen, maf at appgate dot com.
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/05/27 06:34:36
+ [kex.c kex.h]
+ Move the KEX_COOKIE_LEN define to kex.h
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/05/27 06:36:07
+ [packet.h packet.c]
+ Add packet_put_int64() and packet_get_int64(), part of a larger change
+ from Martin Forssen.
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/05/27 06:38:16
+ [sshconnect.h sshconnect.c]
+ Un-static ssh_exchange_identification(), part of a larger change from
+ Martin Forssen and needed for upcoming changes.
+ ok markus@
+ - andreas at cvs.openbsd.org 2009/05/28 16:50:16
+ [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
+ monitor.c Added roaming.h roaming_common.c roaming_dummy.c]
+ Keep track of number of bytes read and written. Needed for upcoming
+ changes. Most code from Martin Forssen, maf at appgate dot com.
+ ok markus@
+ Also, applied appropriate changes to Makefile.in
+ - andreas at cvs.openbsd.org 2009/06/12 20:43:22
+ [monitor.c packet.c]
+ Fix warnings found by chl@ and djm@ and change roaming_atomicio's
+ return type to match atomicio's
+ Diff from djm@, ok markus@
+ - andreas at cvs.openbsd.org 2009/06/12 20:58:32
+ [packet.c]
+ Move some more statics into session_state
+ ok markus@ djm@
+ - dtucker at cvs.openbsd.org 2009/06/21 07:37:15
+ [kexdhs.c kexgexs.c]
+ abort if key_sign fails, preventing possible null deref. Based on report
+ from Paolo Ganci, ok markus@ djm@
+ - dtucker at cvs.openbsd.org 2009/06/21 09:04:03
+ [roaming.h roaming_common.c roaming_dummy.c]
+ Add tags for the benefit of the sync scripts
+ Also: pull in the changes for 1.1->1.2 missed in the previous sync.
+ - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
+ header-order changes to reduce diff vs OpenBSD.
+ - (dtucker) [servconf.c sshd.c] More whitespace sync.
+ - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in
+ ifdef.
+
+20090616
+ - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
+ is a struct with a __val member. Fixes build on, eg, Redhat 6.2.
+
+20090504
+ - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
+ variable declarations. Should prevent unused warnings anywhere it's set
+ (only Crays as far as I can tell) and be a no-op everywhere else.
+
+20090318
+ - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
+ that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
+ Based on patch from vinschen at redhat com.
+
+20090308
+ - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
+ auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
+ openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
+ version of Cygwin. Patch from vinschen at redhat com.
+
+20090307
+ - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
+ exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
+ has a /dev/random).
+ - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
+ EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
+ to use them. Allows building with older OpenSSL versions.
+ - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.
+ - (dtucker) [configure.ac] Missing comma in type list.
+ - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
+ EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
+ in openssl 0.9.6) so add an explicit test for it.
+
+20090306
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2009/03/05 07:18:19
+ [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
+ [sshconnect2.c]
+ refactor the (disabled) Schnorr proof code to make it a little more
+ generally useful
+ - djm at cvs.openbsd.org 2009/03/05 11:30:50
+ [uuencode.c]
+ document what these functions do so I don't ever have to recuse into
+ b64_pton/ntop to remember their return values
+
20090223
- (djm) OpenBSD CVS Sync
- djm at cvs.openbsd.org 2009/02/22 23:50:57
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README#4 (text+ko) ====
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.2 for the release notes.
+See http://www.openssh.com/txt/release-5.3 for the release notes.
- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html
-$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $
+$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/README.platform#3 (text+ko) ====
@@ -56,6 +56,18 @@
http://www-user.rhrk.uni-kl.de/~nissler/tuntap/
+Linux
+-----
+
+Some Linux distributions (including Red Hat/Fedora/CentOS) include
+headers and library links in the -devel RPMs rather than the main
+binary RPMs. If you get an error about headers, or complaining about a
+missing prerequisite then you may need to install the equivalent
+development packages. On Redhat based distros these may be openssl-devel,
+zlib-devel and pam-devel, on Debian based distros these may be
+libssl-dev, libz-dev and libpam-dev.
+
+
Solaris
-------
If you enable BSM auditing on Solaris, you need to update audit_event(4)
@@ -81,4 +93,4 @@
return the output from pam_nologin to the client.
-$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $
+$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-pam.c#4 (text+ko) ====
@@ -45,7 +45,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */
+/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */
#include "includes.h"
#include <sys/types.h>
@@ -602,16 +602,16 @@
return;
debug("PAM: cleanup");
pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
+ if (sshpam_session_open) {
+ debug("PAM: closing session");
+ pam_close_session(sshpam_handle, PAM_SILENT);
+ sshpam_session_open = 0;
+ }
if (sshpam_cred_established) {
debug("PAM: deleting credentials");
pam_setcred(sshpam_handle, PAM_DELETE_CRED);
sshpam_cred_established = 0;
}
- if (sshpam_session_open) {
- debug("PAM: closing session");
- pam_close_session(sshpam_handle, PAM_SILENT);
- sshpam_session_open = 0;
- }
sshpam_authenticated = 0;
pam_end(sshpam_handle, sshpam_err);
sshpam_handle = NULL;
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-passwd.c#3 (text+ko) ====
@@ -102,7 +102,7 @@
}
#endif
#ifdef HAVE_CYGWIN
- if (is_winnt) {
+ {
HANDLE hToken = cygwin_logon_user(pw, password);
if (hToken == INVALID_HANDLE_VALUE)
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth-sia.c#3 (text+ko) ====
@@ -34,10 +34,6 @@
#include <unistd.h>
#include <stdarg.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/security.h>
-#include <prot.h>
-#include <time.h>
#include "ssh.h"
#include "key.h"
@@ -53,52 +49,6 @@
extern int saved_argc;
extern char **saved_argv;
-static int
-sia_password_change_required(const char *user)
-{
- struct es_passwd *acct;
- time_t pw_life;
- time_t pw_date;
-
- set_auth_parameters(saved_argc, saved_argv);
-
- if ((acct = getespwnam(user)) == NULL) {
- error("Couldn't access protected database entry for %s", user);
- endprpwent();
- return (0);
- }
-
- /* If forced password change flag is set, honor it */
- if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) {
- endprpwent();
- return (1);
- }
-
- /* Obtain password lifetime; if none, it can't have expired */
- if (acct->uflg->fg_expire)
- pw_life = acct->ufld->fd_expire;
- else if (acct->sflg->fg_expire)
- pw_life = acct->sfld->fd_expire;
- else {
- endprpwent();
- return (0);
- }
-
- /* Offset from last change; if none, it must be expired */
- if (acct->uflg->fg_schange)
- pw_date = acct->ufld->fd_schange + pw_life;
- else {
- endprpwent();
- return (1);
- }
-
- endprpwent();
-
- /* If expiration date is prior to now, change password */
-
- return (pw_date <= time((time_t *) NULL));
-}
-
int
sys_auth_passwd(Authctxt *authctxt, const char *pass)
{
@@ -126,9 +76,6 @@
sia_ses_release(&ent);
- authctxt->force_pwchange = sia_password_change_required(
- authctxt->user);
-
return (1);
}
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth1.c#3 (text+ko) ====
@@ -318,15 +318,7 @@
}
#endif /* _UNICOS */
-#ifdef HAVE_CYGWIN
- if (authenticated &&
- !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,
- authctxt->pw)) {
- packet_disconnect("Authentication rejected for uid %d.",
- authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
- authenticated = 0;
- }
-#else
+#ifndef HAVE_CYGWIN
/* Special handling for root */
if (authenticated && authctxt->pw->pw_uid == 0 &&
!auth_root_allowed(meth->name)) {
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-jpake.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */
+/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */
/*
* Copyright (c) 2008 Damien Miller. All rights reserved.
*
@@ -42,8 +42,8 @@
#include "ssh2.h"
#include "key.h"
#include "hostfile.h"
+#include "auth.h"
#include "buffer.h"
-#include "auth.h"
#include "packet.h"
#include "dispatch.h"
#include "log.h"
@@ -55,6 +55,7 @@
#endif
#include "monitor_wrap.h"
+#include "schnorr.h"
#include "jpake.h"
/*
@@ -359,7 +360,7 @@
}
/*
- * Being authentication attempt.
+ * Begin authentication attempt.
* Note, sets authctxt->postponed while in subprotocol
*/
static int
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-kbdint.c#3 (text+ko) ====
@@ -58,10 +58,6 @@
xfree(devs);
xfree(lang);
-#ifdef HAVE_CYGWIN
- if (check_nt_auth(0, authctxt->pw) == 0)
- authenticated = 0;
-#endif
return authenticated;
}
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-none.c#3 (text+ko) ====
@@ -61,10 +61,6 @@
{
none_enabled = 0;
packet_check_eom();
-#ifdef HAVE_CYGWIN
- if (check_nt_auth(1, authctxt->pw) == 0)
- return (0);
-#endif
if (options.password_authentication)
return (PRIVSEP(auth_password(authctxt, "")));
return (0);
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-passwd.c#2 (text+ko) ====
@@ -68,10 +68,6 @@
logit("password change not supported");
else if (PRIVSEP(auth_password(authctxt, password)) == 1)
authenticated = 1;
-#ifdef HAVE_CYGWIN
- if (check_nt_auth(1, authctxt->pw) == 0)
- authenticated = 0;
-#endif
memset(password, 0, len);
xfree(password);
return authenticated;
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2-pubkey.c#3 (text+ko) ====
@@ -170,10 +170,6 @@
key_free(key);
xfree(pkalg);
xfree(pkblob);
-#ifdef HAVE_CYGWIN
- if (check_nt_auth(0, authctxt->pw) == 0)
- authenticated = 0;
-#endif
return authenticated;
}
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/auth2.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -36,8 +36,8 @@
#include <string.h>
#include <unistd.h>
+#include "atomicio.h"
#include "xmalloc.h"
-#include "atomicio.h"
#include "ssh2.h"
#include "packet.h"
#include "log.h"
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -35,6 +35,8 @@
#include "misc.h"
static void check_ip_options(int, char *);
+static char *canonical_host_ip = NULL;
+static int cached_port = -1;
/*
* Return the canonical name of the host at the other end of the socket. The
@@ -304,6 +306,16 @@
return get_socket_address(sock, 0, NI_NAMEREQD);
}
+void
+clear_cached_addr(void)
+{
+ if (canonical_host_ip != NULL) {
+ xfree(canonical_host_ip);
+ canonical_host_ip = NULL;
+ }
+ cached_port = -1;
+}
+
/*
* Returns the IP-address of the remote host as a string. The returned
* string must not be freed.
@@ -312,8 +324,6 @@
const char *
get_remote_ipaddr(void)
{
- static char *canonical_host_ip = NULL;
-
/* Check whether we have cached the ipaddr. */
if (canonical_host_ip == NULL) {
if (packet_connection_is_on_socket()) {
@@ -402,13 +412,11 @@
int
get_remote_port(void)
{
- static int port = -1;
-
/* Cache to avoid getpeername() on a dead connection */
- if (port == -1)
- port = get_port(0);
+ if (cached_port == -1)
+ cached_port = get_port(0);
- return port;
+ return cached_port;
}
int
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/canohost.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.h,v 1.10 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: canohost.h,v 1.11 2009/05/27 06:31:25 andreas Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -24,6 +24,6 @@
int get_remote_port(void);
int get_local_port(void);
int get_sock_port(int, int);
-
+void clear_cached_addr(void);
void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *);
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/channels.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.295 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.296 2009/05/25 06:48:00 andreas Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1653,6 +1653,7 @@
}
return -1;
}
+#ifndef BROKEN_TCGETATTR_ICANON
if (compat20 && c->isatty && dlen >= 1 && buf[0] != '\r') {
if (tcgetattr(c->wfd, &tio) == 0 &&
!(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
@@ -1666,6 +1667,7 @@
packet_send();
}
}
+#endif
buffer_consume(&c->output, len);
if (compat20 && len > 0) {
c->local_consumed += len;
@@ -2431,7 +2433,7 @@
int id;
/* Reset keepalive timeout */
- keep_alive_timeouts = 0;
+ packet_set_alive_timeouts(0);
id = packet_get_int();
packet_check_eom();
==== //depot/projects/trustedbsd/capabilities/src/crypto/openssh/clientloop.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -109,6 +109,7 @@
#include "misc.h"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list