Finished changes to resolve issues associated with server response without payload data.
Changed the name of the .msi files to not include "-msi" as part of the names as per request. GetAuthToken requests that fail due to a name resolution error now will return an error code indicating the reason.
This commit is contained in:
parent
d571fa1391
commit
5f0d0a486f
@ -31,6 +31,10 @@
|
||||
|
||||
#define DEFAULT_RETRY_LIFETIME 5 // seconds
|
||||
|
||||
#ifndef CASA_STATUS_NAME_RESOLVE_ERROR
|
||||
#define CASA_STATUS_NAME_RESOLVE_ERROR ((CasaStatus)0x00000024)
|
||||
#endif
|
||||
|
||||
//===[ Function prototypes ]===============================================
|
||||
|
||||
int
|
||||
@ -191,6 +195,9 @@ ObtainSessionToken(
|
||||
else
|
||||
{
|
||||
DbgTrace(0, "-ObtainSessionToken- Did not receive Authenticate Response data\n", 0);
|
||||
retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
|
||||
CASA_FACILITY_AUTHTOKEN,
|
||||
CASA_STATUS_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -397,11 +404,17 @@ ObtainAuthTokenFromServer(
|
||||
else
|
||||
{
|
||||
DbgTrace(0, "-ObtainAuthTokenFromServer- Did not receive GetAuthToken Response data\n", 0);
|
||||
retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
|
||||
CASA_FACILITY_AUTHTOKEN,
|
||||
CASA_STATUS_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DbgTrace(0, "-ObtainAuthTokenFromServer- GetAuthToken Rpc failure, error = %08X\n", retStatus);
|
||||
retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
|
||||
CASA_FACILITY_AUTHTOKEN,
|
||||
CASA_STATUS_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -430,6 +443,9 @@ ObtainAuthTokenFromServer(
|
||||
else
|
||||
{
|
||||
DbgTrace(0, "-ObtainAuthTokenFromServer- Did not receive GetAuthPolicy Response data\n", 0);
|
||||
retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
|
||||
CASA_FACILITY_AUTHTOKEN,
|
||||
CASA_STATUS_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -707,7 +723,7 @@ ObtainAuthTokenInt(
|
||||
DbgTrace(0, "-ObtainAuthTokenInt- Host name normalization failed\n", 0);
|
||||
retStatus = CasaStatusBuild(CASA_SEVERITY_ERROR,
|
||||
CASA_FACILITY_AUTHTOKEN,
|
||||
CASA_STATUS_UNSUCCESSFUL);
|
||||
CASA_STATUS_NAME_RESOLVE_ERROR);
|
||||
}
|
||||
|
||||
exit:
|
||||
|
@ -67,7 +67,7 @@
|
||||
AdditionalDependencies="micasa.lib"
|
||||
OutputFile="$(OutDir)/pwmech.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\..\..\..\CASA\micasadk\Release"
|
||||
AdditionalLibraryDirectories=""\Program Files\Novell\CASA\lib";..\..\..\..\..\..\CASA\micasadk\Release"
|
||||
IgnoreDefaultLibraryNames="libc"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)/pw.pdb"
|
||||
@ -149,7 +149,7 @@
|
||||
AdditionalDependencies="micasa.lib"
|
||||
OutputFile="$(OutDir)/pwmech.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="..\..\..\..\..\..\CASA\micasadk\Release"
|
||||
AdditionalLibraryDirectories=""\Program Files\Novell\CASA\lib";..\..\..\..\..\..\CASA\micasadk\Release"
|
||||
IgnoreDefaultLibraryNames="libc"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="0"
|
||||
|
@ -359,7 +359,7 @@ InternalRpc(
|
||||
#define RPC_TARGET_FMT_STRING "CasaAuthTokenSvc/Rpc?method=%s"
|
||||
|
||||
#ifndef CASA_STATUS_INVALID_SERVER_CERTIFICATE
|
||||
#define CASA_STATUS_INVALID_SERVER_CERTIFICATE CASA_STATUS_UNSUCCESSFUL // temporary until casa_status.h is updated
|
||||
#define CASA_STATUS_INVALID_SERVER_CERTIFICATE ((CasaStatus)0x00000023)
|
||||
#endif
|
||||
|
||||
CasaStatus retStatus = CASA_STATUS_SUCCESS;
|
||||
|
@ -19,6 +19,12 @@
|
||||
"OwnerKey" = "8:_UNDEFINED"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
"Entry"
|
||||
{
|
||||
"MsmKey" = "8:_UNDEFINED"
|
||||
"OwnerKey" = "8:_8BA6CEFB68CD4AAD97E83D7408DF393B"
|
||||
"MsmSig" = "8:_UNDEFINED"
|
||||
}
|
||||
}
|
||||
"Configurations"
|
||||
{
|
||||
@ -27,7 +33,7 @@
|
||||
"DisplayName" = "8:Debug"
|
||||
"IsDebugOnly" = "11:TRUE"
|
||||
"IsReleaseOnly" = "11:FALSE"
|
||||
"OutputFilename" = "8:Debug\\authtokenclient_msi.msi"
|
||||
"OutputFilename" = "8:Debug\\authtokenclient.msi"
|
||||
"PackageFilesAs" = "3:2"
|
||||
"PackageFileSize" = "3:-2147483648"
|
||||
"CabType" = "3:1"
|
||||
@ -59,7 +65,7 @@
|
||||
"DisplayName" = "8:Release"
|
||||
"IsDebugOnly" = "11:FALSE"
|
||||
"IsReleaseOnly" = "11:TRUE"
|
||||
"OutputFilename" = "8:Release\\authtokenclient_msi.msi"
|
||||
"OutputFilename" = "8:Release\\authtokenclient.msi"
|
||||
"PackageFilesAs" = "3:2"
|
||||
"PackageFileSize" = "3:-2147483648"
|
||||
"CabType" = "3:1"
|
||||
@ -171,7 +177,7 @@
|
||||
"Name" = "8:Microsoft Visual Studio"
|
||||
"ProductName" = "8:authtokenclient"
|
||||
"ProductCode" = "8:{6D3AAA36-871A-4427-9311-FC3FE2F17511}"
|
||||
"PackageCode" = "8:{AF5CA0D9-0CFE-4EDF-9B54-8B936910C236}"
|
||||
"PackageCode" = "8:{9794A10E-6E27-4DDE-8C40-535FA06EB88E}"
|
||||
"UpgradeCode" = "8:{69C5F129-788A-4487-9397-331C0A313A2D}"
|
||||
"RestartWWWService" = "11:FALSE"
|
||||
"RemovePreviousVersions" = "11:FALSE"
|
||||
|
@ -57,7 +57,7 @@
|
||||
"DisplayName" = "8:Debug"
|
||||
"IsDebugOnly" = "11:TRUE"
|
||||
"IsReleaseOnly" = "11:FALSE"
|
||||
"OutputFilename" = "8:Debug\\authtokenclientdevel_msi.msi"
|
||||
"OutputFilename" = "8:Debug\\authtokenclientdevel.msi"
|
||||
"PackageFilesAs" = "3:2"
|
||||
"PackageFileSize" = "3:-2147483648"
|
||||
"CabType" = "3:1"
|
||||
@ -94,7 +94,7 @@
|
||||
"DisplayName" = "8:Release"
|
||||
"IsDebugOnly" = "11:FALSE"
|
||||
"IsReleaseOnly" = "11:TRUE"
|
||||
"OutputFilename" = "8:Release\\authtokenclientdevel_msi.msi"
|
||||
"OutputFilename" = "8:Release\\authtokenclientdevel.msi"
|
||||
"PackageFilesAs" = "3:2"
|
||||
"PackageFileSize" = "3:-2147483648"
|
||||
"CabType" = "3:1"
|
||||
@ -325,7 +325,7 @@
|
||||
"Name" = "8:Microsoft Visual Studio"
|
||||
"ProductName" = "8:authtokenclientdevel_msi"
|
||||
"ProductCode" = "8:{C3A6CFD7-F415-4317-AA75-45888378B08A}"
|
||||
"PackageCode" = "8:{C1C1B7C2-503A-4064-8C67-3BBC55C1E619}"
|
||||
"PackageCode" = "8:{A96250E5-B755-4245-9366-FDB7A997B9FC}"
|
||||
"UpgradeCode" = "8:{A98C298C-4FB1-4267-9045-92B820B97A14}"
|
||||
"RestartWWWService" = "11:FALSE"
|
||||
"RemovePreviousVersions" = "11:FALSE"
|
||||
|
Loading…
Reference in New Issue
Block a user