siinus
/
Microsoft-Activation-Scripts
mirror of https://github.com/massgravel/Microsoft-Activation-Scripts
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update as per abbodi1406's CAS 

No KMS Client info when ADBA is shown
pull/1171/head
WindowsAddict 1 month ago
parent
82f7cfe5f4
commit
979dfb750b
2 changed files with 22 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      MAS/All-In-One-Version-KL/MAS_AIO.cmd
  2. 19
      MAS/Separate-Files-Version/Check_Activation_Status.cmd

19
MAS/All-In-One-Version-KL/MAS_AIO.cmd
Unescape View File

@ -14965,6 +14965,7 @@ function DetectSubscription {
function DetectAdbaClient function DetectAdbaClient
{ {
$propADBA | foreach { set $_ (SlGetInfoSku $licID $_) } $propADBA | foreach { set $_ (SlGetInfoSku $licID $_) }
DetectActType
CONOUT "`nAD Activation client information:" CONOUT "`nAD Activation client information:"
CONOUT " Object Name: $ADActivationObjectName" CONOUT " Object Name: $ADActivationObjectName"
CONOUT " Domain Name: $ADActivationObjectDN" CONOUT " Domain Name: $ADActivationObjectDN"
@ -15055,17 +15056,18 @@ function DetectKmsHost
if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"} if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"}
} }
function DetectKmsClient function DetectActType
{ {
if ($win8) $VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType"
{ if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"}
$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType" if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"} if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
}
if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"} if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"}
}
function DetectKmsClient
{
if ($win8) {DetectActType}
CONOUT "`r" CONOUT "`r"
if ($LicenseStatus -NE 1) { if ($LicenseStatus -NE 1) {
CONOUT "Please activate the product in order to update KMS client information values." CONOUT "Please activate the product in order to update KMS client information values."
@ -15313,6 +15315,7 @@ function GetResult($strSLP, $strApp, $entry)
if ($win8 -And $VLActivationType -EQ 1) { if ($win8 -And $VLActivationType -EQ 1) {
DetectAdbaClient DetectAdbaClient
$cKmsClient = $null
} }
if ($winID -And $null -NE $cAvmClient) { if ($winID -And $null -NE $cAvmClient) {

19
MAS/Separate-Files-Version/Check_Activation_Status.cmd
Unescape View File

@ -518,6 +518,7 @@ function DetectSubscription {
function DetectAdbaClient function DetectAdbaClient
{ {
$propADBA | foreach { set $_ (SlGetInfoSku $licID $_) } $propADBA | foreach { set $_ (SlGetInfoSku $licID $_) }
DetectActType
CONOUT "`nAD Activation client information:" CONOUT "`nAD Activation client information:"
CONOUT " Object Name: $ADActivationObjectName" CONOUT " Object Name: $ADActivationObjectName"
CONOUT " Domain Name: $ADActivationObjectDN" CONOUT " Domain Name: $ADActivationObjectDN"
@ -608,17 +609,18 @@ function DetectKmsHost
if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"} if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"}
} }
function DetectKmsClient function DetectActType
{ {
if ($win8) $VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType"
{ if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"}
$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType" if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"} if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
}
if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"} if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"}
}
function DetectKmsClient
{
if ($win8) {DetectActType}
CONOUT "`r" CONOUT "`r"
if ($LicenseStatus -NE 1) { if ($LicenseStatus -NE 1) {
CONOUT "Please activate the product in order to update KMS client information values." CONOUT "Please activate the product in order to update KMS client information values."
@ -866,6 +868,7 @@ function GetResult($strSLP, $strApp, $entry)
if ($win8 -And $VLActivationType -EQ 1) { if ($win8 -And $VLActivationType -EQ 1) {
DetectAdbaClient DetectAdbaClient
$cKmsClient = $null
} }
if ($winID -And $null -NE $cAvmClient) { if ($winID -And $null -NE $cAvmClient) {

Write Preview
Loading…
Cancel
Save