diff options
author | Giampaolo Lauria <lauria2@yahoo.com> | 2011-09-07 11:11:38 -0400 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-09 15:24:04 +1000 |
commit | 69a2e4b3605863971c26e78adcc78cab2f6c4b06 (patch) | |
tree | 49715be4724d3fb62180a0b5db6d4fe883e02e74 /source4/scripting/python/samba/netcmd/spn.py | |
parent | f4f77bb95422c8dbc5df9d4156b660eb41034883 (diff) | |
download | samba-69a2e4b3605863971c26e78adcc78cab2f6c4b06.tar.gz samba-69a2e4b3605863971c26e78adcc78cab2f6c4b06.tar.xz samba-69a2e4b3605863971c26e78adcc78cab2f6c4b06.zip |
samba-tool: Moved _get_user_realm_domain fcn to common
_get_user_realm_domain is used by both delegation and spn commands
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/netcmd/spn.py')
-rw-r--r-- | source4/scripting/python/samba/netcmd/spn.py | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/source4/scripting/python/samba/netcmd/spn.py b/source4/scripting/python/samba/netcmd/spn.py index 6e9d2dece8b..6c36f6ca4c7 100644 --- a/source4/scripting/python/samba/netcmd/spn.py +++ b/source4/scripting/python/samba/netcmd/spn.py @@ -21,10 +21,10 @@ import samba.getopt as options import ldb -import re from samba import provision from samba.samdb import SamDB from samba.auth import system_session +from samba.netcmd.common import _get_user_realm_domain from samba.netcmd import ( Command, CommandError, @@ -34,30 +34,6 @@ from samba.netcmd import ( -def _get_user_realm_domain(user): - """ get the realm or the domain and the base user - from user like: - * username - * DOMAIN\username - * username@REALM - """ - - baseuser = user - realm = "" - domain = "" - m = re.match(r"(\w+)\\(\w+$)", user) - if m: - domain = m.group(1) - baseuser = m.group(2) - return (baseuser.lower(), domain.upper(), realm) - m = re.match(r"(\w+)@(\w+)", user) - if m: - baseuser = m.group(1) - realm = m.group(2) - return (baseuser.lower(), domain, realm.upper()) - - - class cmd_spn_list(Command): """List spns of a given user.""" |