diff options
| author | Jeremy Allison <jra@samba.org> | 2011-08-19 20:55:41 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-08-19 20:55:41 -0700 |
| commit | f00c6c85612d954ceeb9fd9fa37c91fabd923f6d (patch) | |
| tree | bb8fefad2dbaf02a55b1aa65e1e4d0d6c1604112 /source3 | |
| parent | ec07aca7d5257d997137b1771593a1e1ead51534 (diff) | |
| download | samba-f00c6c85612d954ceeb9fd9fa37c91fabd923f6d.tar.gz samba-f00c6c85612d954ceeb9fd9fa37c91fabd923f6d.tar.bz2 samba-f00c6c85612d954ceeb9fd9fa37c91fabd923f6d.zip | |
Always remove the alarm before changing the handler, not the other way around.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/smbldap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 7410620c6d..fc4dff5764 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -1410,8 +1410,8 @@ static int another_ldap_try(struct smbldap_state *ldap_state, int *rc, } no_next: - CatchSignal(SIGALRM, SIG_IGN); alarm(0); + CatchSignal(SIGALRM, SIG_IGN); ldap_state->last_use = now; return False; } |