From 19e182e7e7916050d112e09f9bf29b734236c4af Mon Sep 17 00:00:00 2001 From: Jonathan Ludlam Date: Mon, 18 Oct 2010 11:25:11 +0100 Subject: [PATCH] Remove license expiry code Signed-off-by: Jon Ludlam --- ocaml/license/license.ml | 4 ++-- ocaml/xapi/license_check.ml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ocaml/license/license.ml b/ocaml/license/license.ml index 2e5d339f..e6497425 100644 --- a/ocaml/license/license.ml +++ b/ocaml/license/license.ml @@ -154,6 +154,6 @@ let license : license ref = ref (default ()) (* Calls to obtain info about license *) -let check_expiry l = - Unix.time () < l.expiry +let check_expiry l = () +(* Unix.time () < l.expiry *) diff --git a/ocaml/xapi/license_check.ml b/ocaml/xapi/license_check.ml index c66b660f..1389c7db 100644 --- a/ocaml/xapi/license_check.ml +++ b/ocaml/xapi/license_check.ml @@ -15,8 +15,8 @@ module L = Debug.Debugger(struct let name="license" end) 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 @@ let vm ~__context vm = 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 = -- 2.39.5