r25683: fix the compilation of getpass.c and it's configure test

metze
(cherry picked from commit f4c0961a16)

source/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

source/lib/replace/getpass.m4

@@ -3,11 +3,8 @@ SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
 AC_TRY_COMPILE([
 #include "confdefs.h"
-#define _LIBREPLACE_REPLACE_H
-#define REPLACE_GETPASS 1
-#define main dont_declare_main
+#define NO_CONFIG_H
 #include "$libreplacedir/getpass.c"
-#undef main
 ],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no)
 CPPFLAGS="$SAVE_CPPFLAGS"
 ])