diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 01:00:48 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 01:00:48 +0100 |
| commit | 0cffe980495c718494c7a879bfe5939c62e908ac (patch) | |
| tree | 56ad819c0bd6b1ac147d52d17be085e8f9e9927f | |
| parent | 4eb694389c88dd33f5ebea78c11ca1cb108357d2 (diff) | |
| parent | b2c6ba69a453aaa7cbabb7be7b8c2a05b48a76c4 (diff) | |
| download | samba-0cffe980495c718494c7a879bfe5939c62e908ac.tar.gz samba-0cffe980495c718494c7a879bfe5939c62e908ac.tar.bz2 samba-0cffe980495c718494c7a879bfe5939c62e908ac.zip | |
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-test
(This used to be commit b6c61bee649734f6000fbf3fe3736d8c82155ac9)
| -rw-r--r-- | source4/scripting/libjs/provision.js | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 2 |
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 |