diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-25 22:10:30 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-25 22:10:30 +0000 |
| commit | c66ed44ff2c97f180e268d33d13acf035ad6242e (patch) | |
| tree | 5b7383bb085e328cef6b8aa05084ad3467bcfc13 /libexec | |
| parent | b926ded9c618397210826f818d0724e72f1fa918 (diff) | |
Remove instance stuff now that su uses an explicit option to specify
the invoking user.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/login_lchpass/login_lchpass.c | 7 | ||||
| -rw-r--r-- | libexec/login_passwd/login_passwd.8 | 16 | ||||
| -rw-r--r-- | libexec/login_skey/login_skey.c | 8 |
3 files changed, 4 insertions, 27 deletions
diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c index bbd0da2d52e..911dcc2be23 100644 --- a/libexec/login_lchpass/login_lchpass.c +++ b/libexec/login_lchpass/login_lchpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_lchpass.c,v 1.1 2000/12/12 02:32:57 millert Exp $ */ +/* $OpenBSD: login_lchpass.c,v 1.2 2001/06/25 22:10:28 millert Exp $ */ /*- * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved. @@ -63,7 +63,6 @@ main(argc, argv) struct passwd *pwd; char localhost[MAXHOSTNAMELEN]; char *username = 0; - char *instance; char *salt; char *p; int c; @@ -108,10 +107,6 @@ main(argc, argv) exit(1); } - instance = strchr(username, '.'); - if (instance) - *instance++ = '\0'; - pwd = getpwnam(username); if (!(back = fdopen(3, "a"))) { diff --git a/libexec/login_passwd/login_passwd.8 b/libexec/login_passwd/login_passwd.8 index 38470298043..b78787394d0 100644 --- a/libexec/login_passwd/login_passwd.8 +++ b/libexec/login_passwd/login_passwd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: login_passwd.8,v 1.1 2000/12/12 02:33:44 millert Exp $ +.\" $OpenBSD: login_passwd.8,v 1.2 2001/06/25 22:10:29 millert Exp $ .\" .\" Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com> .\" All rights reserved. @@ -52,19 +52,7 @@ with passwd-style authentication. .Pp The .Ar user -argument is the name of the user to be authenticated. -If -.Ar user -is of the form -.Ar name. Ns Li root -and -.Ar name. Ns Li root -is not found in the password file, the entry for -.Li root -is used. -This is done to support -.Xr su 1 , -which uses kerberos-style root instances. +argument is the login name of the user to be authenticated. .Pp The .Ar service diff --git a/libexec/login_skey/login_skey.c b/libexec/login_skey/login_skey.c index 28b82bd1878..0b26d5dfa8c 100644 --- a/libexec/login_skey/login_skey.c +++ b/libexec/login_skey/login_skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_skey.c,v 1.2 2001/06/20 22:18:06 millert Exp $ */ +/* $OpenBSD: login_skey.c,v 1.3 2001/06/25 22:10:29 millert Exp $ */ /*- * Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved. @@ -70,7 +70,6 @@ main(argc, argv) char passbuf[SKEY_MAX_PW_LEN+1]; int c, haskey; int mode = 0; - char *instance; skeyprompt[0] = '\0'; @@ -185,9 +184,6 @@ main(argc, argv) alarm(0); } - if ((instance = strchr(username, '.'))) - *instance++ = '\0'; - if (haskey && skeyverify(&skey, passbuf) == 0) { if (mode == 0) { if (skey.n <= 1) @@ -197,8 +193,6 @@ main(argc, argv) printf("Warning! Change S/Key password soon\n"); } fprintf(back, BI_AUTH "\n"); - if (instance && strcmp(instance, "root") == 0) - fprintf(back, BI_ROOTOKAY "\n"); fprintf(back, BI_SECURE "\n"); exit(0); } |