mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
cleanup and name changes to windows password manager
This commit is contained in:
parent
f0a74e6314
commit
c1132d5d20
@ -1,8 +1,8 @@
|
||||
//
|
||||
// VMOpsError.h
|
||||
// VMOps common error codes
|
||||
// Common error codes
|
||||
//
|
||||
// Copyright (C) VMOps Inc.
|
||||
// Copyright (C) Cloud.com Inc.
|
||||
// All rights reserved.
|
||||
//
|
||||
#ifndef __VMOpsError_H__
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// ThreadUtl.h
|
||||
//
|
||||
// Copyright (C) VMOps Inc.
|
||||
// Copyright (C) Cloud.com Inc.
|
||||
// All rights reserved.
|
||||
//
|
||||
|
||||
|
||||
Binary file not shown.
@ -29,10 +29,10 @@ public :
|
||||
{
|
||||
CAtlServiceModuleT< CVMOpsInstanceManagerModule, IDS_SERVICENAME >::PreMessageLoop(nShowCmd);
|
||||
|
||||
// m_serviceProvider.SetPassword(_T("Administrator"), _T("password@vmops.com"));
|
||||
CLogger::GetInstance()->Initialize();
|
||||
m_serviceProvider.Start();
|
||||
|
||||
SetServiceStatus(SERVICE_RUNNING);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ public :
|
||||
}
|
||||
|
||||
SC_HANDLE hService = ::CreateService(
|
||||
hSCM, m_szServiceName, _T("VMOps Instance Manager"),
|
||||
hSCM, m_szServiceName, _T("Cloud.com VM Instance Manager"),
|
||||
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
|
||||
/*SERVICE_DEMAND_START*/ SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
|
||||
szFilePath, NULL, NULL, _T("RPCSS\0"), NULL, NULL);
|
||||
|
||||
@ -16,13 +16,11 @@
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
// English (United States) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -59,8 +57,8 @@ END
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,0,0,1
|
||||
PRODUCTVERSION 1,0,0,1
|
||||
FILEVERSION 1,0,0,2
|
||||
PRODUCTVERSION 2,0,2,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@ -75,14 +73,14 @@ BEGIN
|
||||
BEGIN
|
||||
BLOCK "040904e4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "VMOps Inc."
|
||||
VALUE "FileDescription", "VMOps Instance Management Service"
|
||||
VALUE "FileVersion", "1.0.0.1"
|
||||
VALUE "InternalName", "VMOps Instance Manager.exe"
|
||||
VALUE "LegalCopyright", "(c) VMOps Inc. All rights reserved."
|
||||
VALUE "OriginalFilename", "VMOps Instance Manager.exe"
|
||||
VALUE "ProductName", "VMOps Cloud Service"
|
||||
VALUE "ProductVersion", "1.0.0.1"
|
||||
VALUE "CompanyName", "Cloud.com Inc."
|
||||
VALUE "FileDescription", "Cloud.com Instance Management Service"
|
||||
VALUE "FileVersion", "1.0.0.2"
|
||||
VALUE "InternalName", "Cloud.com Instance Manager.exe"
|
||||
VALUE "LegalCopyright", "(c) Cloud.com Inc. All rights reserved."
|
||||
VALUE "OriginalFilename", "Cloud.com Instance Manager.exe"
|
||||
VALUE "ProductName", "Cloud.com CloudStack"
|
||||
VALUE "ProductVersion", "2.0.2.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
@ -104,12 +102,12 @@ IDR_VMOPSINSTANCEMANAGER REGISTRY "VMOps Instance Manager.rgs"
|
||||
// String Table
|
||||
//
|
||||
|
||||
STRINGTABLE
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_SERVICENAME "VMOpsInstanceMgr"
|
||||
IDS_SERVICENAME "Cloud.com Instance Manager"
|
||||
END
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
#endif // English (United States) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
//
|
||||
// VMOpsServiceImpl.h
|
||||
// VMOps instance manager implementation
|
||||
// Cloud.com instance manager implementation
|
||||
//
|
||||
// Copyright (C) VMOps Inc.
|
||||
// Copyright (C) Cloud.com Inc.
|
||||
// All rights reserved.
|
||||
//
|
||||
#ifndef __VMOpsServiceImpl_H__
|
||||
|
||||
@ -143,6 +143,9 @@ HERROR CVMOpsServiceProvider::GetNextPasswordProvider(LPSTR lpszBuf, LPDWORD pdw
|
||||
{
|
||||
strcpy(lpszBuf, (*(m_lstProviders.begin())).String);
|
||||
m_lstProviders.pop_front();
|
||||
|
||||
if(strcmpi(lpszBuf, "0.0.0.0") == 0)
|
||||
lpszBuf[0] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -80,7 +80,7 @@ BOOL CVMOpsStartupWatcher::GetPasswordProviderUrl(LPTSTR lpszUrl)
|
||||
char achBuf[256];
|
||||
achBuf[0] = 0;
|
||||
DWORD dwLength = sizeof(achBuf);
|
||||
if(m_pProvider->GetNextPasswordProvider(achBuf, &dwLength) == HERROR_SUCCESS)
|
||||
if(m_pProvider->GetNextPasswordProvider(achBuf, &dwLength) == HERROR_SUCCESS && achBuf[0] != 0)
|
||||
{
|
||||
USES_CONVERSION;
|
||||
|
||||
@ -112,7 +112,7 @@ BOOL CVMOpsStartupWatcher::DoStartupConfig()
|
||||
|
||||
if(achUrl[0] != 0)
|
||||
{
|
||||
CLogger::GetInstance()->Log("INFO", "Contact default gateway at : %ws", achUrl);
|
||||
CLogger::GetInstance()->Log("INFO", "Contact password provider at : %ws", achUrl);
|
||||
|
||||
memset(achResult, 0, sizeof(achResult));
|
||||
DWORD dwBytesToRead = sizeof(achResult) - 1;
|
||||
@ -158,7 +158,7 @@ BOOL CVMOpsStartupWatcher::DoStartupConfig()
|
||||
}
|
||||
else
|
||||
{
|
||||
CLogger::GetInstance()->Log("ERROR", "Unable to contact default gateway at : %ws", achUrl);
|
||||
CLogger::GetInstance()->Log("ERROR", "Unable to contact password provider at : %ws", achUrl);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@ -235,9 +235,9 @@
|
||||
"Product"
|
||||
{
|
||||
"Name" = "8:Microsoft Visual Studio"
|
||||
"ProductName" = "8:VMOps VM Instance Manager"
|
||||
"ProductName" = "8:Cloud.com VM Instance Manager"
|
||||
"ProductCode" = "8:{CF1EDAC1-1EF6-495A-8211-8EECEE496060}"
|
||||
"PackageCode" = "8:{0AD84965-2422-4BDC-8573-3A25C949D70D}"
|
||||
"PackageCode" = "8:{BC086418-B24B-4152-AA2B-12178382DD18}"
|
||||
"UpgradeCode" = "8:{24149E96-AFD7-4183-8507-7778FC637D39}"
|
||||
"AspNetVersion" = "8:4.0.30319.0"
|
||||
"RestartWWWService" = "11:FALSE"
|
||||
@ -245,15 +245,15 @@
|
||||
"DetectNewerInstalledVersion" = "11:FALSE"
|
||||
"InstallAllUsers" = "11:TRUE"
|
||||
"ProductVersion" = "8:1.0.0"
|
||||
"Manufacturer" = "8:VMOps, Inc."
|
||||
"Manufacturer" = "8:Cloud.com, Inc."
|
||||
"ARPHELPTELEPHONE" = "8:"
|
||||
"ARPHELPLINK" = "8:"
|
||||
"Title" = "8:Setup VMOps VM Instance Manager"
|
||||
"Title" = "8:Setup Cloud.com VM Instance Manager"
|
||||
"Subject" = "8:"
|
||||
"ARPCONTACT" = "8:VMOps, Inc."
|
||||
"ARPCONTACT" = "8:Cloud.com, Inc."
|
||||
"Keywords" = "8:"
|
||||
"ARPCOMMENTS" = "8:"
|
||||
"ARPURLINFOABOUT" = "8:http://www.vmops.com/"
|
||||
"ARPURLINFOABOUT" = "8:http://www.cloud.com/"
|
||||
"ARPPRODUCTICON" = "8:"
|
||||
"ARPIconIndex" = "3:0"
|
||||
"SearchPath" = "8:"
|
||||
@ -384,8 +384,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
"UpdateText"
|
||||
@ -429,8 +428,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
}
|
||||
@ -452,8 +450,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
"CopyrightWarning"
|
||||
@ -501,8 +498,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
}
|
||||
@ -533,8 +529,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
"ShowProgress"
|
||||
@ -578,8 +573,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
"ShowProgress"
|
||||
@ -629,8 +623,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
}
|
||||
@ -652,8 +645,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
"InstallAllUsersVisible"
|
||||
@ -688,8 +680,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
"CopyrightWarning"
|
||||
@ -752,8 +743,7 @@
|
||||
"Type" = "3:8"
|
||||
"ContextData" = "8:Bitmap"
|
||||
"Attributes" = "3:4"
|
||||
"Setting" = "3:2"
|
||||
"Value" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA"
|
||||
"Setting" = "3:1"
|
||||
"UsePlugInResources" = "11:TRUE"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user