tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (stevesk) [auth-sia.c] cleanup

This commit is contained in:
Kevin Steves 2002-04-11 20:39:40 +00:00
parent e0f2ca4651
commit 0c283d8444
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20020411
- (stevesk) [auth-sia.c] cleanup
20020410 20020410
- (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR - (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR
- (stevesk) [auth-sia.c] compile fix Chris Adams <cmadams@hiwaay.net> - (stevesk) [auth-sia.c] compile fix Chris Adams <cmadams@hiwaay.net>
@ -8215,4 +8218,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.2044 2002/04/10 22:04:54 stevesk Exp $ $Id: ChangeLog,v 1.2045 2002/04/11 20:39:40 stevesk Exp $

25
auth-sia.c
View File

@ -41,7 +41,7 @@ auth_sia_password(Authctxt *authctxt, char *pass)
return(0); return(0);
if ((ret = sia_ses_authent(NULL, pass, ent)) != SIASUCCESS) { if ((ret = sia_ses_authent(NULL, pass, ent)) != SIASUCCESS) {
error("couldn't authenticate %s from %s", user, host); error("Couldn't authenticate %s from %s", user, host);
if (ret & SIASTOP) if (ret & SIASTOP)
sia_ses_release(&ent); sia_ses_release(&ent);
return(0); return(0);
@ -55,7 +55,6 @@ auth_sia_password(Authctxt *authctxt, char *pass)
void void
session_setup_sia(char *user, char *tty) session_setup_sia(char *user, char *tty)
{ {
int ret;
struct passwd *pw; struct passwd *pw;
SIAENTITY *ent = NULL; SIAENTITY *ent = NULL;
const char *host; const char *host;
@ -64,46 +63,38 @@ session_setup_sia(char *user, char *tty)
if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0, if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0,
NULL) != SIASUCCESS) { NULL) != SIASUCCESS) {
error("sia_ses_init failed"); fatal("sia_ses_init failed");
exit(1);
} }
if ((pw = getpwnam(user)) == NULL) { if ((pw = getpwnam(user)) == NULL) {
sia_ses_release(&ent); sia_ses_release(&ent);
error("getpwnam(%s) failed: %s", user, strerror(errno)); fatal("getpwnam: no user: %s", user);
exit(1);
} }
if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) { if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) {
sia_ses_release(&ent); sia_ses_release(&ent);
error("sia_make_entity_pwd failed"); fatal("sia_make_entity_pwd failed");
exit(1);
} }
ent->authtype = SIA_A_NONE; ent->authtype = SIA_A_NONE;
if (sia_ses_estab(sia_collect_trm, ent) != SIASUCCESS) { if (sia_ses_estab(sia_collect_trm, ent) != SIASUCCESS) {
error("couldn't establish session for %s from %s", user, fatal("Couldn't establish session for %s from %s", user,
host); host);
exit(1);
} }
if (setpriority(PRIO_PROCESS, 0, 0) == -1) { if (setpriority(PRIO_PROCESS, 0, 0) == -1) {
sia_ses_release(&ent); sia_ses_release(&ent);
error("setpriority failed: %s", strerror (errno)); fatal("setpriority: %s", strerror (errno));
exit(1);
} }
if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS) { if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS) {
error("couldn't launch session for %s from %s", user, host); fatal("Couldn't launch session for %s from %s", user, host);
exit(1);
} }
sia_ses_release(&ent); sia_ses_release(&ent);
if (setreuid(geteuid(), geteuid()) < 0) { if (setreuid(geteuid(), geteuid()) < 0) {
error("setreuid failed: %s", strerror (errno)); fatal("setreuid: %s", strerror(errno));
exit(1);
} }
} }
#endif /* HAVE_OSF_SIA */ #endif /* HAVE_OSF_SIA */