From 032624d56c174c5c55126582b32e314a6af15522 Mon Sep 17 00:00:00 2001
From: basabi <none@none>
Date: Tue, 13 Sep 2005 07:37:29 -0700
Subject: 6271014 gcc and cmd/cron don't get along 6271953 gcc and cmd/login
 don't get along 6274736 gcc and ucbcmd/expr don't get along 6274737 gcc and
 ucbcmd/from don't get along 6274776 gcc and ucbcmd/rusage don't get along
 6274779 gcc and ucbcmd/shutdown don't get along

---
 usr/src/cmd/login/login.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'usr/src/cmd/login')

diff --git a/usr/src/cmd/login/login.c b/usr/src/cmd/login/login.c
index ea62bf37c6..35d559c4bd 100644
--- a/usr/src/cmd/login/login.c
+++ b/usr/src/cmd/login/login.c
@@ -384,7 +384,7 @@ static	void	check_for_console(void);
 static	void	check_for_dueling_unix(char *);
 static	void	get_user_name(void);
 static	uint_t	get_audit_id(void);
-static	void	login_exit(int);
+static	void	login_exit(int)__NORETURN;
 static	int	logins_disabled(char *);
 static	void	log_bad_attempts(void);
 static	int	is_number(char *);
@@ -401,7 +401,7 @@ static	int	is_number(char *);
  *
  */
 
-void
+int
 main(int argc, char *argv[], char **renvp)
 {
 /* ONC_PLUS EXTRACT END */
@@ -661,7 +661,7 @@ main(int argc, char *argv[], char **renvp)
 	 * All done
 	 */
 	login_exit(1);
-	/* NOTREACHED */
+	return (0);
 }
 
 
@@ -940,7 +940,7 @@ login_conv(int num_msg, struct pam_message **msg,
  */
 
 static int
-verify_passwd()
+verify_passwd(void)
 {
 	int error;
 	char *user;
@@ -1102,7 +1102,7 @@ getargs(char *input_line)
  */
 
 static void
-get_user_name()
+get_user_name(void)
 {
 	FILE	*fp;
 
@@ -1762,7 +1762,7 @@ chdir_to_dir_user(void)
  */
 
 static void
-login_authenticate()
+login_authenticate(void)
 {
 	char *user;
 	int err;
@@ -1939,7 +1939,8 @@ setup_credentials(void)
 /* ONC_PLUS EXTRACT END */
 
 static uint_t
-get_audit_id() {
+get_audit_id(void)
+{
 	if (rflag)
 		return (ADT_rlogin);
 	else if (hflag)
-- 
cgit v1.2.3