From bf38a5df5b69d41e4fa5fff7cb4447a5155058ce Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 27 May 2012 14:17:52 +0200 Subject: [PATCH] Avoid all(), as it's not available in Python 2.4. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun May 27 16:13:34 CEST 2012 on sn-devel-104 --- source4/scripting/python/samba/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 6ffd2a308cc..23c6ed77d74 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -302,12 +302,16 @@ MAX_NETBIOS_NAME_LEN = 15 def is_valid_netbios_char(c): return (c.isalnum() or c in " !#$%&'()-.@^_{}~") + def valid_netbios_name(name): """Check whether a name is valid as a NetBIOS name. """ # See crh's book (1.4.1.1) if len(name) > MAX_NETBIOS_NAME_LEN: return False - return all([is_valid_netbios_char(x) for x in name]) + for x in name: + if not is_valid_netbios_char(x): + return False + return True def import_bundled_package(modulename, location): -- 2.34.1