Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3

(This used to be commit 71110c8e7d58f42312938d0a8d0b216cbc313885)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3ba93debf98100da234e425fbdd84025c5ba80b4..86baa0c003810037393eefb843b84980371037a2 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1174,7 +1174,7 @@ member: %s
 // crh has a paragraph on this in his book (1.4.1.1)
 function valid_netbios_name(name)
 {
-       if (strlen(name) > 13) return false;
+       if (strlen(name) > 15) return false;
        return true;
 }
 

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index e91b320c073ad6ec8a05b82b24cf6db5db3d2f80..b9d81c6c3c42cc0b371942b9c0df81485e029fa4 100644 (file)
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -225,7 +225,7 @@ def valid_netbios_name(name):
     """Check whether a name is valid as a NetBIOS name. """
     # FIXME: There are probably more constraints here. 
     # crh has a paragraph on this in his book (1.4.1.1)
-    if len(name) > 13:
+    if len(name) > 15:
         return False
     return True