Date: Tue, 6 Sep 2005 18:09:41 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 83178 for review Message-ID: <200509061809.j86I9fAp043903@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=83178 Change 83178 by peter@peter_daintree on 2005/09/06 18:08:45 IFC @83177 Affected files ... .. //depot/projects/hammer/bin/cp/cp.c#11 integrate .. //depot/projects/hammer/bin/cp/extern.h#5 integrate .. //depot/projects/hammer/bin/cp/utils.c#9 integrate .. //depot/projects/hammer/bin/mv/mv.c#8 integrate .. //depot/projects/hammer/bin/sh/alias.c#5 integrate .. //depot/projects/hammer/bin/sh/eval.c#8 integrate .. //depot/projects/hammer/bin/sh/jobs.c#12 integrate .. //depot/projects/hammer/bin/sh/sh.1#19 integrate .. //depot/projects/hammer/bin/sh/show.c#5 integrate .. //depot/projects/hammer/contrib/amd/amd/amd.8#6 integrate .. //depot/projects/hammer/crypto/openssh/CREDITS#6 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#9 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-tricks#5 integrate .. //depot/projects/hammer/crypto/openssh/LICENCE#5 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#8 integrate .. //depot/projects/hammer/crypto/openssh/README#7 integrate .. //depot/projects/hammer/crypto/openssh/README.privsep#7 integrate .. //depot/projects/hammer/crypto/openssh/WARNING.RNG#4 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#10 integrate .. //depot/projects/hammer/crypto/openssh/acss.c#2 integrate .. //depot/projects/hammer/crypto/openssh/atomicio.c#3 integrate .. //depot/projects/hammer/crypto/openssh/atomicio.h#3 integrate .. //depot/projects/hammer/crypto/openssh/audit.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-chall.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#9 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#10 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#9 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#9 integrate .. //depot/projects/hammer/crypto/openssh/auth-rh-rsa.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-rhosts.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-rsa.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth-shadow.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-skey.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#9 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#10 integrate .. //depot/projects/hammer/crypto/openssh/auth2-chall.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-kbdint.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#10 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#8 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#8 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.c#6 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#10 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#10 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#7 integrate .. //depot/projects/hammer/crypto/openssh/cipher-acss.c#2 integrate .. //depot/projects/hammer/crypto/openssh/cipher-ctr.c#4 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#9 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#8 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.h#5 integrate .. //depot/projects/hammer/crypto/openssh/compat.c#7 integrate .. //depot/projects/hammer/crypto/openssh/config.guess#7 integrate .. //depot/projects/hammer/crypto/openssh/config.h#9 integrate .. //depot/projects/hammer/crypto/openssh/config.sub#6 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#9 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#9 integrate .. //depot/projects/hammer/crypto/openssh/dns.c#4 integrate .. //depot/projects/hammer/crypto/openssh/entropy.c#4 integrate .. //depot/projects/hammer/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#5 integrate .. //depot/projects/hammer/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.c#7 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#8 integrate .. //depot/projects/hammer/crypto/openssh/kex.c#5 integrate .. //depot/projects/hammer/crypto/openssh/kex.h#5 integrate .. //depot/projects/hammer/crypto/openssh/key.c#9 integrate .. //depot/projects/hammer/crypto/openssh/log.h#8 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#9 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.h#4 integrate .. //depot/projects/hammer/crypto/openssh/mac.c#3 integrate .. //depot/projects/hammer/crypto/openssh/match.c#2 integrate .. //depot/projects/hammer/crypto/openssh/mdoc2man.awk#4 integrate .. //depot/projects/hammer/crypto/openssh/misc.c#8 integrate .. //depot/projects/hammer/crypto/openssh/misc.h#5 integrate .. //depot/projects/hammer/crypto/openssh/moduli.c#5 integrate .. //depot/projects/hammer/crypto/openssh/monitor.c#11 integrate .. //depot/projects/hammer/crypto/openssh/monitor.h#6 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#9 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#8 integrate .. //depot/projects/hammer/crypto/openssh/mpaux.c#2 delete .. //depot/projects/hammer/crypto/openssh/mpaux.h#2 delete .. //depot/projects/hammer/crypto/openssh/msg.c#6 integrate .. //depot/projects/hammer/crypto/openssh/myproposal.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#8 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openssl-compat.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openssl-compat.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#8 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-uw.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-uw.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strtoll.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strtonum.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xcrypt.c#4 integrate .. //depot/projects/hammer/crypto/openssh/packet.c#9 integrate .. //depot/projects/hammer/crypto/openssh/packet.h#5 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#6 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#9 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#8 integrate .. //depot/projects/hammer/crypto/openssh/readpass.c#5 integrate .. //depot/projects/hammer/crypto/openssh/regress/reexec.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#7 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#9 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#9 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#7 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#8 integrate .. //depot/projects/hammer/crypto/openssh/session.c#12 integrate .. //depot/projects/hammer/crypto/openssh/session.h#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#9 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.h#5 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.1#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#11 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rsa.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#11 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#11 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#9 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#9 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#9 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#11 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#12 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#13 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#8 integrate .. //depot/projects/hammer/crypto/openssh/tildexpand.c#3 delete .. //depot/projects/hammer/crypto/openssh/ttymodes.c#3 integrate .. //depot/projects/hammer/crypto/openssh/version.h#12 integrate .. //depot/projects/hammer/etc/namedb/named.conf#9 integrate .. //depot/projects/hammer/etc/network.subr#13 integrate .. //depot/projects/hammer/etc/rc.d/netif#13 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#49 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#24 integrate .. //depot/projects/hammer/lib/libc/stdio/fgets.3#4 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.3#10 integrate .. //depot/projects/hammer/lib/libc/stdio/tmpnam.3#6 integrate .. //depot/projects/hammer/lib/libc/string/strcat.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strcpy.3#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#106 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#8 integrate .. //depot/projects/hammer/sbin/init/init.8#13 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#13 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#40 integrate .. //depot/projects/hammer/share/man/man4/ath.4#26 integrate .. //depot/projects/hammer/share/man/man4/sn.4#7 integrate .. //depot/projects/hammer/share/man/man7/sdoc.7#4 integrate .. //depot/projects/hammer/share/man/man7/security.7#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#125 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#51 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#33 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#27 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#44 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#34 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#21 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#21 integrate .. //depot/projects/hammer/sys/geom/geom.h#34 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#23 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#16 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#72 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#22 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#46 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#17 integrate .. //depot/projects/hammer/sys/kern/kern_acl.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#46 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#58 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#57 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#51 integrate .. //depot/projects/hammer/sys/net/bpf.c#39 integrate .. //depot/projects/hammer/sys/net/bpfdesc.h#13 integrate .. //depot/projects/hammer/sys/net/if.c#55 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#20 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#63 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#37 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#36 integrate .. //depot/projects/hammer/sys/sys/acl.h#6 integrate .. //depot/projects/hammer/sys/sys/iconv.h#8 integrate .. //depot/projects/hammer/sys/sys/kernel.h#17 integrate .. //depot/projects/hammer/sys/sys/ktr.h#13 integrate .. //depot/projects/hammer/sys/sys/sx.h#5 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#31 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#52 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#38 integrate .. //depot/projects/hammer/sys/vm/pmap.h#21 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#32 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#50 integrate .. //depot/projects/hammer/tools/regression/bin/sh/Makefile#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/alias.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/alias.0.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/alias.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/alias.1.stderr#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/hash1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/hash1.0.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/hash2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/hash2.0.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/hash3.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/hash3.0.stdout#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/return1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/return2.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/return3.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/builtins/unalias.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/regress.sh#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/regress.t#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/and1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/and2.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/and3.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/and4.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/background1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/cmd1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/cmd2.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/elif1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/elif2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/for1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/func1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/func2.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/if1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/if2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/if3.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/not1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/not2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/or1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/or2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/or3.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/pipe1.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/pipe2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/return1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/semi1.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/semi2.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/subshell1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/subshell2.1#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/until1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/until2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/until3.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/while1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/while2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/set-e/while3.0#1 branch .. //depot/projects/hammer/tools/regression/netinet/msocket_ifnet_remove/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_clntout.c#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_cout.c#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_hout.c#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_main.c#9 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_sample.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_svcout.c#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_tblout.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_util.h#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpcgen.1#5 integrate .. //depot/projects/hammer/usr.bin/ruptime/ruptime.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.c#7 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#8 integrate Differences ... ==== //depot/projects/hammer/bin/cp/cp.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.51 2005/01/10 08:39:21 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.52 2005/09/05 04:36:08 csjp Exp $"); /* * Cp copies source files to target files. @@ -363,7 +363,10 @@ */ if (pflag) { if (setfile(curr->fts_statp, -1)) - rval = 1; + rval = 1; + if (preserve_dir_acls(curr->fts_statp, + curr->fts_accpath, to.p_path) != 0) + rval = 1; } else { mode = curr->fts_statp->st_mode; if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) || ==== //depot/projects/hammer/bin/cp/extern.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $FreeBSD: src/bin/cp/extern.h,v 1.19 2004/04/06 20:06:44 markm Exp $ + * $FreeBSD: src/bin/cp/extern.h,v 1.20 2005/09/05 04:36:08 csjp Exp $ */ typedef struct { @@ -46,5 +46,7 @@ int copy_link(const FTSENT *, int); int copy_special(struct stat *, int); int setfile(struct stat *, int); +int preserve_dir_acls(struct stat *, char *, char *); +int preserve_fd_acls(int, int); void usage(void); __END_DECLS ==== //depot/projects/hammer/bin/cp/utils.c#9 (text+ko) ==== @@ -33,8 +33,10 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.45 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.46 2005/09/05 04:36:08 csjp Exp $"); +#include <sys/types.h> +#include <sys/acl.h> #include <sys/param.h> #include <sys/stat.h> #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED @@ -204,6 +206,8 @@ if (pflag && setfile(fs, to_fd)) rval = 1; + if (pflag && preserve_fd_acls(from_fd, to_fd) != 0) + rval = 1; (void)close(from_fd); if (close(to_fd)) { warn("%s", to.p_path); @@ -326,6 +330,82 @@ return (rval); } +int +preserve_fd_acls(int source_fd, int dest_fd) +{ + struct acl *aclp; + acl_t acl; + + if (fpathconf(source_fd, _PC_ACL_EXTENDED) != 1 || + fpathconf(dest_fd, _PC_ACL_EXTENDED) != 1) + return (0); + acl = acl_get_fd(source_fd); + if (acl == NULL) { + warn("failed to get acl entries while setting %s", to.p_path); + return (1); + } + aclp = &acl->ats_acl; + if (aclp->acl_cnt == 3) + return (0); + if (acl_set_fd(dest_fd, acl) < 0) { + warn("failed to set acl entries for %s", to.p_path); + return (1); + } + return (0); +} + +int +preserve_dir_acls(struct stat *fs, char *source_dir, char *dest_dir) +{ + acl_t (*aclgetf)(const char *, acl_type_t); + int (*aclsetf)(const char *, acl_type_t, acl_t); + struct acl *aclp; + acl_t acl; + + if (pathconf(source_dir, _PC_ACL_EXTENDED) != 1 || + pathconf(dest_dir, _PC_ACL_EXTENDED) != 1) + return (0); + /* + * If the file is a link we will not follow it + */ + if (S_ISLNK(fs->st_mode)) { + aclgetf = acl_get_link_np; + aclsetf = acl_set_link_np; + } else { + aclgetf = acl_get_file; + aclsetf = acl_set_file; + } + /* + * Even if there is no ACL_TYPE_DEFAULT entry here, a zero + * size ACL will be returned. So it is not safe to simply + * check the pointer to see if the default ACL is present. + */ + acl = aclgetf(source_dir, ACL_TYPE_DEFAULT); + if (acl == NULL) { + warn("failed to get default acl entries on %s", + source_dir); + return (1); + } + aclp = &acl->ats_acl; + if (aclp->acl_cnt != 0 && aclsetf(dest_dir, + ACL_TYPE_DEFAULT, acl) < 0) { + warn("failed to set default acl entries on %s", + dest_dir); + return (1); + } + acl = aclgetf(source_dir, ACL_TYPE_ACCESS); + if (acl == NULL) { + warn("failed to get acl entries on %s", source_dir); + return (1); + } + aclp = &acl->ats_acl; + if (aclsetf(dest_dir, ACL_TYPE_ACCESS, acl) < 0) { + warn("failed to set acl entries on %s", dest_dir); + return (1); + } + return (0); +} + void usage(void) { ==== //depot/projects/hammer/bin/mv/mv.c#8 (text+ko) ==== @@ -42,8 +42,10 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.45 2005/05/19 21:33:48 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $"); +#include <sys/types.h> +#include <sys/acl.h> #include <sys/param.h> #include <sys/time.h> #include <sys/wait.h> @@ -252,6 +254,7 @@ static char *bp; mode_t oldmode; int nread, from_fd, to_fd; + acl_t acl; if ((from_fd = open(from, O_RDONLY, 0)) < 0) { warn("%s", from); @@ -288,7 +291,6 @@ (void)close(to_fd); return (1); } - (void)close(from_fd); oldmode = sbp->st_mode & ALLPERMS; if (fchown(to_fd, sbp->st_uid, sbp->st_gid)) { @@ -301,6 +303,21 @@ sbp->st_mode &= ~(S_ISUID | S_ISGID); } } + /* + * POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect + * for dest_file, then it's ACLs shall reflect the ACLs of the + * source_file. + */ + if (fpathconf(to_fd, _PC_ACL_EXTENDED) == 1 && + fpathconf(from_fd, _PC_ACL_EXTENDED) == 1) { + acl = acl_get_fd(from_fd); + if (acl == NULL) + warn("failed to get acl entries while setting %s", + from); + else if (acl_set_fd(to_fd, acl) < 0) + warn("failed to set acl entries for %s", to); + } + (void)close(from_fd); if (fchmod(to_fd, sbp->st_mode)) warn("%s: set mode (was: 0%03o)", to, oldmode); /* ==== //depot/projects/hammer/bin/sh/alias.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.19 2005/08/13 08:12:18 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.20 2005/09/02 22:43:28 stefanf Exp $"); #include <stdlib.h> #include "shell.h" @@ -242,7 +242,7 @@ } } for (i = 0; *argptr; argptr++) - i = unalias(*argptr); + i |= unalias(*argptr); return (i); } ==== //depot/projects/hammer/bin/sh/eval.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.42 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.43 2005/09/05 17:57:19 stefanf Exp $"); #include <paths.h> #include <signal.h> @@ -190,7 +190,7 @@ #ifndef NO_HISTORY displayhist = 1; /* show history substitutions done with fc */ #endif - TRACE(("evaltree(0x%lx: %d) called\n", (long)n, n->type)); + TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type)); switch (n->type) { case NSEMI: evaltree(n->nbinary.ch1, 0); @@ -457,7 +457,7 @@ int prevfd; int pip[2]; - TRACE(("evalpipe(0x%lx) called\n", (long)n)); + TRACE(("evalpipe(%p) called\n", (void *)n)); pipelen = 0; for (lp = n->npipe.cmdlist ; lp ; lp = lp->next) pipelen++; @@ -596,7 +596,7 @@ #endif /* First expand the arguments. */ - TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags)); + TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); setstackmark(&smark); arglist.lastp = &arglist.list; varlist.lastp = &varlist.list; ==== //depot/projects/hammer/bin/sh/jobs.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.68 2004/12/02 13:12:43 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.69 2005/09/05 17:57:19 stefanf Exp $"); #include <fcntl.h> #include <signal.h> @@ -647,7 +647,7 @@ jp->ps = &jp->ps0; } INTON; - TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs, + TRACE(("makejob(%p, %d) returns %%%d\n", (void *)node, nprocs, jp - jobtab + 1)); return jp; } @@ -733,7 +733,7 @@ pid_t pid; pid_t pgrp; - TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n, + TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; flushall(); ==== //depot/projects/hammer/bin/sh/sh.1#19 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.105 2005/08/29 21:28:12 jcamou Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.108 2005/09/06 16:08:37 rse Exp $ .\" -.Dd August 17, 2005 +.Dd September 3, 2005 .Dt SH 1 .Os .Sh NAME @@ -787,10 +787,15 @@ The syntax of the .Ic for command is: -.Dl Ic for Ar variable Ic in Ar word ... +.Dl Ic for Ar variable Op Ic in Ar word ... .Dl Ic do Ar list .Dl Ic done .Pp +If +.Ic in +and the following words are omitted, +.Ic in Li $@ +is used instead. The words are expanded, and then the list is executed repeatedly with the variable set to each word in turn. The @@ -2002,10 +2007,8 @@ If the .Fl S option is specified, the output is symbolic, otherwise the output is octal. -.It Ic unalias Oo Fl a Oc Op Ar name -If -.Ar name -is specified, the shell removes that alias. +.It Ic unalias Oo Fl a Oc Op Ar name ... +The specified alias names are removed. If .Fl a is specified, all aliases are removed. ==== //depot/projects/hammer/bin/sh/show.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.21 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.22 2005/09/02 22:28:27 stefanf Exp $"); #include <fcntl.h> #include <stdio.h> @@ -371,7 +371,6 @@ opentrace(void) { char s[100]; - char *getenv(); int flags; if (!debug) ==== //depot/projects/hammer/contrib/amd/amd/amd.8#6 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.20 2005/06/16 20:21:01 ru Exp $ +.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.22 2005/09/02 11:09:18 jcamou Exp $ .\" .Dd April 19, 1994 .Dt AMD 8 @@ -355,7 +355,7 @@ .%T Amd \- The 4.4 BSD Automounter .Re .Pp -.Pa http://www.cs.columbia.edu/~ezk/am-utils/ +.Pa http://www.am-utils.org/ .Sh HISTORY The .Nm amd @@ -365,7 +365,7 @@ .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. .Pp -.An Erez Zadok Aq ezk@cs.columbia.edu , +.An Erez Zadok Aq ezk@am-utils.org , Department of Computer Science, Columbia University, New York, USA. .Pp ==== //depot/projects/hammer/crypto/openssh/CREDITS#6 (text+ko) ==== @@ -3,6 +3,7 @@ Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de Raadt, and Dug Song - Creators of OpenSSH +Ahsan Rashid <arms@sco.com> - UnixWare long passwords Alain St-Denis <Alain.St-Denis@ec.gc.ca> - Irix fix Alexandre Oliva <oliva@lsd.ic.unicamp.br> - AIX fixes Andre Lucas <andre@ae-35.com> - new login code, many fixes @@ -32,6 +33,7 @@ David Hesprich <darkgrue@gue-tech.org> - Configure fixes David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes Dag-Erling Smørgrav <des at freebsd.org> - Challenge-Response PAM code. +Dhiraj Gulati <dgulati@sco.com> - UnixWare long passwords Ed Eden <ede370@stl.rural.usda.gov> - configure fixes Garrick James <garrick@james.net> - configure fixes Gary E. Miller <gem@rellim.com> - SCO support @@ -98,5 +100,5 @@ Damien Miller <djm@mindrot.org> -$Id: CREDITS,v 1.79 2004/05/26 23:59:31 dtucker Exp $ +$Id: CREDITS,v 1.80 2005/08/26 20:15:20 tim Exp $ ==== //depot/projects/hammer/crypto/openssh/ChangeLog#9 (text+ko) ==== @@ -1,3 +1,496 @@ +20050901 + - (djm) Update RPM spec file versions + +20050831 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2005/08/30 22:08:05 + [gss-serv.c sshconnect2.c] + destroy credentials if krb5_kuserok() call fails. Stops credentials being + delegated to users who are not authorised for GSSAPIAuthentication when + GSSAPIDeletegateCredentials=yes and another authentication mechanism + succeeds; bz#1073 reported by paul.moore AT centrify.com, fix by + simon AT sxw.org.uk, tested todd@ biorn@ jakob@; ok deraadt@ + - markus@cvs.openbsd.org 2005/08/31 09:28:42 + [version.h] + 4.2 + - (dtucker) [README] Update release note URL to 4.2 + - (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c + openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable + libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd(). + Feedback and OK dtucker@ + +20050830 + - (tim) [configure.ac] Back out last change. It needs to be done differently. + +20050829 + - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long + password support to 7.x for now. + +20050826 + - (tim) [CREDITS LICENCE auth.c configure.ac defines.h includes.h session.c + openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h + openbsd-compat/xcrypt.c] New files [openssh/openbsd-compat/port-uw.c + openssh/openbsd-compat/port-uw.h] Support long passwords (> 8-char) + on UnixWare 7 from Dhiraj Gulati and Ahsan Rashid. Cleanup and testing + by tim@. Feedback and OK dtucker@ + +20050823 + - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully- + qualified sshd pathname since some systems (eg Cygwin) may consider "/foo" + and "//foo" to be different. Spotted by vinschen at redhat.com. + - (tim) [configure.ac] Not all gcc's support -Wsign-compare. Enhancements + and OK dtucker@ + - (tim) [defines.h] PATH_MAX bits for OpenServer OK dtucker@ + +20050821 + - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for + LynxOS, patch from Olli Savia (ops at iki.fi). ok djm@ + +20050816 + - (djm) [ttymodes.c] bugzilla #1025: Fix encoding of _POSIX_VDISABLE, + from Jacob Nevins; ok dtucker@ + +20050815 + - (tim) [sftp.c] wrap el_end() in #ifdef USE_LIBEDIT + - (tim) [configure.ac] corrections to libedit tests. Report and patches + by skeleten AT shillest.net + +20050812 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2005/07/28 17:36:22 + [packet.c] + missing packet_init_compression(); from solar + - djm@cvs.openbsd.org 2005/07/30 01:26:16 + [ssh.c] + fix -D listen_host initialisation, so it picks up gateway_ports setting + correctly + - djm@cvs.openbsd.org 2005/07/30 02:03:47 + [readconf.c] + listen_hosts initialisation here too; spotted greg AT y2005.nest.cx + - dtucker@cvs.openbsd.org 2005/08/06 10:03:12 + [servconf.c] + Unbreak sshd ListenAddress for bare IPv6 addresses. + Report from Janusz Mucka; ok djm@ + - jaredy@cvs.openbsd.org 2005/08/08 13:22:48 + [sftp.c] + sftp prompt enhancements: + - in non-interactive mode, do not print an empty prompt at the end + before finishing + - print newline after EOF in editline mode + - call el_end() in editline mode + ok dtucker djm + +20050810 + - (dtucker) [configure.ac] Test libedit library and headers for compatibility. + Report from skeleten AT shillest.net, ok djm@ + - (dtucker) [LICENCE configure.ac defines.h openbsd-compat/realpath.c] + Sync current (thread-safe) version of realpath.c from OpenBSD (which is + in turn based on FreeBSD's). ok djm@ + +20050809 + - (tim) [configure.ac] Allow --with-audit=no. OK dtucker@ + Report by skeleten AT shillest.net + +20050803 + - (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines + individually and use a value less likely to collide with real values from + netdb.h. Fixes compile warnings on FreeBSD 5.3. ok djm@ + - (dtucker) [openbsd-compat/fake-rfc2553.h] MAX_INT -> INT_MAX since the + latter is specified in the standard. + +20050802 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2005/07/27 10:39:03 + [scp.c hostfile.c sftp-client.c] + Silence bogus -Wuninitialized warnings; ok djm@ + - (dtucker) [configure.ac] Enable -Wuninitialized by default when compiling + with gcc. ok djm@ + - (dtucker) [configure.ac] Add a --with-Werror option to configure for + adding -Werror to CFLAGS when all of the configure tests are done. ok djm@ + +20050726 + - (dtucker) [configure.ac] Update zlib warning message too, pointed out by + tim@. + - (djm) OpenBSD CVS Sync + - otto@cvs.openbsd.org 2005/07/19 15:32:26 + [auth-passwd.c] + auth_usercheck(3) can return NULL, so check for that. Report from + mpech@. ok markus@ + - markus@cvs.openbsd.org 2005/07/25 11:59:40 + [kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c] + [sshconnect2.c sshd.c sshd_config sshd_config.5] + add a new compression method that delays compression until the user + has been authenticated successfully and set compression to 'delayed' + for sshd. + this breaks older openssh clients (< 3.5) if they insist on + compression, so you have to re-enable compression in sshd_config. + ok djm@ + +20050725 + - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. + +20050717 +- OpenBSD CVS Sync + - djm@cvs.openbsd.org 2005/07/16 01:35:24 + [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] + [sshconnect.c] + spacing + - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c] + [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL + in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]") + - (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line + - djm@cvs.openbsd.org 2005/07/17 06:49:04 + [channels.c channels.h session.c session.h] + Fix a number of X11 forwarding channel leaks: + 1. Refuse multiple X11 forwarding requests on the same session + 2. Clean up all listeners after a single_connection X11 forward, not just + the one that made the single connection + 3. Destroy X11 listeners when the session owning them goes away + testing and ok dtucker@ + - djm@cvs.openbsd.org 2005/07/17 07:17:55 + [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] + [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] + [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] + [sshconnect.c sshconnect2.c] + knf says that a 2nd level indent is four (not three or five) spaces + -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] + [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too + - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls + +20050716 + - (dtucker) [auth-pam.c] Ensure that only one side of the authentication + socketpair stays open on in both the monitor and PAM process. Patch from + Joerg Sonnenberger. + +20050714 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2005/07/06 09:33:05 + [ssh.1] + clarify meaning of ssh -b ; with & ok jmc@ + - dtucker@cvs.openbsd.org 2005/07/08 09:26:18 + [misc.c] + Make comment match code; ok djm@ + - markus@cvs.openbsd.org 2005/07/08 09:41:33 + [channels.h] + race when efd gets closed while there is still buffered data: + change CHANNEL_EFD_OUTPUT_ACTIVE() + 1) c->efd must always be valid AND + 2a) no EOF has been seen OR + 2b) there is buffered data + report, initial fix and testing Chuck Cranor + - dtucker@cvs.openbsd.org 2005/07/08 10:20:41 + [ssh_config.5] + change BindAddress to match recent ssh -b change; prompted by markus@ + - jmc@cvs.openbsd.org 2005/07/08 12:53:10 + [ssh_config.5] + new sentence, new line; + - dtucker@cvs.openbsd.org 2005/07/14 04:00:43 + [misc.h] + use __sentinel__ attribute; ok deraadt@ djm@ markus@ + - (dtucker) [configure.ac defines.h] Define __sentinel__ to nothing if the + compiler doesn't understand it to prevent warnings. If any mainstream + compiler versions acquire it we can test for those versions. Based on + discussion with djm@. + +20050707 + - dtucker [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for + the MIT Kerberos code path into a common function and expand mkstemp + template to be consistent with the rest of OpenSSH. From sxw at + inf.ed.ac.uk, ok djm@ + - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno + in the case where the buffer is insufficient, so always return ENOMEM. + Also pointed out by sxw at inf.ed.ac.uk. + - (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove + calls to krb5_init_ets, which has not been required since krb-1.1.x and + most Kerberos versions no longer export in their public API. From sxw + at inf.ed.ac.uk, ok djm@ + +20050706 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2005/07/01 13:19:47 + [channels.c] + don't free() if getaddrinfo() fails; report mpech@ + - djm@cvs.openbsd.org 2005/07/04 00:58:43 + [channels.c clientloop.c clientloop.h misc.c misc.h ssh.c ssh_config.5] + implement support for X11 and agent forwarding over multiplex slave + connections. Because of protocol limitations, the slave connections inherit + the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding + their own. + ok dtucker@ "put it in" deraadt@ + - jmc@cvs.openbsd.org 2005/07/04 11:29:51 + [ssh_config.5] + fix Xr and a little grammar; + - markus@cvs.openbsd.org 2005/07/04 14:04:11 + [channels.c] + don't forget to set x11_saved_display + +20050626 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2005/06/17 22:53:47 + [ssh.c sshconnect.c] + Fix ControlPath's %p expanding to "0" for a default port, + spotted dwmw2 AT infradead.org; ok markus@ + - djm@cvs.openbsd.org 2005/06/18 04:30:36 + [ssh.c ssh_config.5] + allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@ + - djm@cvs.openbsd.org 2005/06/25 22:47:49 + [ssh.c] + do the default port filling code a few lines earlier, so it really + does fix %p + +20050618 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2005/05/20 12:57:01; + [auth1.c] split protocol 1 auth methods into separate functions, makes + authloop much more readable; fixes and ok markus@ (portable ok & + polish dtucker@) + - djm@cvs.openbsd.org 2005/06/17 02:44:33 + [auth1.c] make this -Wsign-compare clean; ok avsm@ markus@ + - (djm) [loginrec.c ssh-rand-helper.c] Fix -Wsign-compare for portable, + tested and fixes tim@ + +20050617 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2005/06/16 03:38:36 + [channels.c channels.h clientloop.c clientloop.h ssh.c] + move x11_get_proto from ssh.c to clientloop.c, to make muliplexed xfwd + easier later; ok deraadt@ + - markus@cvs.openbsd.org 2005/06/16 08:00:00 + [canohost.c channels.c sshd.c] + don't exit if getpeername fails for forwarded ports; bugzilla #1054; + ok djm + - djm@cvs.openbsd.org 2005/06/17 02:44:33 + [auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c] + [bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c] + [kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c] + [servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c] + [ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c] + make this -Wsign-compare clean; ok avsm@ markus@ + NB. auth1.c changes not committed yet (conflicts with uncommitted sync) + NB2. more work may be needed to make portable Wsign-compare clean + - (dtucker) [cipher.c openbsd-compat/openbsd-compat.h + openbsd-compat/openssl-compat.c] only include openssl compat stuff where + it's needed as it can cause conflicts elsewhere (eg xcrypt.c). Found by + and ok tim@ + +20050616 + - (djm) OpenBSD CVS Sync + - jaredy@cvs.openbsd.org 2005/06/07 13:25:23 + [progressmeter.c] + catch SIGWINCH and resize progress meter accordingly; ok markus dtucker + - djm@cvs.openbsd.org 2005/06/06 11:20:36 + [auth.c auth.h misc.c misc.h ssh.c ssh_config.5 sshconnect.c] + introduce a generic %foo expansion function. replace existing % expansion + and add expansion to ControlPath; ok markus@ + - djm@cvs.openbsd.org 2005/06/08 03:50:00 + [ssh-keygen.1 ssh-keygen.c sshd.8] + increase default rsa/dsa key length from 1024 to 2048 bits; + ok markus@ deraadt@ + - djm@cvs.openbsd.org 2005/06/08 11:25:09 + [clientloop.c readconf.c readconf.h ssh.c ssh_config.5] + add ControlMaster=auto/autoask options to support opportunistic + multiplexing; tested avsm@ and jakob@, ok markus@ + - dtucker@cvs.openbsd.org 2005/06/09 13:43:49 + [cipher.c] >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509061809.j86I9fAp043903>