Remove license expiry code

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>

diff --git a/ocaml/license/license.ml b/ocaml/license/license.ml
index 2e5d339f64be60251036a2506986d0385c9b7972..e6497425a2ab816e3e2c4f34fb00e7f5c46a023c 100644 (file)
--- 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 c66b660fb3b152644f9ebf8e08d6a26dabd30432..1389c7dbea2304fc5f424e6d9f9afd8fb07f852a 100644 (file)
--- 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 =