summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-28 11:10:19 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-28 11:10:19 +1100
commit3d9589ba5a1b50a71d29f4b6a119da72264816d0 (patch)
tree51d1b2f7b9a4ccd985c9f6912c2e8e14ef7d7790
parent392fd9686523fe5e1cd6b6c080c5f168f5556d3e (diff)
parent0cffe980495c718494c7a879bfe5939c62e908ac (diff)
downloadsamba-3d9589ba5a1b50a71d29f4b6a119da72264816d0.tar.gz
samba-3d9589ba5a1b50a71d29f4b6a119da72264816d0.tar.bz2
samba-3d9589ba5a1b50a71d29f4b6a119da72264816d0.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit ddf9d6ef70f0a6b7da420f772b34962fb25d761a)
-rw-r--r--source4/scripting/libjs/provision.js2
-rw-r--r--source4/scripting/python/samba/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3ba93debf9..86baa0c003 100644
--- 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 e91b320c07..b9d81c6c3c 100644
--- 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