summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-08-19 20:53:49 -0700
committerJeremy Allison <jra@samba.org>2011-08-19 20:53:49 -0700
commit7cbcbee484e2f4c4a2bb6a8c14cef86508f53a69 (patch)
treebb3e2e5e777dcc9b9e478905d48b290183f1c1a7
parent92a655da8633ab99c2a3fa75b3a55ffd8b4ef430 (diff)
downloadsamba-7cbcbee484e2f4c4a2bb6a8c14cef86508f53a69.tar.gz
samba-7cbcbee484e2f4c4a2bb6a8c14cef86508f53a69.tar.bz2
samba-7cbcbee484e2f4c4a2bb6a8c14cef86508f53a69.zip
Change got_alarm from bool to the correct type of SIG_ATOMIC_T.
-rw-r--r--source3/lib/smbldap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index dcb99c9a65..ba23281f74 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -1345,13 +1345,13 @@ static NTSTATUS smbldap_close(struct smbldap_state *ldap_state)
return NT_STATUS_OK;
}
-static bool got_alarm;
+static SIG_ATOMIC_T got_alarm;
static void (*old_handler)(int);
static void gotalarm_sig(int dummy)
{
- got_alarm = True;
+ got_alarm = 1;
}
static int another_ldap_try(struct smbldap_state *ldap_state, int *rc,
@@ -1370,7 +1370,7 @@ static int another_ldap_try(struct smbldap_state *ldap_state, int *rc,
}
if (*attempts == 0) {
- got_alarm = False;
+ got_alarm = 0;
old_handler = CatchSignal(SIGALRM, gotalarm_sig);
alarm(endtime - now);