git.samba.org
/
ira
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change got_alarm from bool to the correct type of SIG_ATOMIC_T.
[ira/wip.git]
/
source3
/
lib
/
smbldap.c
diff --git
a/source3/lib/smbldap.c
b/source3/lib/smbldap.c
index dcb99c9a65efb657f8f60b76fdb91709bd1ed320..ba23281f744ee14eb8a9447cf169bcbd57feed0e 100644
(file)
--- 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;
}
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)
{
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,
}
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) {
}
if (*attempts == 0) {
- got_alarm =
False
;
+ got_alarm =
0
;
old_handler = CatchSignal(SIGALRM, gotalarm_sig);
alarm(endtime - now);
old_handler = CatchSignal(SIGALRM, gotalarm_sig);
alarm(endtime - now);