# HG changeset patch # User Jonathan Ludlam # Date 1287397511 -3600 # Node ID 35b5f10d8401de1d65225ab0cc5f2595af7ca304 # Parent 7438d990fed8255bba2d592f767de133bd45863a Remove license expiry code Signed-off-by: Jon Ludlam 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 =