svn commit: samba r25683 - in branches/SAMBA_4_0/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2007-10-17 14:01:34 +0000 (Wed, 17 Oct 2007)
New Revision: 25683

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25683

Log:
fix the compilation of getpass.c and it's configure test
metze
(cherry picked from commit f4c0961a16a84dcdfe6e2faafb75c76983e6d466)

Modified:
   branches/SAMBA_4_0/source/lib/replace/getpass.c
   branches/SAMBA_4_0/source/lib/replace/getpass.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/getpass.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/getpass.c	2007-10-17 14:01:15 UTC (rev 25682)
+++ branches/SAMBA_4_0/source/lib/replace/getpass.c	2007-10-17 14:01:34 UTC (rev 25683)
@@ -49,8 +49,6 @@
 #define SIGNAL_CAST (RETSIGTYPE (*)(int))
 #endif
 
-#ifdef REPLACE_GETPASS
-
 #ifdef SYSV_TERMIO 
 
 /* SYSTEM V TERMIO HANDLING */
@@ -131,10 +129,9 @@
 	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 @@
 	}
 	return buf;
 }
-
-#else
- void getsmbpasswd_dummy(void);
- void getsmbpasswd_dummy(void) {;}
-#endif

Modified: branches/SAMBA_4_0/source/lib/replace/getpass.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/getpass.m4	2007-10-17 14:01:15 UTC (rev 25682)
+++ branches/SAMBA_4_0/source/lib/replace/getpass.m4	2007-10-17 14:01:34 UTC (rev 25683)
@@ -3,11 +3,8 @@
 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"
 ])