summaryrefslogtreecommitdiff
path: root/source3/utils/net.c
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-07-17 11:04:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:10 -0500
commit9c160dd9a7c88afaac7570581062060271b6f757 (patch)
tree28c1b5c4d1846dff29c34bf7bac7c90060700515 /source3/utils/net.c
parent69543774036b709ed0e30f6dd7981ee3805f17e3 (diff)
downloadsamba-9c160dd9a7c88afaac7570581062060271b6f757.tar.gz
samba-9c160dd9a7c88afaac7570581062060271b6f757.tar.bz2
samba-9c160dd9a7c88afaac7570581062060271b6f757.zip
r17086: Re-add ability to contact remote domain controllers with the "net ads"
toolset. In 3.0.23 all those commands have been limited to the DC of our primary domain. Also distinguish calls that may go to remote DCs (search, info, lookup, etc.) from those that should only go to our primary domain (join, leave, etc.). Guenther (This used to be commit d573e64781667993478a289580fa65c34e847f64)
Diffstat (limited to 'source3/utils/net.c')
-rw-r--r--source3/utils/net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 8b4fb042fc..a43fae5c80 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -481,7 +481,7 @@ static int net_group(int argc, const char **argv)
static int net_join(int argc, const char **argv)
{
- if (net_ads_check() == 0) {
+ if (net_ads_check_our_domain() == 0) {
if (net_ads_join(argc, argv) == 0)
return 0;
else
@@ -492,7 +492,7 @@ static int net_join(int argc, const char **argv)
static int net_changetrustpw(int argc, const char **argv)
{
- if (net_ads_check() == 0)
+ if (net_ads_check_our_domain() == 0)
return net_ads_changetrustpw(argc, argv);
return net_rpc_changetrustpw(argc, argv);