diff options
Diffstat (limited to 'crypto/heimdal/kuser')
-rw-r--r-- | crypto/heimdal/kuser/Makefile.in | 29 | ||||
-rw-r--r-- | crypto/heimdal/kuser/kdestroy.cat1 | 6 | ||||
-rw-r--r-- | crypto/heimdal/kuser/kgetcred.cat1 | 4 | ||||
-rw-r--r-- | crypto/heimdal/kuser/kinit.1 | 4 | ||||
-rw-r--r-- | crypto/heimdal/kuser/kinit.cat1 | 14 | ||||
-rw-r--r-- | crypto/heimdal/kuser/klist.c | 4 | ||||
-rw-r--r-- | crypto/heimdal/kuser/klist.cat1 | 13 |
7 files changed, 31 insertions, 43 deletions
diff --git a/crypto/heimdal/kuser/Makefile.in b/crypto/heimdal/kuser/Makefile.in index 5f8a99c..89ca1b7 100644 --- a/crypto/heimdal/kuser/Makefile.in +++ b/crypto/heimdal/kuser/Makefile.in @@ -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_PROGRAM = @INSTALL_PROGRAM@ 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@ @@ -325,7 +324,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) 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; \ @@ -334,24 +334,17 @@ install-binPROGRAMS: $(bin_PROGRAMS) 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) clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) generate-requests$(EXEEXT): $(generate_requests_OBJECTS) $(generate_requests_DEPENDENCIES) @rm -f generate-requests$(EXEEXT) $(LINK) $(generate_requests_LDFLAGS) $(generate_requests_OBJECTS) $(generate_requests_LDADD) $(LIBS) @@ -414,10 +407,6 @@ install-man1: $(man1_MANS) $(man_MANS) 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; \ @@ -483,7 +472,7 @@ top_distdir = .. 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 \ @@ -533,7 +522,7 @@ mostlyclean-generic: 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" diff --git a/crypto/heimdal/kuser/kdestroy.cat1 b/crypto/heimdal/kuser/kdestroy.cat1 index 85fbaa4..8f7247b 100644 --- a/crypto/heimdal/kuser/kdestroy.cat1 +++ b/crypto/heimdal/kuser/kdestroy.cat1 @@ -1,11 +1,11 @@ -KDESTROY(1) FreeBSD General Commands Manual KDESTROY(1) +KDESTROY(1) NetBSD Reference Manual KDESTROY(1) NNAAMMEE kkddeessttrrooyy - destroy the current ticket file SSYYNNOOPPSSIISS kkddeessttrrooyy [--cc _c_a_c_h_e_f_i_l_e] [----ccaacchhee==_c_a_c_h_e_f_i_l_e] [----nnoo--uunnlloogg] [----nnoo--ddeelleettee--vv44] - [----vveerrssiioonn] [----hheellpp] + [----vveerrssiioonn] [----hheellpp] DDEESSCCRRIIPPTTIIOONN kkddeessttrrooyy remove the current set of tickets. @@ -26,4 +26,4 @@ DDEESSCCRRIIPPTTIIOONN SSEEEE AALLSSOO kinit(1), klist(1) -HEIMDAL August 27, 1997 HEIMDAL + HEIMDAL August 27, 1997 1 diff --git a/crypto/heimdal/kuser/kgetcred.cat1 b/crypto/heimdal/kuser/kgetcred.cat1 index ea01d25..f01ed61 100644 --- a/crypto/heimdal/kuser/kgetcred.cat1 +++ b/crypto/heimdal/kuser/kgetcred.cat1 @@ -1,4 +1,4 @@ -KGETCRED(1) FreeBSD General Commands Manual KGETCRED(1) +KGETCRED(1) NetBSD Reference Manual KGETCRED(1) NNAAMMEE kkggeettccrreedd - get a ticket for a particular service @@ -23,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN SSEEEE AALLSSOO kinit(1), klist(1) -HEIMDAL May 14, 1999 HEIMDAL + HEIMDAL May 14, 1999 1 diff --git a/crypto/heimdal/kuser/kinit.1 b/crypto/heimdal/kuser/kinit.1 index f020b61..59c2e63 100644 --- a/crypto/heimdal/kuser/kinit.1 +++ b/crypto/heimdal/kuser/kinit.1 @@ -1,4 +1,4 @@ -.\" $Id: kinit.1,v 1.21 2002/09/13 14:50:27 joda Exp $ +.\" $Id: kinit.1,v 1.20 2002/08/28 16:09:36 joda Exp $ .\" .Dd May 29, 1998 .Dt KINIT 1 @@ -91,7 +91,7 @@ Get ticket that can be forwarded to another host. Don't ask for a password, but instead get the key from the specified keytab. .It Xo -.Fl l Ar time , +.Fl l Ar time Ns , .Fl -lifetime= Ns Ar time .Xc Specifies the lifetime of the ticket. The argument can either be in diff --git a/crypto/heimdal/kuser/kinit.cat1 b/crypto/heimdal/kuser/kinit.cat1 index d30f608..c71feb2 100644 --- a/crypto/heimdal/kuser/kinit.cat1 +++ b/crypto/heimdal/kuser/kinit.cat1 @@ -1,4 +1,4 @@ -KINIT(1) FreeBSD General Commands Manual KINIT(1) +KINIT(1) NetBSD Reference Manual KINIT(1) NNAAMMEE kkiinniitt kkaauutthh - acquire initial tickets @@ -8,9 +8,9 @@ SSYYNNOOPPSSIISS ----ccaacchhee==_c_a_c_h_e_n_a_m_e] [--ff | ----ffoorrwwaarrddaabbllee] [--tt _k_e_y_t_a_b_n_a_m_e | ----kkeeyyttaabb==_k_e_y_t_a_b_n_a_m_e] [--ll _t_i_m_e | ----lliiffeettiimmee==_t_i_m_e] [--pp | ----pprrooxxiiaabbllee] [--RR | ----rreenneeww] [----rreenneewwaabbllee] [--rr _t_i_m_e | ----rreenneewwaabbllee--lliiffee==_t_i_m_e] [--SS - _p_r_i_n_c_i_p_a_l | ----sseerrvveerr==_p_r_i_n_c_i_p_a_l] [--ss _t_i_m_e | ----ssttaarrtt--ttiimmee==_t_i_m_e] - [--kk | ----uussee--kkeeyyttaabb] [--vv | ----vvaalliiddaattee] [--ee _e_n_c_t_y_p_e_s | - ----eennccttyyppeess==_e_n_c_t_y_p_e_s] [--aa _a_d_d_r_e_s_s_e_s | ----eexxttrraa--aaddddrreesssseess==_a_d_d_r_e_s_s_e_s] + _p_r_i_n_c_i_p_a_l | ----sseerrvveerr==_p_r_i_n_c_i_p_a_l] [--ss _t_i_m_e | ----ssttaarrtt--ttiimmee==_t_i_m_e] [--kk | + ----uussee--kkeeyyttaabb] [--vv | ----vvaalliiddaattee] [--ee _e_n_c_t_y_p_e_s | ----eennccttyyppeess==_e_n_c_t_y_p_e_s] + [--aa _a_d_d_r_e_s_s_e_s | ----eexxttrraa--aaddddrreesssseess==_a_d_d_r_e_s_s_e_s] [----ffccaacchhee--vveerrssiioonn==_i_n_t_e_g_e_r] [----nnoo--aaddddrreesssseess] [----aannoonnyymmoouuss] [----vveerrssiioonn] [----hheellpp] [_p_r_i_n_c_i_p_a_l [_c_o_m_m_a_n_d]] @@ -74,8 +74,8 @@ DDEESSCCRRIIPPTTIIOONN Create a credentials cache of version vveerrssiioonn. --aa, ----eexxttrraa--aaddddrreesssseess==_e_n_c_t_y_p_e_s - Adds a set of addresses that will, in addition to the systems - local addresses, be put in the ticket. This can be useful if all + Adds a set of addresses that will, in addition to the systems lo- + cal addresses, be put in the ticket. This can be useful if all addresses a client can use can't be automatically figured out. One such example is if the client is behind a firewall. Also set- table via libdefaults/extra_addresses in krb5.conf(5). @@ -124,4 +124,4 @@ EENNVVIIRROONNMMEENNTT SSEEEE AALLSSOO kdestroy(1), klist(1), krb5_appdefault(3), krb5.conf(5) -HEIMDAL May 29, 1998 HEIMDAL + HEIMDAL May 29, 1998 2 diff --git a/crypto/heimdal/kuser/klist.c b/crypto/heimdal/kuser/klist.c index 639b3fd..dbee058 100644 --- a/crypto/heimdal/kuser/klist.c +++ b/crypto/heimdal/kuser/klist.c @@ -34,7 +34,7 @@ #include "kuser_locl.h" #include "rtbl.h" -RCSID("$Id: klist.c,v 1.67 2002/08/20 09:05:18 joda Exp $"); +RCSID("$Id: klist.c,v 1.67.2.1 2002/10/21 14:31:27 joda Exp $"); static char* printable_time(time_t t) @@ -496,7 +496,7 @@ display_tokens(int do_verbose) break; continue; } - if(parms.out_size >= sizeof(t)) + if(parms.out_size > sizeof(t)) continue; if(parms.out_size < sizeof(size_secret_tok)) continue; diff --git a/crypto/heimdal/kuser/klist.cat1 b/crypto/heimdal/kuser/klist.cat1 index b24eda7..4a2b647 100644 --- a/crypto/heimdal/kuser/klist.cat1 +++ b/crypto/heimdal/kuser/klist.cat1 @@ -1,12 +1,11 @@ -KLIST(1) FreeBSD General Commands Manual KLIST(1) +KLIST(1) NetBSD Reference Manual KLIST(1) NNAAMMEE kklliisstt - list Kerberos credentials SSYYNNOOPPSSIISS - kklliisstt [--cc _c_a_c_h_e | ----ccaacchhee==_c_a_c_h_e] [--ss | --tt | ----tteesstt] [--44 | ----vv44] - [--TT | ----ttookkeennss] [--55 | ----vv55] [--vv | ----vveerrbboossee] [--ff] [----vveerrssiioonn] - [----hheellpp] + kklliisstt [--cc _c_a_c_h_e | ----ccaacchhee==_c_a_c_h_e] [--ss | --tt | ----tteesstt] [--44 | ----vv44] [--TT | + ----ttookkeennss] [--55 | ----vv55] [--vv | ----vveerrbboossee] [--ff] [----vveerrssiioonn] [----hheellpp] DDEESSCCRRIIPPTTIIOONN kklliisstt reads and displays the current tickets in the crential cache (also @@ -65,8 +64,8 @@ DDEESSCCRRIIPPTTIIOONN the time the authentication exchange took place Start time - the time that this tickets is valid from (only - printed if it's different from the auth time) + the time that this tickets is valid from (only print- + ed if it's different from the auth time) End time when the ticket expires, if it has already expired @@ -85,4 +84,4 @@ DDEESSCCRRIIPPTTIIOONN SSEEEE AALLSSOO kdestroy(1), kinit(1) -HEIMDAL July 8, 2000 HEIMDAL + HEIMDAL July 8, 2000 2 |