From f49b994aeb987ac87c3c49f35ae1e05a7004f75d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 11 Nov 1998 23:25:51 +0000
Subject: rpc_server/srv_netlog.c: Fixed crash bug with ACB_PWNOTREQ.
 script/makeyodldocs.sh: Added code to make text docs for non-man page YODL
 docs. web/cgi.c web/swat.c: SGI compiler warnings fixed. Jeremy. (This used
 to be commit 80e0f7e1071f032c5004aecb01a91d1397e6a161)

---
 source3/web/cgi.c  | 4 ++--
 source3/web/swat.c | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a11abe074e..86366d1083 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -321,7 +321,7 @@ static int cgi_handle_authorization(char *line)
 /***************************************************************************
 is this root?
   ***************************************************************************/
-BOOL is_root()
+BOOL is_root(void)
 {
 	if ((C_user) && (strcmp(C_user,"root") == 0)) {
 		return( True);
@@ -333,7 +333,7 @@ BOOL is_root()
 /***************************************************************************
 return a ptr to the users name
   ***************************************************************************/
-char * get_user_name()
+char *get_user_name(void)
 {
         return(C_user);
 }
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 81dca8fc04..da032e077d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -621,7 +621,6 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 		int	to_child    = fd1[1];
 		int	from_child  = fd2[0];
 		int	wstat;
-		pid_t	wpid;
 
 		close(fd1[0]); /* parent doesn't need input  side of pipe fd1 */
 		close(fd2[1]); /* parent doesn't need output side of pipe fd2 */
@@ -661,7 +660,7 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 		/*
 		 * Wait for smbpasswd to finish
 		 */
-		if ((wpid = sys_waitpid(pid, &wstat, 0)) < 0) {
+		if (sys_waitpid(pid, &wstat, 0) < 0) {
 			printf("<p> problem waiting");
 		}
 
@@ -919,9 +918,8 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-	char *s, *new_name;
+	char *new_name;
 	int i;
-	extern char * get_user_name();
 
 	printf("<H2>Password Manager</H2>\n");
 
@@ -962,7 +960,7 @@ static void passwd_page(void)
 	 * If we don't have user information then there's nothing to do. It's probably
 	 * the first time through this code.
 	 */
-	if (s = cgi_variable(user)) {
+	if (cgi_variable(user)) {
 		chg_passwd();		
 	}
 
-- 
cgit