summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-19 00:50:02 +1000
committerDamien Miller <djm@mindrot.org>2003-05-19 00:50:02 +1000
commit5b5ca19ef058e069937e23ae0058c22bf62abd23 (patch)
treebb8f142bba3ade8a483a9a96cbacf071ac0df440
parente7fb10319246b876c1bd9a14c825799a59afa9ad (diff)
- (djm) KNF on auth-sia.[ch]
-rw-r--r--ChangeLog5
-rw-r--r--auth-sia.c23
-rw-r--r--auth-sia.h4
3 files changed, 17 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index a927b293b..e7cebca20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,8 @@
18 - (djm) Tidy and trim TODO 18 - (djm) Tidy and trim TODO
19 - (djm) Sync openbsd-compat/ with OpenBSD CVS head 19 - (djm) Sync openbsd-compat/ with OpenBSD CVS head
20 - (djm) Big KNF on openbsd-compat/ 20 - (djm) Big KNF on openbsd-compat/
21 - (djm) KNF on md5crypt.c 21 - (djm) KNF on md5crypt.[ch]
22 - (djm) KNF on auth-sia.[ch]
22 23
2320030517 2420030517
24 - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD) 25 - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)
@@ -1574,4 +1575,4 @@
1574 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1575 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1575 ok provos@ 1576 ok provos@
1576 1577
1577$Id: ChangeLog,v 1.2740 2003/05/18 14:46:46 djm Exp $ 1578$Id: ChangeLog,v 1.2741 2003/05/18 14:50:02 djm Exp $
diff --git a/auth-sia.c b/auth-sia.c
index 5c9b3f5de..05cf47c40 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -54,24 +54,25 @@ auth_sia_password(Authctxt *authctxt, char *pass)
54 54
55 host = get_canonical_hostname(options.verify_reverse_mapping); 55 host = get_canonical_hostname(options.verify_reverse_mapping);
56 56
57 if (!authctxt->user || !pass || pass[0] == '\0') 57 if (!authctxt->user || pass == NULL || pass[0] == '\0')
58 return(0); 58 return (0);
59 59
60 if (sia_ses_init(&ent, saved_argc, saved_argv, host, authctxt->user, 60 if (sia_ses_init(&ent, saved_argc, saved_argv, host, authctxt->user,
61 NULL, 0, NULL) != SIASUCCESS) 61 NULL, 0, NULL) != SIASUCCESS)
62 return(0); 62 return (0);
63 63
64 if ((ret = sia_ses_authent(NULL, pass, ent)) != SIASUCCESS) { 64 if ((ret = sia_ses_authent(NULL, pass, ent)) != SIASUCCESS) {
65 error("Couldn't authenticate %s from %s", authctxt->user, 65 error("Couldn't authenticate %s from %s",
66 host); 66 authctxt->user, host);
67 if (ret & SIASTOP) 67 if (ret & SIASTOP)
68 sia_ses_release(&ent); 68 sia_ses_release(&ent);
69 return(0); 69
70 return (0);
70 } 71 }
71 72
72 sia_ses_release(&ent); 73 sia_ses_release(&ent);
73 74
74 return(1); 75 return (1);
75} 76}
76 77
77void 78void
@@ -82,8 +83,8 @@ session_setup_sia(struct passwd *pw, char *tty)
82 83
83 host = get_canonical_hostname(options.verify_reverse_mapping); 84 host = get_canonical_hostname(options.verify_reverse_mapping);
84 85
85 if (sia_ses_init(&ent, saved_argc, saved_argv, host, pw->pw_name, tty, 86 if (sia_ses_init(&ent, saved_argc, saved_argv, host, pw->pw_name,
86 0, NULL) != SIASUCCESS) 87 tty, 0, NULL) != SIASUCCESS)
87 fatal("sia_ses_init failed"); 88 fatal("sia_ses_init failed");
88 89
89 if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) { 90 if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) {
@@ -97,8 +98,8 @@ session_setup_sia(struct passwd *pw, char *tty)
97 pw->pw_name, host); 98 pw->pw_name, host);
98 99
99 if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS) 100 if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS)
100 fatal("Couldn't launch session for %s from %s", pw->pw_name, 101 fatal("Couldn't launch session for %s from %s",
101 host); 102 pw->pw_name, host);
102 103
103 sia_ses_release(&ent); 104 sia_ses_release(&ent);
104 105
diff --git a/auth-sia.h b/auth-sia.h
index 7aecce940..38164ff81 100644
--- a/auth-sia.h
+++ b/auth-sia.h
@@ -26,7 +26,7 @@
26 26
27#ifdef HAVE_OSF_SIA 27#ifdef HAVE_OSF_SIA
28 28
29int auth_sia_password(Authctxt *authctxt, char *pass); 29int auth_sia_password(Authctxt *, char *);
30void session_setup_sia(struct passwd *pw, char *tty); 30void session_setup_sia(struct passwd *, char *);
31 31
32#endif /* HAVE_OSF_SIA */ 32#endif /* HAVE_OSF_SIA */