[389-commits] passwordsync/passsync

[Noriko Hosoi]

 passwordsync/passsync/syncserv.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cd1ba8f53ae28c2a1795ef2dd775e5b95d649ccb
Author: Nathan Kinder <nkinder(a)redhat.com&gt;
Date:   Fri Apr 26 09:55:16 2013 -0700

    ticket 47352 - Abandon old password changes prior to syncing
    
    We currently go through abandoning old password changes in the
    PassSync service right after we process sending changes to DS.  In
    some cases, this can cause us to send old password changes to DS
    that have already passed the "Time To Live" setting.
    
    This patch moved the abandoning of old password to happen right
    before we send password to DS.  This will ensure that we don't
    send old password changes that may be queued up.
    
    https://fedorahosted.org/389/ticket/47352
    
    Reviewed by Noriko.

diff --git a/passwordsync/passsync/syncserv.cpp b/passwordsync/passsync/syncserv.cpp
index 17a47a2..bf3fde5 100644
--- a/passwordsync/passsync/syncserv.cpp
+++ b/passwordsync/passsync/syncserv.cpp
@@ -284,7 +284,6 @@ void PassSyncService::Run()
 		}
 
 		SyncPasswords();
-		UpdateBackoff();
 
 		ResetEvent(passhookEventHandle);
 	}
@@ -390,6 +389,9 @@ int PassSyncService::SyncPasswords()
 			timeStamp(&outLog);
 			outLog << "Password list has " << passInfoList.size() <<
" entries" << endl;
 		}
+
+		// Update backoff here so we abondon any old passwords before sending them.
+		UpdateBackoff();
 	}
 
 	if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)