summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-04-19 15:38:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:25 -0500
commitd4d04313ea9291a0769fe66ff65895adfb04d89f (patch)
tree7b71dce9a3abc17022c21d5c414b59c166c28368
parent335637b2ebeefffb7668639662c03da2f75976ed (diff)
downloadsamba-d4d04313ea9291a0769fe66ff65895adfb04d89f.tar.gz
samba-d4d04313ea9291a0769fe66ff65895adfb04d89f.tar.bz2
samba-d4d04313ea9291a0769fe66ff65895adfb04d89f.zip
r15136: Fix join consistency check
(This used to be commit a6e88785e7116c1a88e1bfdfa2afadecd501bfb0)
-rw-r--r--source3/utils/net_ads.c2
-rw-r--r--source3/utils/net_rpc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 6cd332fd3d..93d564bea0 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -721,7 +721,7 @@ int net_ads_join(int argc, const char **argv)
const char *short_domain_name = NULL;
TALLOC_CTX *ctx = NULL;
- if ((lp_server_role() != ROLE_DOMAIN_MEMBER) ||
+ if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
(lp_server_role() != ROLE_DOMAIN_BDC)) {
d_printf("can only join as domain member or as BDC\n");
return -1;
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index efc9bfbfaf..e8667cbf7b 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -389,7 +389,7 @@ static int rpc_join_usage(int argc, const char **argv)
int net_rpc_join(int argc, const char **argv)
{
- if ((lp_server_role() != ROLE_DOMAIN_MEMBER) ||
+ if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
(lp_server_role() != ROLE_DOMAIN_BDC)) {
d_printf("can only join as domain member or as BDC\n");
return -1;