diff options
| author | Günther Deschner <gd@samba.org> | 2006-04-24 10:09:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:16:28 -0500 |
| commit | 8fca274e4748f779d8fb89c40b3ab78b56fafbcc (patch) | |
| tree | 1eefa6503db493e8b15a74d148d0f283f2b3efb2 | |
| parent | e241563472f2b36a09399866a2ccee85a4d34580 (diff) | |
| download | samba-8fca274e4748f779d8fb89c40b3ab78b56fafbcc.tar.gz samba-8fca274e4748f779d8fb89c40b3ab78b56fafbcc.tar.bz2 samba-8fca274e4748f779d8fb89c40b3ab78b56fafbcc.zip | |
r15194: We need to be able to join as PDC as well. Thanks to Andrew Bartlett.
Guenther
(This used to be commit ba81b508caa4ab21a04d142f3621e43a55e859cf)
| -rw-r--r-- | source3/utils/net_ads.c | 5 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 11e7ae0282..538a269614 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -721,9 +721,8 @@ 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) && - (lp_server_role() != ROLE_DOMAIN_BDC)) { - d_printf("can only join as domain member or as BDC\n"); + if (lp_server_role() == ROLE_STANDALONE) { + d_printf("cannot join as standalone machine\n"); return -1; } diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 0060a39c31..3f534f9412 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -389,9 +389,8 @@ 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) && - (lp_server_role() != ROLE_DOMAIN_BDC)) { - d_printf("can only join as domain member or as BDC\n"); + if (lp_server_role() == ROLE_STANDALONE) { + d_printf("cannot join as standalone machine\n"); return -1; } |