From ff7c0df0a24a520fd819a2ec7f41e233dfac2d7d Mon Sep 17 00:00:00 2001
From: Timur Sufiev <tsufiev@mirantis.com>
Date: Mon, 25 Nov 2013 21:01:47 +0400
Subject: [PATCH] More fine-grained AD domain name validation checks.

Do not complain about NetBIOS and DNS hostname if there is no dot in
domain name.

Change-Id: Ia11efcb1b51f53c89dc0899a9b34ca150f5d7534
Closes-bug: #1250823
---
 muranorepository/Services/ui_forms/ActiveDirectory.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/muranorepository/Services/ui_forms/ActiveDirectory.yaml b/muranorepository/Services/ui_forms/ActiveDirectory.yaml
index 15f38a0..f329bc7 100644
--- a/muranorepository/Services/ui_forms/ActiveDirectory.yaml
+++ b/muranorepository/Services/ui_forms/ActiveDirectory.yaml
@@ -42,12 +42,12 @@ forms:
                 names. Single-level domain is not
                 appropriate. Subdomains are not allowed.
             - expr:
-                regexpValidator: '^[^.]{1,15}\..*$'
+                regexpValidator: '(^[^.]+$|^[^.]{1,15}\..*$)'
               message: >-
                 NetBIOS name cannot be shorter than 1 symbol and
                 longer than 15 symbols.
             - expr:
-                regexpValidator: '^[^.]*\.[^.]{2,63}.*$'
+                regexpValidator: '(^[^.]+$|^[^.]*\.[^.]{2,63}.*$)'
               message: >-
                 DNS host name cannot be shorter than 2 symbols and
                 longer than 63 symbols.