summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-10-17 14:01:34 +0200
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:43:12 +0100
commit2367364094824e03ce890e961bdb70d42c57471f (patch)
tree97b609c6d141618f0e276d3df87b168ef0ed376b
parent190039a378ee208a026f868d083d7c00918d1b5f (diff)
downloadsamba-2367364094824e03ce890e961bdb70d42c57471f.tar.gz
samba-2367364094824e03ce890e961bdb70d42c57471f.tar.bz2
samba-2367364094824e03ce890e961bdb70d42c57471f.zip
r25683: fix the compilation of getpass.c and it's configure test
metze (cherry picked from commit f4c0961a16a84dcdfe6e2faafb75c76983e6d466) (This used to be commit 5d747fcad0b0ac66584da500148e7647122e0544)
-rw-r--r--source4/lib/replace/getpass.c10
-rw-r--r--source4/lib/replace/getpass.m45
2 files changed, 2 insertions, 13 deletions
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
diff --git a/source4/lib/replace/getpass.m4 b/source4/lib/replace/getpass.m4
index 20d04a63f6..17dfdf7bf5 100644
--- a/source4/lib/replace/getpass.m4
+++ b/source4/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"
])