components/ruby/mcollective/patches/03-mco-service-name
changeset 5860 afd31ba91ee9
parent 5643 ccf9fb8a1db9
equal deleted inserted replaced
5859:98bc99958997 5860:afd31ba91ee9
     1 --- mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb.orig	2016-03-03 12:06:59.523158420 -0800
     1 --- mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb.orig	2016-04-20 12:39:03.373816055 -0700
     2 +++ mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb	2016-03-03 12:07:26.197744202 -0800
     2 +++ mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb	2016-04-20 12:39:40.471363771 -0700
     3 @@ -2,7 +2,7 @@
     3 @@ -1,8 +1,12 @@
       
     4 +#######################################################################
       
     5 +# Oracle has modified the originally distributed contents of this file.
       
     6 +#######################################################################
       
     7 +
       
     8  module MCollective
     4    module Validator
     9    module Validator
     5      class Service_nameValidator
    10      class Service_nameValidator
     6        def self.validate(service_name)
    11        def self.validate(service_name)
     7 -        raise("%s is not a valid service name" % service_name) unless !!(service_name =~ /\A^[a-zA-Z\.\-_\d]+$\z/)
    12 -        raise("%s is not a valid service name" % service_name) unless !!(service_name =~ /\A^[a-zA-Z\.\-_\d]+$\z/)
     8 +        raise("%s is not a valid service name" % service_name) unless !!(service_name =~ /\A^[a-zA-Z\.\-_\d\:\/]+$\z/)
    13 +        raise("%s is not a valid service name" % service_name) unless !!(service_name =~ /\A^[a-zA-Z\.\-_\d\:\/]+$\z/)