diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
| commit | 64578c0589a3a741f81fb55c16eeb882128da00b (patch) | |
| tree | 8b650156e44e4d39af8625185d857a88789b8074 /source3/passdb/nispass.c | |
| parent | c48b3fce6be6d5d952cbcda0ddae223dda5a576f (diff) | |
| download | samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.gz samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.bz2 samba-64578c0589a3a741f81fb55c16eeb882128da00b.zip | |
merge from the autoconf2 branch to the main branch
(This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21)
Diffstat (limited to 'source3/passdb/nispass.c')
| -rw-r--r-- | source3/passdb/nispass.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c index 84eae0a40f..b43a52e48a 100644 --- a/source3/passdb/nispass.c +++ b/source3/passdb/nispass.c @@ -19,7 +19,7 @@ * Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef USE_NISPLUS_DB +#ifdef WITH_NISPLUS #include "includes.h" #include <rpcsvc/nis.h> @@ -166,7 +166,7 @@ static nis_result *nisp_get_nis_list(char *nis_name) result = nis_list(nis_name, FOLLOW_PATH|EXPAND_NAME|HARD_LOOKUP,NULL,NULL); alarm(0); - signal(SIGALRM, SIGNAL_CAST SIG_DFL); + CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL); if (gotalarm) { @@ -531,13 +531,13 @@ static struct sam_passwd *getnisp21pwnam(char *name) /* Search the table. */ gotalarm = 0; - signal(SIGALRM, SIGNAL_CAST gotalarm_sig); + CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig); alarm(5); result = nis_list(nisname, FOLLOW_PATH | EXPAND_NAME | HARD_LOOKUP, NULL, NULL); alarm(0); - signal(SIGALRM, SIGNAL_CAST SIG_DFL); + CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL); if (gotalarm) { @@ -576,13 +576,13 @@ static struct sam_passwd *getnisp21pwrid(uint32 rid) /* Search the table. */ gotalarm = 0; - signal(SIGALRM, SIGNAL_CAST gotalarm_sig); + CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig); alarm(5); result = nis_list(nisname, FOLLOW_PATH | EXPAND_NAME | HARD_LOOKUP, NULL, NULL); alarm(0); - signal(SIGALRM, SIGNAL_CAST SIG_DFL); + CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL); if (gotalarm) { @@ -674,7 +674,7 @@ struct passdb_ops *nisplus_initialize_password_db(void) #else void nisplus_dummy_function(void) { } /* stop some compilers complaining */ -#endif /* USE_NISPLUS_DB */ +#endif /* WITH_NISPLUS */ /* useful code i can't bring myself to delete */ #if 0 |