diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
| commit | 37e6849d451c4f49c6a0c96a78a5ef81baab83d4 (patch) | |
| tree | d1e443f66fa367340ef04d39349e50e7100b9b5f /source3/lib/smbldap.c | |
| parent | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (diff) | |
| parent | 0581094023ba5e561184a2ea57f6e905161de978 (diff) | |
| download | samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.gz samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.bz2 samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/smbldap.c')
| -rw-r--r-- | source3/lib/smbldap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index f2161dc946..f0561a5081 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -1014,7 +1014,7 @@ static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_ static void smbldap_idle_fn(struct event_context *event_ctx, struct timed_event *te, - const struct timeval *now, + struct timeval now, void *private_data); /********************************************************************** @@ -1079,7 +1079,7 @@ static int smbldap_open(struct smbldap_state *ldap_state) ldap_state->idle_event = event_add_timed( ldap_state->event_context, NULL, timeval_current_ofs(SMBLDAP_IDLE_TIME, 0), - "smbldap_idle_fn", smbldap_idle_fn, ldap_state); + smbldap_idle_fn, ldap_state); } DEBUG(4,("The LDAP server is successfully connected\n")); @@ -1572,7 +1572,7 @@ int smbldap_search_suffix (struct smbldap_state *ldap_state, static void smbldap_idle_fn(struct event_context *event_ctx, struct timed_event *te, - const struct timeval *now, + struct timeval now, void *private_data) { struct smbldap_state *state = (struct smbldap_state *)private_data; @@ -1584,13 +1584,13 @@ static void smbldap_idle_fn(struct event_context *event_ctx, return; } - if ((state->last_use+SMBLDAP_IDLE_TIME) > now->tv_sec) { + if ((state->last_use+SMBLDAP_IDLE_TIME) > now.tv_sec) { DEBUG(10,("ldap connection not idle...\n")); state->idle_event = event_add_timed( event_ctx, NULL, - timeval_add(now, SMBLDAP_IDLE_TIME, 0), - "smbldap_idle_fn", smbldap_idle_fn, + timeval_add(&now, SMBLDAP_IDLE_TIME, 0), + smbldap_idle_fn, private_data); return; } |