summaryrefslogtreecommitdiff
path: root/source/lib/replace/getpass.c
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
commit5d747fcad0b0ac66584da500148e7647122e0544 (patch)
tree4f19e6ce45512b77b7beed2d8b4a585c6c404eab /source/lib/replace/getpass.c
parent3910d069413834744b17175bb29775a69002712e (diff)
downloadsamba-5d747fcad0b0ac66584da500148e7647122e0544.tar.gz
r25683: fix the compilation of getpass.c and it's configure test
metze (cherry picked from commit f4c0961a16a84dcdfe6e2faafb75c76983e6d466)
Diffstat (limited to 'source/lib/replace/getpass.c')
-rw-r--r--source/lib/replace/getpass.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index dace5fbb8a2..4b218490899 100644
--- a/source/lib/replace/getpass.c
+++ b/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