From: Jen Selby Date: Tue, 9 Jul 2002 23:11:33 +0000 (+0000) Subject: * login.M: added information about different command line options; X-Git-Tag: krb5-1.3-alpha1~594 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46da62a966132bebccd24dc5880ee6df48e72063;p=krb5.git * login.M: added information about different command line options; changed defaults given for tags that did not match code * login.c: changed inaccurate comments git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14625 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index fbc2641cc..96618b78b 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,9 @@ +2002-07-09 Jen Selby + + * login.M: added information about different command line options; + changed defaults given for tags that did not match code + * login.c: changed inaccurate comments + 2002-07-09 Ken Raeburn * krlogind.c (protocol): Initialize pbp, fbp. Change left to type diff --git a/src/appl/bsd/login.M b/src/appl/bsd/login.M index bcbddab38..09d213e60 100644 --- a/src/appl/bsd/login.M +++ b/src/appl/bsd/login.M @@ -5,9 +5,8 @@ login.krb5 \- kerberos enhanced login program .SH SYNOPSIS .B login.krb5 -[ -.B \-fF [username] -] +[\fB\-p\fP] [\fB\-fFe\fP \fIusername\fP] +[\fB\-r | \-k | \-K | \-h \fP\fIhostname\fP] .SH DESCRIPTION .I login.krb5 is a modification of the BSD login program which is used for two @@ -32,18 +31,27 @@ user in. However, if the password matches the entry in use of the machine in case of network failure.) .SH OPTIONS .TP +\fB\-p\fP +preserve the current environment +.TP \fB\-r\fP \fIhostname\fP -pass hostname to rlogind. +pass hostname to rlogind. Must be the last argument. .TP \fB\-h\fP \fIhostname\fP -pass hostname to telnetd, etc. +pass hostname to telnetd, etc. Must be the last argument. +.TP +\fB\-k\fP \fIhostname\fP +Use Kerberos V4 to login. Must be the last argument. +.TP +\fB\-K\fP \fIhostname\fP +Use Kerberos V4 to login. Must be the last argument. .TP \fB\-f\fP \fIname\fP Perform pre-authenticated login, e.g., datakit, xterm, etc.; -allow preauthenticated login as root. +allows preauthenticated login as root. .TP \fB\-F\fP \fIname\fP -Perform pre-authenticated login, e.g.,for datakit, xterm, etc.; allows +Perform pre-authenticated login, e.g., datakit, xterm, etc.; allows preauthenticated login as root. .TP \fB\-e\fP \fIname\fP @@ -59,7 +67,7 @@ provided: .IP krb5_get_tickets Use password to get V5 tickets. Default value true. .IP krb4_get_tickets -Use password to get V4 tickets. Default value true. +Use password to get V4 tickets. Default value false. .IP krb4_convert Use Kerberos conversion daemon to get V4 tickets. Default value false. If false, and krb4_get_tickets is true, then login will get @@ -70,7 +78,7 @@ is true, and the krb524d is not running, login will hang for approximately a minute under Solaris, due to a Solaris socket emulation bug. .IP krb_run_aklog -Attempt to run aklog. Default value true. +Attempt to run aklog. Default value false. .IP aklog_path Where to find it [not yet implemented.] Default value .I $(prefix)/bin/aklog. diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c index e2fd62d27..d3a158cb5 100644 --- a/src/appl/bsd/login.c +++ b/src/appl/bsd/login.c @@ -27,19 +27,16 @@ char copyright[] = /* based on @(#)login.c 5.25 (Berkeley) 1/6/89 */ -/* While the code may be compiled with some of these options turned off, - the default will be to turn them *all* on if v4 compatibility is - available, and allow them to be configured via krb5.conf. */ -/* The configuration is of the form +/* The configuration, with defaults as listed, is of the form: [login] # login stanza krb5_get_tickets = 1 # use password to get v5 tickets - krb4_get_tickets = 1 + krb4_get_tickets = 0 # use password to get v4 tickets - krb4_convert = 1 + krb4_convert = 0 # use kerberos conversion daemon to get v4 tickets - krb_run_aklog = 1 + krb_run_aklog = 0 # attempt to run aklog aklog_path = $(prefix)/bin/aklog # where to find it [not yet implemented]