WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-api

[Xen-API] [PATCH] Remove license expiry code

To: xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-API] [PATCH] Remove license expiry code
From: Jon Ludlam <jonathan.ludlam@xxxxxxxxxxxxx>
Date: Mon, 18 Oct 2010 11:26:05 +0100
Delivery-date: Mon, 18 Oct 2010 03:27:35 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-api-request@lists.xensource.com?subject=help>
List-id: Discussion of API issues surrounding Xen <xen-api.lists.xensource.com>
List-post: <mailto:xen-api@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-api-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.4.3
# HG changeset patch
# User Jonathan Ludlam <Jonathan.Ludlam@xxxxxxxxxxxxx>
# Date 1287397511 -3600
# Node ID 35b5f10d8401de1d65225ab0cc5f2595af7ca304
# Parent  7438d990fed8255bba2d592f767de133bd45863a
Remove license expiry code

Signed-off-by: Jon Ludlam <jonathan.ludlam@xxxxxxxxxxxxx>

diff -r 7438d990fed8 -r 35b5f10d8401 ocaml/license/license.ml
--- a/ocaml/license/license.ml
+++ b/ocaml/license/license.ml
@@ -154,6 +154,6 @@
 
 (* Calls to obtain info about license *)
 
-let check_expiry l =
-       Unix.time () < l.expiry
+let check_expiry l = ()
+(*     Unix.time () < l.expiry *)
 
diff -r 7438d990fed8 -r 35b5f10d8401 ocaml/xapi/license_check.ml
--- a/ocaml/xapi/license_check.ml
+++ b/ocaml/xapi/license_check.ml
@@ -15,8 +15,8 @@
 open Vmopshelpers
 open Stringext
 
-let vm ~__context vm =
-       (* Here we check that the license is still valid - this should be the 
only place where this happens *)
+let vm ~__context vm = ()
+(*     (* Here we check that the license is still valid - this should be the 
only place where this happens *)
        let host = Helpers.get_localhost ~__context in
        let license = Db.Host.get_license_params ~__context ~self:host in
        let expired =
@@ -28,7 +28,7 @@
                        Unix.time () > expiry
                end
        in
-       if expired then raise (Api_errors.Server_error 
(Api_errors.license_expired, []))
+       if expired then raise (Api_errors.Server_error 
(Api_errors.license_expired, [])) *)
 
 (* XXX: why use a "with_" style function here? *)
 let with_vm_license_check ~__context v f =
 ocaml/license/license.ml    |  4 ++--
 ocaml/xapi/license_check.ml |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


Attachment: xen-api.hg.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-API] [PATCH] Remove license expiry code, Jon Ludlam <=