mirror of
https://github.com/samba-team/samba.git
synced 2025-07-06 08:59:08 +03:00
r26375: Move provision-independent utility function to main samba python module.
(This used to be commit 9d0ff47be0
)
This commit is contained in:
committed by
Stefan Metzmacher
parent
2e5f282a7e
commit
eba25f5d18
@ -14,7 +14,7 @@ import uuid, sid, misc
|
||||
from socket import gethostname, gethostbyname
|
||||
import param
|
||||
import registry
|
||||
from samba import Ldb, substitute_var
|
||||
from samba import Ldb, substitute_var, valid_netbios_name
|
||||
from ldb import Dn, SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
|
||||
LDB_ERR_NO_SUCH_OBJECT, timestring
|
||||
|
||||
@ -191,14 +191,17 @@ unixName: %s
|
||||
""" % (res[0].dn, unixname)
|
||||
ldb.modify(ldb.parse_ldif(mod).next()[1])
|
||||
|
||||
|
||||
def hostip():
|
||||
"""return first host IP."""
|
||||
return gethostbyname(hostname())
|
||||
|
||||
|
||||
def hostname():
|
||||
"""return first part of hostname."""
|
||||
return gethostname().split(".")[0]
|
||||
|
||||
|
||||
def ldb_delete(ldb):
|
||||
"""Delete a LDB file.
|
||||
|
||||
@ -805,15 +808,6 @@ member: %s
|
||||
ldb.transaction_commit()
|
||||
|
||||
|
||||
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:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def join_domain(domain, netbios_name, join_type, creds, message):
|
||||
ctx = NetContext(creds)
|
||||
joindom = object()
|
||||
|
Reference in New Issue
Block a user