diff options
| author |   biorn <biorn@openbsd.org> | 2005-03-06 10:47:27 +0000 |
|---|---|---|
| committer | biorn <biorn@openbsd.org> | 2005-03-06 10:47:27 +0000 |
| commit | 0d478e112cb978c4dc15939e02cc26dc27980feb (patch) | |
| tree | c4def09f6f36d59e85bb874cc166bb8e139ac31e | |
| parent | Wait for the bulk transfer to complete before returning if we are in polled (diff) | |
| download | wireguard-openbsd-0d478e112cb978c4dc15939e02cc26dc27980feb.tar.xz wireguard-openbsd-0d478e112cb978c4dc15939e02cc26dc27980feb.zip | |
don't use invokinguser if its empty
sync man page with reality
spelling corrected by jmc@, ok beck@
| -rw-r--r-- | libexec/login_krb5/login_krb5.8 | 27 | ||||
| -rw-r--r-- | libexec/login_krb5/login_krb5.c | 4 |
2 files changed, 26 insertions, 5 deletions
diff --git a/libexec/login_krb5/login_krb5.8 b/libexec/login_krb5/login_krb5.8 index 04afa4cc5cb..308bf0ec90c 100644 --- a/libexec/login_krb5/login_krb5.8 +++ b/libexec/login_krb5/login_krb5.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: login_krb5.8,v 1.12 2003/07/25 09:33:44 jmc Exp $ +.\" $OpenBSD: login_krb5.8,v 1.13 2005/03/06 10:47:27 biorn Exp $ .\" .\" Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com> .\" @@ -22,10 +22,14 @@ .Nd provide KerberosV authentication type .Sh SYNOPSIS .Nm login_krb5 +.Bk -words .Op Fl s Ar service -.Op Fl v Ar ignored +.Op Fl v Ar login=yes|no +.Op Fl v Ar notickets=yes|no +.Op Fl v Ar invokinguser=user .Ar user .Op Ar class +.Ek .Sh DESCRIPTION The .Nm @@ -56,8 +60,25 @@ and protocol is silently ignored but will report success as KerberosV authentication is not challenge-response based). .Pp +If +.Ar invokinguser +is set and the +.Ar user +argument is root, the principal +invokinguser/root will be used for authentication. +.Pp +If the +.Ar notickets +argument is equal to +.Dq no , +the default value, and the +.Ar login +argument is equal to +.Dq yes , +then the ticket will be saved in a credentials cache. +.Pp The -.Ar ignored +.Ar class argument is ignored for compatibility with other login scripts. .Pp .Nm diff --git a/libexec/login_krb5/login_krb5.c b/libexec/login_krb5/login_krb5.c index 5fd6c6a6de9..e52bab4db86 100644 --- a/libexec/login_krb5/login_krb5.c +++ b/libexec/login_krb5/login_krb5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_krb5.c,v 1.19 2003/08/07 11:12:38 hin Exp $ */ +/* $OpenBSD: login_krb5.c,v 1.20 2005/03/06 10:47:27 biorn Exp $ */ /*- * Copyright (c) 2001, 2002 Hans Insulander <hin@openbsd.org>. @@ -164,7 +164,7 @@ krb5_login(char *username, char *invokinguser, char *password, int login, exit(1); } - if (strcmp(username, "root") == 0) { + if (strcmp(username, "root") == 0 && invokinguser[0] != '\0') { char *tmp; int len = strlen(invokinguser)+6; |