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

r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1

Browse Source 
(This used to be commit 9727d05241)
This commit is contained in:
Gerald Carter
2005-05-31 13:46:45 +00:00
committed by Gerald (Jerry) Carter
parent 450e8d5749
commit f24d88cf9d
39 changed files with 1327 additions and 4911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/utils/net_ads.c
View File

@ -81,7 +81,7 @@ static int net_ads_lookup(int argc, const char **argv)
d_printf("Didn't find the cldap server!\n");
return -1;
} if (!ads->config.realm) {
ads->config.realm = CONST_DISCARD(char *, opt_target_workgroup);
ads->config.realm = opt_target_workgroup;
ads->ldap_port = 389;
}
@ -753,7 +753,7 @@ int net_ads_join(int argc, const char **argv)
ads_msgfree(ads, res);
if (rc.error_type == ENUM_ADS_ERROR_LDAP && rc.err.rc == LDAP_NO_SUCH_OBJECT) {
d_printf("ads_join: organizational unit %s does not exist (dn:%s)\n",
d_printf("ads_join_realm: organizational unit %s does not exist (dn:%s)\n",
org_unit, dn);
ads_destroy(&ads);
return -1;
@ -761,14 +761,14 @@ int net_ads_join(int argc, const char **argv)
free(dn);
if (!ADS_ERR_OK(rc)) {
d_printf("ads_join: %s\n", ads_errstr(rc));
d_printf("ads_join_realm: %s\n", ads_errstr(rc));
ads_destroy(&ads);
return -1;
}
rc = ads_join_realm(ads, global_myname(), account_type, org_unit);
if (!ADS_ERR_OK(rc)) {
d_printf("ads_join: %s\n", ads_errstr(rc));
d_printf("ads_join_realm: %s\n", ads_errstr(rc));
ads_destroy(&ads);
return -1;
}
@ -1172,7 +1172,7 @@ static int net_ads_password(int argc, const char **argv)
}
if (argv[1]) {
new_password = CONST_DISCARD(char *, argv[1]);
new_password = (char *)argv[1];
} else {
asprintf(&prompt, "Enter new password for %s:", user);
new_password = getpass(prompt);