sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-05 04:59:08 +03:00
Code Activity

s4-libnet: Remove libnet_Join and create libnet_Join_member

Browse Source 
libnet_Join conflicts with a function in the source3 netapi of the
same name, and the ability to join as a DC via this particular method
is unused.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2011-05-16 22:55:29 +10:00
parent c47b078ec3
commit c6cc22adc0
4 changed files with 21 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source4/scripting/python/samba/netcmd/join.py
View File

@ -59,7 +59,13 @@ class cmd_join(Command):
role = role.upper()
if role is None or role == "MEMBER":
secure_channel_type = SEC_CHAN_WKSTA
(join_password, sid, domain_name) = net.join_member(domain,
netbios_name,
LIBNET_JOIN_AUTOMATIC)
self.outf.write("Joined domain %s (%s)\n" % (domain_name, sid))
return
elif role == "DC":
join_DC(server=server, creds=creds, lp=lp, domain=domain,
site=site, netbios_name=netbios_name, targetdir=targetdir)
@ -70,10 +76,3 @@ class cmd_join(Command):
return
else:
raise CommandError("Invalid role %s (possible values: MEMBER, BDC, RODC)" % role)
(join_password, sid, domain_name) = net.join(domain,
netbios_name,
secure_channel_type,
LIBNET_JOIN_AUTOMATIC)
self.outf.write("Joined domain %s (%s)\n" % (domain_name, sid))