From: djm <djm>
Date: Sun, 18 May 2003 14:50:02 +0000 (+0000)
Subject:  - (djm) KNF on auth-sia.[ch]
X-Git-Tag: PRE_KRB4_REMOVAL~144
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/f1da2b8bd364ded2816990ae0a0992399392f519

 - (djm) KNF on auth-sia.[ch]
---

diff --git a/ChangeLog b/ChangeLog
index dd56e1de..7115d61e 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)
diff --git a/auth-sia.c b/auth-sia.c
index 5c9b3f5d..05cf47c4 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -54,24 +54,25 @@ auth_sia_password(Authctxt *authctxt, char *pass)
 
 	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 @@ session_setup_sia(struct passwd *pw, char *tty)
 
 	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 @@ session_setup_sia(struct passwd *pw, char *tty)
 		    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 7aecce94..38164ff8 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 */