From c333210af6245ce75d7169e11f42c7d3e6fc7d3b Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Thu, 3 Mar 2011 10:40:32 -0800
Subject: [PATCH] Remove default gateway from password provider list

---
 pwdmgr-win/win/service/VMOpsServiceProvider.cpp | 3 +++
 pwdmgr-win/win/service/VMOpsStartupWatcher.cpp  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pwdmgr-win/win/service/VMOpsServiceProvider.cpp b/pwdmgr-win/win/service/VMOpsServiceProvider.cpp
index ad968e526a2..be1b92ff018 100644
--- a/pwdmgr-win/win/service/VMOpsServiceProvider.cpp
+++ b/pwdmgr-win/win/service/VMOpsServiceProvider.cpp
@@ -135,6 +135,8 @@ HERROR CVMOpsServiceProvider::GetNextPasswordProvider(LPSTR lpszBuf, LPDWORD pdw
 	{
 		CLogger::GetInstance()->Log("INFO", "Building available password provider list");
 
+		// don't need to add default gateway to password provider list any more
+#if 0
 		IP_ADDRESS_STRING addr;
 		memset(&addr, 0, sizeof(addr));
 		DWORD dwLength = sizeof(addr.String);
@@ -145,6 +147,7 @@ HERROR CVMOpsServiceProvider::GetNextPasswordProvider(LPSTR lpszBuf, LPDWORD pdw
 			CLogger::GetInstance()->Log("INFO", "Add default gateway: %s", addr.String);
 			m_lstProviders.push_back(addr);
 		}
+#endif
 
 		GetDHCPServers(m_lstProviders);
 	}
diff --git a/pwdmgr-win/win/service/VMOpsStartupWatcher.cpp b/pwdmgr-win/win/service/VMOpsStartupWatcher.cpp
index a320ba5025a..56a1cb9e5b8 100644
--- a/pwdmgr-win/win/service/VMOpsStartupWatcher.cpp
+++ b/pwdmgr-win/win/service/VMOpsStartupWatcher.cpp
@@ -153,7 +153,8 @@ BOOL CVMOpsStartupWatcher::DoStartupConfig()
 			}
 			else
 			{
-				CLogger::GetInstance()->Log("INFO", "No need to set password");
+				CLogger::GetInstance()->Log("INFO", "No need to set password, because %ws said so with response %s", achUrl, achResult);
+				return FALSE;
 			}
 		}
 		else