[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1378-gb6c61be

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  b6c61bee649734f6000fbf3fe3736d8c82155ac9 (commit)
       via  ee9ad77009ef5e36655a49c41730a4a963ba9d43 (commit)
      from  cd275862c65542ea1118cfb76d7d1b082427098a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit b6c61bee649734f6000fbf3fe3736d8c82155ac9
Merge: cd275862c65542ea1118cfb76d7d1b082427098a ee9ad77009ef5e36655a49c41730a4a963ba9d43
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Mar 28 01:00:48 2008 +0100

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

commit ee9ad77009ef5e36655a49c41730a4a963ba9d43
Author: Andrew Kroeger <andrew at sprocks.gotdns.com>
Date:   Thu Mar 27 16:30:18 2008 -0500

    provision: Increase max NetBIOS name length from 13 to 15.
    
    Issue originally reported by user Julsa-FR on IRC.

-----------------------------------------------------------------------

Summary of changes:
 source/scripting/libjs/provision.js       |    2 +-
 source/scripting/python/samba/__init__.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index 3ba93de..86baa0c 100644
--- a/source/scripting/libjs/provision.js
+++ b/source/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/source/scripting/python/samba/__init__.py b/source/scripting/python/samba/__init__.py
index e91b320..b9d81c6 100644
--- a/source/scripting/python/samba/__init__.py
+++ b/source/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
 


-- 
Samba Shared Repository