From 2367364094824e03ce890e961bdb70d42c57471f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 17 Oct 2007 14:01:34 +0200
Subject: r25683: fix the compilation of getpass.c and it's configure test

metze
(cherry picked from commit f4c0961a16a84dcdfe6e2faafb75c76983e6d466)
(This used to be commit 5d747fcad0b0ac66584da500148e7647122e0544)
---
 source4/lib/replace/getpass.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'source4/lib/replace/getpass.c')

diff --git a/source4/lib/replace/getpass.c b/source4/lib/replace/getpass.c
index dace5fbb8a..4b21849089 100644
--- a/source4/lib/replace/getpass.c
+++ b/source4/lib/replace/getpass.c
@@ -49,8 +49,6 @@ typedef int sig_atomic_t;
 #define SIGNAL_CAST (RETSIGTYPE (*)(int))
 #endif
 
-#ifdef REPLACE_GETPASS
-
 #ifdef SYSV_TERMIO 
 
 /* SYSTEM V TERMIO HANDLING */
@@ -131,10 +129,9 @@ static void catch_signal(int signum,void (*handler)(int ))
 	sigemptyset(&act.sa_mask);
 	sigaddset(&act.sa_mask,signum);
 	sigaction(signum,&act,&oldact);
-	return oldact.sa_handler;
 #else /* !HAVE_SIGACTION */
 	/* FIXME: need to handle sigvec and systems with broken signal() */
-	return signal(signum, handler);
+	signal(signum, handler);
 #endif
 }
 
@@ -231,8 +228,3 @@ char *getsmbpass(const char *prompt)
 	}
 	return buf;
 }
-
-#else
- void getsmbpasswd_dummy(void);
- void getsmbpasswd_dummy(void) {;}
-#endif
-- 
cgit