From 7a95afb97832a93a05dbf7e8baf4876ba1ae34f5 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 29 Mar 2012 09:33:52 +0200
Subject: [PATCH] use validdirectory instead of validdomains

---
 PVE/API2/Subscription.pm | 9 +++++----
 debian/changelog.Debian  | 6 ++++++
 defines.mk               | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/PVE/API2/Subscription.pm b/PVE/API2/Subscription.pm
index 52e66d3b..9701c6f0 100644
--- a/PVE/API2/Subscription.pm
+++ b/PVE/API2/Subscription.pm
@@ -85,15 +85,15 @@ sub check_fields {
 
     return undef if $info->{status} ne 'Active';
 
-    foreach my $f (qw(validdomain productname regdate nextduedate)) {
+    foreach my $f (qw(validdirectory productname regdate nextduedate)) {
 	if (!$info->{$f}) {
 	    die "Missing field '$f'\n";
 	}
     }
 
     my $found;
-    foreach my $dom (split(/,/, $info->{validdomain})) {
-	if ($dom eq $server_id) {
+    foreach my $hwid (split(/,/, $info->{validdirectory})) {
+	if ($hwid eq $server_id) {
 	    $found = 1;
 	    last;
 	}
@@ -193,7 +193,8 @@ sub check_subscription {
 
     my $params = {
 	licensekey => $key,
-	domain => $server_id,
+	dir => $server_id,
+	domain => 'www.proxmox.com',
 	ip => 'localhost',
 	check_token => $check_token,
     };
diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 9ac07b1f..82aae055 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,9 @@
+pve-manager (2.0-52) unstable; urgency=low
+
+  * fix Subscription code
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 29 Mar 2012 09:32:32 +0200
+
 pve-manager (2.0-51) unstable; urgency=low
 
   * fix bug #55: add Migrate and Stop to context menu
diff --git a/defines.mk b/defines.mk
index 5ecabfd0..e79347b5 100644
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=pve-manager
-PACKAGERELEASE=51
+PACKAGERELEASE=52
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5