summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/netcmd/join.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/join.py b/source4/scripting/python/samba/netcmd/join.py
index ec8cd11122..e7e5941c63 100644
--- a/source4/scripting/python/samba/netcmd/join.py
+++ b/source4/scripting/python/samba/netcmd/join.py
@@ -28,7 +28,7 @@ from samba.join import join_rodc
class cmd_join(Command):
"""Joins domain as either member or backup domain controller [server connection needed]"""
- synopsis = "%prog join <domain> [BDC | MEMBER | RODC] [options]"
+ synopsis = "%prog join <dnsdomain> [BDC | MEMBER | RODC] [options]"
takes_optiongroups = {
"sambaopts": options.SambaOptions,
@@ -57,6 +57,9 @@ class cmd_join(Command):
if not role is None:
role = role.upper()
+ if domain.find('.') == -1:
+ raise CommandError("Please use the full DNS domain name, not the short form for '%s'" % domain)
+
if role is None:
secure_channel_type = SEC_CHAN_WKSTA
elif role == "BDC":