mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 18:02:20 +00:00
- (stevesk) [auth-sia.c] cleanup
This commit is contained in:
parent
e0f2ca4651
commit
0c283d8444
@ -1,3 +1,6 @@
|
||||
20020411
|
||||
- (stevesk) [auth-sia.c] cleanup
|
||||
|
||||
20020410
|
||||
- (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR
|
||||
- (stevesk) [auth-sia.c] compile fix Chris Adams <cmadams@hiwaay.net>
|
||||
@ -8215,4 +8218,4 @@
|
||||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- 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
25
auth-sia.c
@ -41,7 +41,7 @@ auth_sia_password(Authctxt *authctxt, char *pass)
|
||||
return(0);
|
||||
|
||||
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)
|
||||
sia_ses_release(&ent);
|
||||
return(0);
|
||||
@ -55,7 +55,6 @@ auth_sia_password(Authctxt *authctxt, char *pass)
|
||||
void
|
||||
session_setup_sia(char *user, char *tty)
|
||||
{
|
||||
int ret;
|
||||
struct passwd *pw;
|
||||
SIAENTITY *ent = NULL;
|
||||
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,
|
||||
NULL) != SIASUCCESS) {
|
||||
error("sia_ses_init failed");
|
||||
exit(1);
|
||||
fatal("sia_ses_init failed");
|
||||
}
|
||||
|
||||
if ((pw = getpwnam(user)) == NULL) {
|
||||
sia_ses_release(&ent);
|
||||
error("getpwnam(%s) failed: %s", user, strerror(errno));
|
||||
exit(1);
|
||||
fatal("getpwnam: no user: %s", user);
|
||||
}
|
||||
if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) {
|
||||
sia_ses_release(&ent);
|
||||
error("sia_make_entity_pwd failed");
|
||||
exit(1);
|
||||
fatal("sia_make_entity_pwd failed");
|
||||
}
|
||||
|
||||
ent->authtype = SIA_A_NONE;
|
||||
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);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (setpriority(PRIO_PROCESS, 0, 0) == -1) {
|
||||
sia_ses_release(&ent);
|
||||
error("setpriority failed: %s", strerror (errno));
|
||||
exit(1);
|
||||
fatal("setpriority: %s", strerror (errno));
|
||||
}
|
||||
|
||||
if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS) {
|
||||
error("couldn't launch session for %s from %s", user, host);
|
||||
exit(1);
|
||||
fatal("Couldn't launch session for %s from %s", user, host);
|
||||
}
|
||||
|
||||
sia_ses_release(&ent);
|
||||
|
||||
if (setreuid(geteuid(), geteuid()) < 0) {
|
||||
error("setreuid failed: %s", strerror (errno));
|
||||
exit(1);
|
||||
fatal("setreuid: %s", strerror(errno));
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* HAVE_OSF_SIA */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user