r1395: important merge from 3.0 before rc1

diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c
index d058613f004e8a9c5a1f7989d721f27ed5a99dab..f07187c68a0313fe3466327fe708b6bc1e15db91 100644 (file)
--- a/source/lib/smbldap.c
+++ b/source/lib/smbldap.c
@@ -938,7 +938,7 @@ int smbldap_search(struct smbldap_state *ldap_state,
                ZERO_STRUCT(tval);
                GetTimeOfDay(&tval);
 
-               tdiff = usec_time_diff(&tval, &ldap_state->last_rebind.tv_sec);
+               tdiff = usec_time_diff(&tval, &ldap_state->last_rebind);
                tdiff /= 1000; /* Convert to milliseconds. */
 
                sleep_time = lp_ldap_replication_sleep()-(int)tdiff;