[simias-svn] SF.net SVN: simias:[7451] trunk/src/utils/restore/iFolderServer.cs
Brought to you by:
srinidhi_bs
|
From: <sp...@us...> - 2010-08-04 12:58:38
|
Revision: 7451
http://simias.svn.sourceforge.net/simias/?rev=7451&view=rev
Author: spkumar
Date: 2010-08-04 12:58:32 +0000 (Wed, 04 Aug 2010)
Log Message:
-----------
ID: Bug#607075
Reviewer: Ramesh
Localization Required: No
Documentation Required: No
Description: Fixed an issue in restore tool during the user policy check
Modified Paths:
--------------
trunk/src/utils/restore/iFolderServer.cs
Modified: trunk/src/utils/restore/iFolderServer.cs
===================================================================
--- trunk/src/utils/restore/iFolderServer.cs 2010-08-04 12:57:14 UTC (rev 7450)
+++ trunk/src/utils/restore/iFolderServer.cs 2010-08-04 12:58:32 UTC (rev 7451)
@@ -2407,7 +2407,7 @@
//This check needs to be done unconditionally. Policy violation can happen
// during a partial or a full restore.
CheckiFolderPolicyStatus(iFolderID, NewServer);
- CheckUserPolicyStatus(userName,NewServer);
+ CheckUserPolicyStatus(iFolderID, OldServer, NewServer);
}
return retval;
@@ -2816,9 +2816,12 @@
///
/// <returns>void.</returns>
- public static void CheckUserPolicyStatus(string userName, iFolderServer ifServer){
+ public static void CheckUserPolicyStatus(string ifolderID, iFolderServer oldServer, iFolderServer ifServer){
UserPolicy usrPolicy = null;
- String userID = ifServer.GetUserIDFromName(userName);
+ //Get the Owner from the iFolder and check if there is any violation in the user policies.
+ iFolder ifld = oldServer.GetiFolder(ifolderID);
+ String userID = ifld.OwnerID;
+ String userName = ifld.OwnerUserName;
if( userID != null) {
Console.WriteLine("| Checking user policies post data restore. |");
usrPolicy = ifServer.GetUserPolicy(userID);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|