diff options
Diffstat (limited to 'source/utils')
| -rw-r--r-- | source/utils/net.c | 2 | ||||
| -rw-r--r-- | source/utils/net_ads.c | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/source/utils/net.c b/source/utils/net.c index da1339aed10..2bf8ac286dd 100644 --- a/source/utils/net.c +++ b/source/utils/net.c @@ -69,7 +69,7 @@ int opt_port = 0; int opt_verbose = 0; int opt_maxusers = -1; const char *opt_comment = ""; -const char *opt_container = "cn=Users"; +const char *opt_container = NULL; int opt_flags = -1; int opt_timeout = 0; const char *opt_target_workgroup = NULL; diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c index 70e9e6cea80..8afc42c456b 100644 --- a/source/utils/net_ads.c +++ b/source/utils/net_ads.c @@ -297,6 +297,10 @@ static int ads_user_add(int argc, const char **argv) goto done; } + if (opt_container == NULL) { + opt_container = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS); + } + status = ads_add_user_acct(ads, argv[0], opt_container, opt_comment); if (!ADS_ERR_OK(status)) { @@ -498,6 +502,10 @@ static int ads_group_add(int argc, const char **argv) goto done; } + if (opt_container == NULL) { + opt_container = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS); + } + status = ads_add_group_acct(ads, argv[0], opt_container, opt_comment); if (ADS_ERR_OK(status)) { @@ -690,7 +698,7 @@ int net_ads_join(int argc, const char **argv) char *password; char *machine_account = NULL; char *tmp_password; - const char *org_unit = "Computers"; + const char *org_unit = NULL; char *dn; void *res; DOM_SID dom_sid; @@ -728,7 +736,7 @@ int net_ads_join(int argc, const char **argv) return -1; } - ou_str = ads_ou_string(org_unit); + ou_str = ads_ou_string(ads,org_unit); asprintf(&dn, "%s,%s", ou_str, ads->config.bind_path); free(ou_str); |