diff options
Diffstat (limited to 'ldap/synctools/passwordsync/passsync/syncserv.cpp')
| -rw-r--r-- | ldap/synctools/passwordsync/passsync/syncserv.cpp | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/ldap/synctools/passwordsync/passsync/syncserv.cpp b/ldap/synctools/passwordsync/passsync/syncserv.cpp index 63bb451e..6e314f8e 100644 --- a/ldap/synctools/passwordsync/passsync/syncserv.cpp +++ b/ldap/synctools/passwordsync/passsync/syncserv.cpp @@ -76,6 +76,7 @@ PassSyncService::PassSyncService(const TCHAR *serviceName) : CNTService(serviceN unsigned long size; passhookEventHandle = CreateEvent(NULL, FALSE, FALSE, PASSHAND_EVENT_NAME); + passhookMutexHandle = CreateMutex(NULL, FALSE, PASSHOOK_MUTEX_NAME); mainLdapConnection = NULL; results = NULL; currentResult = NULL; @@ -211,10 +212,14 @@ void PassSyncService::Run() timeStamp(&outLog); outLog << "Backing off for " << BackoffTime(GetMinBackoff()) << "ms" << endl; } - WaitForSingleObject(passhookEventHandle, BackoffTime(GetMinBackoff())); + waitRes = WaitForSingleObject(passhookEventHandle, BackoffTime(GetMinBackoff())); if(logLevel > 0) { timeStamp(&outLog); - outLog << "Backoff time expired. Attempting sync" << endl; + if (waitRes == WAIT_TIMEOUT) { + outLog << "Backoff time expired. Attempting sync" << endl; + } else { + outLog << "Received passhook event. Attempting sync" << endl; + } } } @@ -226,24 +231,38 @@ void PassSyncService::Run() if(passInfoList.size() > 0) { - if(saveSet(&passInfoList, dataFilename) == 0) + // Get mutex for passhook.dat + WaitForSingleObject(passhookMutexHandle, INFINITE); + + // Need to loadSet here so we don't overwrite entries that passhook recently added + if(loadSet(&passInfoList, dataFilename) == 0) { - if(logLevel > 0) + if(saveSet(&passInfoList, dataFilename) == 0) + { + if(logLevel > 0) + { + timeStamp(&outLog); + outLog << passInfoList.size() << " entries saved to data file" << endl; + } + } + else { timeStamp(&outLog); - outLog << passInfoList.size() << " entries saved to data file" << endl; + outLog << "Failed to save entries to data file" << endl; } - } - else - { + } else { timeStamp(&outLog); - outLog << "Failed to save entries to data file" << endl; + outLog << "Failed to load entries from file" << endl; } + + // Release mutex for passhook.dat + ReleaseMutex(passhookMutexHandle); } exit: clearSet(&passInfoList); CloseHandle(passhookEventHandle); + CloseHandle(passhookMutexHandle); } // **************************************************************** @@ -258,6 +277,9 @@ int PassSyncService::SyncPasswords() char* dn = NULL; int tempSize = passInfoList.size(); + // Get mutex for passhook.dat + WaitForSingleObject(passhookMutexHandle, INFINITE); + if(loadSet(&passInfoList, dataFilename) == 0) { if((passInfoList.size() - tempSize) > 0) @@ -289,6 +311,9 @@ int PassSyncService::SyncPasswords() outLog << "Failed to load entries from file" << endl; } + // Release mutex for passhook.dat + ReleaseMutex(passhookMutexHandle); + if(passInfoList.size() > 0) { if(logLevel > 0) |