- (djm) KNF on auth-sia.[ch]
diff --git a/ChangeLog b/ChangeLog
index a927b29..e7cebca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,8 @@
- (djm) Tidy and trim TODO
- (djm) Sync openbsd-compat/ with OpenBSD CVS head
- (djm) Big KNF on openbsd-compat/
- - (djm) KNF on md5crypt.c
+ - (djm) KNF on md5crypt.[ch]
+ - (djm) KNF on auth-sia.[ch]
20030517
- (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)
@@ -1574,4 +1575,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2740 2003/05/18 14:46:46 djm Exp $
+$Id: ChangeLog,v 1.2741 2003/05/18 14:50:02 djm Exp $
diff --git a/auth-sia.c b/auth-sia.c
index 5c9b3f5..05cf47c 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -54,24 +54,25 @@
host = get_canonical_hostname(options.verify_reverse_mapping);
- if (!authctxt->user || !pass || pass[0] == '\0')
- return(0);
+ if (!authctxt->user || pass == NULL || pass[0] == '\0')
+ return (0);
if (sia_ses_init(&ent, saved_argc, saved_argv, host, authctxt->user,
NULL, 0, NULL) != SIASUCCESS)
- return(0);
+ return (0);
if ((ret = sia_ses_authent(NULL, pass, ent)) != SIASUCCESS) {
- error("Couldn't authenticate %s from %s", authctxt->user,
- host);
+ error("Couldn't authenticate %s from %s",
+ authctxt->user, host);
if (ret & SIASTOP)
sia_ses_release(&ent);
- return(0);
+
+ return (0);
}
sia_ses_release(&ent);
- return(1);
+ return (1);
}
void
@@ -82,8 +83,8 @@
host = get_canonical_hostname(options.verify_reverse_mapping);
- if (sia_ses_init(&ent, saved_argc, saved_argv, host, pw->pw_name, tty,
- 0, NULL) != SIASUCCESS)
+ if (sia_ses_init(&ent, saved_argc, saved_argv, host, pw->pw_name,
+ tty, 0, NULL) != SIASUCCESS)
fatal("sia_ses_init failed");
if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) {
@@ -97,8 +98,8 @@
pw->pw_name, host);
if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS)
- fatal("Couldn't launch session for %s from %s", pw->pw_name,
- host);
+ fatal("Couldn't launch session for %s from %s",
+ pw->pw_name, host);
sia_ses_release(&ent);
diff --git a/auth-sia.h b/auth-sia.h
index 7aecce9..38164ff 100644
--- a/auth-sia.h
+++ b/auth-sia.h
@@ -26,7 +26,7 @@
#ifdef HAVE_OSF_SIA
-int auth_sia_password(Authctxt *authctxt, char *pass);
-void session_setup_sia(struct passwd *pw, char *tty);
+int auth_sia_password(Authctxt *, char *);
+void session_setup_sia(struct passwd *, char *);
#endif /* HAVE_OSF_SIA */