Date: Sun, 24 Nov 2002 23:27:13 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21480 for review Message-ID: <200211250727.gAP7RDGP050984@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21480 Change 21480 by peter@peter_daintree on 2002/11/24 23:26:53 IFC @21469 Affected files ... .. //depot/projects/ia64/crypto/heimdal/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/NEWS#4 integrate .. //depot/projects/ia64/crypto/heimdal/aclocal.m4#5 integrate .. //depot/projects/ia64/crypto/heimdal/admin/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/admin/ktutil.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/common/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kf.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kfd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/pfrom.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/push.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rcp/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/telnet.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/test/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/cf/sunos.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/config.guess#4 integrate .. //depot/projects/ia64/crypto/heimdal/config.sub#4 integrate .. //depot/projects/ia64/crypto/heimdal/configure#5 integrate .. //depot/projects/ia64/crypto/heimdal/configure.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/doc/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/include/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/include/kadm5/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/include/make_crypto.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/install-sh#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadm_conn.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmin.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.8#4 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/server.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/version4.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/connect.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hprop.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hpropd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kaserver.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kstash.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/string2key.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswd.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswdd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kdestroy.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kgetcred.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.1#5 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/45/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/pam/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/sia/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ChangeLog#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ipropd_slave.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/kafs.cat3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/changepw.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/context.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_any.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_file.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_keyfile.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_appdefault.3#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/kuserok.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/principal.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/prompter_posix.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store_emem.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/resolve.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/sl/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/missing#3 integrate .. //depot/projects/ia64/crypto/heimdal/mkinstalldirs#3 integrate .. //depot/projects/ia64/crypto/heimdal/tools/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/tools/krb5-config.cat1#3 integrate .. //depot/projects/ia64/kerberos5/include/config.h#6 integrate .. //depot/projects/ia64/kerberos5/include/version.h#6 integrate .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#8 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_switch.S#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#14 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#10 integrate .. //depot/projects/ia64/share/examples/Makefile#7 integrate .. //depot/projects/ia64/share/man/man4/Makefile#23 integrate .. //depot/projects/ia64/share/man/man4/syncache.4#1 branch .. //depot/projects/ia64/sys/boot/efi/loader/main.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#21 integrate .. //depot/projects/ia64/sys/conf/options.ia64#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#4 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#16 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbreg.h#5 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#56 integrate .. //depot/projects/ia64/sys/ia64/ia64/mca.c#7 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#9 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#27 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#27 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#10 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#12 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#21 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#20 integrate .. //depot/projects/ia64/tools/KSE/ksetest/kse_asm.S#4 integrate Differences ... ==== //depot/projects/ia64/crypto/heimdal/ChangeLog#5 (text+ko) ==== @@ -1,18 +1,43 @@ -2002-09-16 Jacques Vidrine <nectar@kth.se> +2002-10-21 Johan Danielsson <joda@pdc.kth.se> + + * lib/krb5/store_emem.c: pull up 1.13; limit how much we allocate + + * lib/krb5/principal.c: pull up 1.82; don't allow trailing + backslashes in components + + * lib/krb5/keytab_keyfile.c: pull up 1.15; more strcspn + + * lib/krb5/keytab_any.c: pull up 1.7; properly close the open + keytabs + + * kdc/connect.c: pull up 1.87; check that %-quotes are followed by + two hex digits + + * lib/krb5/prompter_posix.c: pull up 1.7; use strcspn to convert + the newline to NUL in fgets results. + + * lib/krb5/kuserok.c: pull up 1.6; use strcspn to convert the + newline to NUL in fgets results. + + * lib/krb5/keytab_file.c: pull up 1.12; check return value from + start_seq_get - * lib/krb5/kuserok.c, lib/krb5/prompter_posix.c: use strcspn - to convert the newline to NUL in fgets results. + * lib/krb5/context.c: pull up 1.82; return ENXIO instead of ENOENT + when "unconfigured" -2002-09-13 Johan Danielsson <joda@pdc.kth.se> + * lib/krb5/changepw.c: pull up 1.38; fix reply length check + calculation - * kuser/kinit.1: remove unneeded Ns + * kuser/klist.c: pull up 1.68; allow tokens up to size of buffer - * lib/krb5/krb5_appdefault.3: remove extra "application" + * kdc/kaserver.c: pull up 1.21; make sure life is positive - * fix-export: remove autom4ate.cache + * fix-export: pull up 1.28; remove autom4ate.cache 2002-09-10 Johan Danielsson <joda@pdc.kth.se> + * Release 0.5 + * include/make_crypto.c: don't use function macros if possible * lib/krb5/krb5_locl.h: get limits.h for UINT_MAX ==== //depot/projects/ia64/crypto/heimdal/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -237,9 +236,6 @@ .SUFFIXES: .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile @@ -375,7 +371,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -489,7 +485,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -499,7 +495,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f config.status config.cache config.log distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -524,8 +520,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive ==== //depot/projects/ia64/crypto/heimdal/NEWS#4 (text+ko) ==== @@ -1,3 +1,17 @@ +Changes in release 0.5.1 + + * kadmind: fix remote exploit + + * kadmind: add option to disable kerberos 4 + + * kdc: make sure kaserver token life is positive + + * telnet: use the session key if there is no subkey + + * fix EPSV parsing in ftp + + * other bug fixes + Changes in release 0.5 * add --detach option to kdc ==== //depot/projects/ia64/crypto/heimdal/aclocal.m4#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# aclocal.m4t generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# aclocal.m4t generated automatically by aclocal 1.6.1 -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -241,7 +241,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.3])]) + [AM_AUTOMAKE_VERSION([1.6.1])]) # Helper functions for option handling. -*- Autoconf -*- @@ -573,7 +573,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -698,13 +698,7 @@ [for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6725,7 +6719,7 @@ ]) dnl -dnl $Id: sunos.m4,v 1.1 2002/08/28 19:53:51 joda Exp $ +dnl $Id: sunos.m4,v 1.1.4.1 2002/10/21 14:29:36 joda Exp $ dnl AC_DEFUN([rk_SUNOS],[ @@ -6737,7 +6731,7 @@ *-*-solaris2.7) sunos=57 ;; -*-*-solaris2.[89]) +*-*-solaris2.[[89]]) sunos=58 ;; *-*-solaris2*) ==== //depot/projects/ia64/crypto/heimdal/admin/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -283,7 +282,8 @@ if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \ else :; fi; \ @@ -292,17 +292,14 @@ uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ rm -f $(DESTDIR)$(sbindir)/$$f; \ done clean-sbinPROGRAMS: - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) ktutil$(EXEEXT): $(ktutil_OBJECTS) $(ktutil_DEPENDENCIES) @rm -f ktutil$(EXEEXT) $(LINK) $(ktutil_LDFLAGS) $(ktutil_OBJECTS) $(ktutil_LDADD) $(LIBS) @@ -347,10 +344,6 @@ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -416,7 +409,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -466,7 +459,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/admin/ktutil.cat8#3 (text+ko) ==== @@ -1,11 +1,11 @@ -KTUTIL(8) FreeBSD System Manager's Manual KTUTIL(8) +KTUTIL(8) NetBSD System Manager's Manual KTUTIL(8) NNAAMMEE kkttuuttiill - manage Kerberos keytabs SSYYNNOOPPSSIISS - kkttuuttiill [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--vv | ----vveerrbboossee] [----vveerrssiioonn] - [--hh | ----hheellpp] _c_o_m_m_a_n_d [_a_r_g_s] + kkttuuttiill [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--vv | ----vveerrbboossee] [----vveerrssiioonn] [--hh | + ----hheellpp] _c_o_m_m_a_n_d [_a_r_g_s] DDEESSCCRRIIPPTTIIOONN kkttuuttiill is a program for managing keytabs. _c_o_m_m_a_n_d can be one of the fol- @@ -47,13 +47,13 @@ remove [--pp _p_r_i_n_c_i_p_a_l] [----pprriinncciippaall==_p_r_i_n_c_i_p_a_l] [--VV --kkvvnnoo] [----kkvvnnoo==_k_v_n_o] [--ee --eennccttyyppee] [----eennccttyyppee==_e_n_c_t_y_p_e] - Removes the specified key or keys. Not specifying a _k_v_n_o - removes keys with any version number. Not specifying a - _e_n_c_t_y_p_e removes keys of any type. + Removes the specified key or keys. Not specifying a _k_v_n_o re- + moves keys with any version number. Not specifying a _e_n_c_t_y_p_e + removes keys of any type. rename _f_r_o_m_-_p_r_i_n_c_i_p_a_l _t_o_-_p_r_i_n_c_i_p_a_l - Renames all entries in the keytab that match the - _f_r_o_m_-_p_r_i_n_c_i_p_a_l to _t_o_-_p_r_i_n_c_i_p_a_l. + Renames all entries in the keytab that match the _f_r_o_m_- + _p_r_i_n_c_i_p_a_l to _t_o_-_p_r_i_n_c_i_p_a_l. purge [----aaggee==_a_g_e] Removes all old entries (for which there is a newer version) @@ -78,4 +78,4 @@ SSEEEE AALLSSOO kadmin(8) -HEIMDAL December 16, 2000 HEIMDAL + HEIMDAL December 16, 2000 2 ==== //depot/projects/ia64/crypto/heimdal/appl/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -365,7 +364,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -427,7 +426,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/afsutil/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -280,7 +279,8 @@ if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -289,17 +289,14 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) afslog$(EXEEXT): $(afslog_OBJECTS) $(afslog_DEPENDENCIES) @rm -f afslog$(EXEEXT) $(LINK) $(afslog_LDFLAGS) $(afslog_OBJECTS) $(afslog_LDADD) $(LIBS) @@ -373,7 +370,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -423,7 +420,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,7 @@ +2002-10-21 Johan Danielsson <joda@pdc.kth.se> + + * ftp/ftp.c: pull up 1.75; fix parsing of epsv ports + 2002-09-05 Johan Danielsson <joda@pdc.kth.se> * ftp/security.c (sec_vfprintf): free encoded data ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -346,7 +345,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -408,7 +407,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/common/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -324,7 +323,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -373,7 +372,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -300,7 +299,8 @@ if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -309,17 +309,14 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ftp$(EXEEXT): $(ftp_OBJECTS) $(ftp_DEPENDENCIES) @rm -f ftp$(EXEEXT) $(LINK) $(ftp_LDFLAGS) $(ftp_OBJECTS) $(ftp_LDADD) $(LIBS) @@ -364,10 +361,6 @@ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -433,7 +426,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -483,7 +476,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "ftp_locl.h" -RCSID ("$Id: ftp.c,v 1.74 2002/09/04 22:00:12 joda Exp $"); +RCSID ("$Id: ftp.c,v 1.74.4.1 2002/10/21 14:26:31 joda Exp $"); struct sockaddr_storage hisctladdr_ss; struct sockaddr *hisctladdr = (struct sockaddr *)&hisctladdr_ss; @@ -396,6 +396,9 @@ if (p) { p++; strlcpy(pasv, p, sizeof(pasv)); + p = strrchr(pasv, ')'); + if (p) + *p = '\0'; } } return code / 100; ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.cat1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -FTP(1) FreeBSD General Commands Manual FTP(1) +FTP(1) NetBSD Reference Manual FTP(1) NNAAMMEE ffttpp - ARPANET file transfer program @@ -23,8 +23,8 @@ server, as well as report on data transfer statistics. --nn Restrains ffttpp from attempting ``auto-login'' upon initial connec- - tion. If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see - below) file in the user's home directory for an entry describing an + tion. If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see be- + low) file in the user's home directory for an entry describing an account on the remote machine. If no entry exists, ffttpp will prompt for the remote machine login name (default is the user identity on the local machine), and, if necessary, prompt for a password and an @@ -44,8 +44,8 @@ command line. If this is done, ffttpp will immediately attempt to establish a connection to an FTP server on that host; otherwise, ffttpp will enter its command interpreter and await instructions from the user. When ffttpp is - awaiting commands from the user the prompt `ftp>' is provided to the - user. The following commands are recognized by ffttpp: + awaiting commands from the user the prompt `ftp>' is provided to the us- + er. The following commands are recognized by ffttpp: !! [_c_o_m_m_a_n_d [_a_r_g_s]] Invoke an interactive shell on the local machine. If there @@ -69,8 +69,8 @@ or nnmmaapp setting. File transfer uses the current settings for ttyyppee, ffoorrmmaatt, mmooddee, and ssttrruuccttuurree. - aasscciiii Set the file transfer ttyyppee to network ASCII. This is the - default type. + aasscciiii Set the file transfer ttyyppee to network ASCII. This is the de- + fault type. bbeellll Arrange that a bell be sounded after each file transfer com- mand is completed. @@ -78,8 +78,8 @@ bbiinnaarryy Set the file transfer ttyyppee to support binary image transfer. bbyyee Terminate the FTP session with the remote server and exit - ffttpp. An end of file will also terminate the session and - exit. + ffttpp. An end of file will also terminate the session and ex- + it. ccaassee Toggle remote computer file name case mapping during mmggeett commands. When ccaassee is on (default is off), remote computer @@ -87,21 +87,21 @@ local directory with the letters mapped to lower case. ccdd _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y - Change the working directory on the remote machine to - _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y. + Change the working directory on the remote machine to _r_e_m_o_t_e_- + _d_i_r_e_c_t_o_r_y. ccdduupp Change the remote machine working directory to the parent of the current remote machine working directory. cchhmmoodd _m_o_d_e _f_i_l_e_-_n_a_m_e - Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the - remote sytem to _m_o_d_e. + Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the re- + mote sytem to _m_o_d_e. cclloossee Terminate the FTP session with the remote server, and return to the command interpreter. Any defined macros are erased. - ccrr Toggle carriage return stripping during ascii type file - retrieval. Records are denoted by a carriage return/linefeed + ccrr Toggle carriage return stripping during ascii type file re- + trieval. Records are denoted by a carriage return/linefeed sequence during ascii type file transfer. When ccrr is on (the default), carriage returns are stripped from this sequence to conform with the UNIX single linefeed record delimiter. @@ -125,9 +125,9 @@ _l_o_c_a_l_-_f_i_l_e. If interactive prompting is on, ffttpp will prompt the user to verify that the last argument is indeed the tar- get local file for receiving ddiirr output. If no directory is - specified, the current working directory on the remote - machine is used. If no local file is specified, or - _l_o_c_a_l_-_f_i_l_e is --, output comes to the terminal. + specified, the current working directory on the remote ma- + chine is used. If no local file is specified, or _l_o_c_a_l_-_f_i_l_e + is --, output comes to the terminal. ddiissccoonnnneecctt A synonym for _c_l_o_s_e. @@ -153,12 +153,12 @@ exact result depends on the foreign operating system and ftp server, and can be previewed by doing `mls remote-files -'. As a security measure, remotely globbed files that starts - with `/' or contains `../', will not be automatically - received. If you have interactive prompting turned off, these + with `/' or contains `../', will not be automatically re- + ceived. If you have interactive prompting turned off, these filenames will be ignored. Note: mmggeett and mmppuutt are not meant to transfer entire directory subtrees of files. That can be - done by transferring a tar(1) archive of the subtree (in - binary mode). + done by transferring a tar(1) archive of the subtree (in bi- + nary mode). hhaasshh Toggle hash-sign (``#'') printing for each data block trans- ferred. The size of a data block is 1024 bytes. @@ -182,7 +182,7 @@ machine. The listing includes any system-dependent informa- tion that the server chooses to include; for example, most UNIX systems will produce output from the command `ls -l'. - (See also nnlliisstt.) If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, + (See also nnlliisstt.) If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the current working directory is used. If interactive prompting is on, ffttpp will prompt the user to verify that the last argument is indeed the target local file for receiving @@ -194,18 +194,17 @@ _m_a_c_r_o_-_n_a_m_e; a null line (consecutive newline characters in a file or carriage returns from the terminal) terminates macro input mode. There is a limit of 16 macros and 4096 total - characters in all defined macros. Macros remain defined - until a cclloossee command is executed. The macro processor - interprets `$' and `\' as special characters. A `$' followed - by a number (or numbers) is replaced by the corresponding - argument on the macro invocation command line. A `$' fol- - lowed by an `i' signals that macro processor that the execut- - ing macro is to be looped. On the first pass `$i' is - replaced by the first argument on the macro invocation com- - mand line, on the second pass it is replaced by the second - argument, and so on. A `\' followed by any character is - replaced by that character. Use the `\' to prevent special - treatment of the `$'. + characters in all defined macros. Macros remain defined un- + til a cclloossee command is executed. The macro processor inter- + prets `$' and `\' as special characters. A `$' followed by a + number (or numbers) is replaced by the corresponding argument + on the macro invocation command line. A `$' followed by an + `i' signals that macro processor that the executing macro is + to be looped. On the first pass `$i' is replaced by the + first argument on the macro invocation command line, on the + second pass it is replaced by the second argument, and so on. + A `\' followed by any character is replaced by that charac- + ter. Use the `\' to prevent special treatment of the `$'. mmddeelleettee [_r_e_m_o_t_e_-_f_i_l_e_s] Delete the _r_e_m_o_t_e_-_f_i_l_e_s on the remote machine. @@ -240,8 +239,8 @@ ``stream'' mode. mmooddttiimmee _f_i_l_e_-_n_a_m_e - Show the last modification time of the file on the remote - machine. + Show the last modification time of the file on the remote ma- + chine. mmppuutt _l_o_c_a_l_-_f_i_l_e_s Expand wild cards in the list of local files given as argu- @@ -257,20 +256,20 @@ _g_e_t. nnlliisstt [_r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y] [_l_o_c_a_l_-_f_i_l_e] - Print a list of the files in a directory on the remote - machine. If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the cur- - rent working directory is used. If interactive prompting is - on, ffttpp will prompt the user to verify that the last argument - is indeed the target local file for receiving nnlliisstt output. - If no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the - output is sent to the terminal. + Print a list of the files in a directory on the remote ma- + chine. If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the current + working directory is used. If interactive prompting is on, + ffttpp will prompt the user to verify that the last argument is + indeed the target local file for receiving nnlliisstt output. If + no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the output + is sent to the terminal. nnmmaapp [_i_n_p_a_t_t_e_r_n _o_u_t_p_a_t_t_e_r_n] Set or unset the filename mapping mechanism. If no arguments are specified, the filename mapping mechanism is unset. If arguments are specified, remote filenames are mapped during - mmppuutt commands and ppuutt commands issued without a specified - remote target filename. If arguments are specified, local + mmppuutt commands and ppuutt commands issued without a specified re- + mote target filename. If arguments are specified, local filenames are mapped during mmggeett commands and ggeett commands issued without a specified local target filename. This com- mand is useful when connecting to a non-UNIX remote computer @@ -281,24 +280,24 @@ settings). Variable templating is accomplished by including the sequences `$1', `$2', ..., `$9' in _i_n_p_a_t_t_e_r_n. Use `\' to prevent this special treatment of the `$' character. All - other characters are treated literally, and are used to - determine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values. For example, + other characters are treated literally, and are used to de- + termine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values. For example, given _i_n_p_a_t_t_e_r_n $1.$2 and the remote file name "mydata.data", $1 would have the value "mydata", and $2 would have the value "data". The _o_u_t_p_a_t_t_e_r_n determines the resulting mapped file- name. The sequences `$1', `$2', ...., `$9' are replaced by - any value resulting from the _i_n_p_a_t_t_e_r_n template. The - sequence `$0' is replace by the original filename. Addition- - ally, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if - _s_e_q_1 is not a null string; otherwise it is replaced by _s_e_q_2. - For example, the command + any value resulting from the _i_n_p_a_t_t_e_r_n template. The se- + quence `$0' is replace by the original filename. Additional- + ly, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if _s_e_q_1 + is not a null string; otherwise it is replaced by _s_e_q_2. For + example, the command nmap $1.$2.$3 [$1,$2].[$2,file] would yield the output filename "myfile.data" for input file- names "myfile.data" and "myfile.data.old", "myfile.file" for - the input filename "myfile", and "myfile.myfile" for the - input filename ".myfile". Spaces may be included in + the input filename "myfile", and "myfile.myfile" for the in- + put filename ".myfile". Spaces may be included in _o_u_t_p_a_t_t_e_r_n, as in the example: `nmap $1 sed "s/ *$//" > $1' . Use the `\' character to prevent special treatment of the `$','[','[', and `,' characters. @@ -309,8 +308,8 @@ lation mechanism is unset. If arguments are specified, char- acters in remote filenames are translated during mmppuutt com- mands and ppuutt commands issued without a specified remote tar- - get filename. If arguments are specified, characters in - local filenames are translated during mmggeett commands and ggeett + get filename. If arguments are specified, characters in lo- + cal filenames are translated during mmggeett commands and ggeett commands issued without a specified local target filename. This command is useful when connecting to a non-UNIX remote computer with different file naming conventions or practices. @@ -322,9 +321,9 @@ ooppeenn _h_o_s_t [_p_o_r_t] Establish a connection to the specified _h_o_s_t FTP server. An optional port number may be supplied, in which case, ffttpp will - attempt to contact an FTP server at that port. If the - aauuttoo--llooggiinn option is on (default), ffttpp will also attempt to - automatically log the user in to the FTP server (see below). + attempt to contact an FTP server at that port. If the aauuttoo-- >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211250727.gAP7RDGP050984>