sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r16115: Make "net ads changetrustpw" work again.

Browse Source 
(adapt to the new UPN/SPN scheme).

Guenther
This commit is contained in:
Günther Deschner 2006-06-09 10:50:28 +00:00 committed by Gerald (Jerry) Carter
parent 3a738a855d
commit 8fc70d0df0
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/libads/util.c
View File

@ -26,7 +26,6 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_princip
{
char *password;
char *new_password;
char *service_principal;
ADS_STATUS ret;
uint32 sec_channel_type;
@ -37,9 +36,7 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_princip
new_password = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
asprintf(&service_principal, "HOST/%s", host_principal);
ret = kerberos_set_password(ads->auth.kdc_server, service_principal, password, service_principal, new_password, ads->auth.time_offset);
ret = kerberos_set_password(ads->auth.kdc_server, host_principal, password, host_principal, new_password, ads->auth.time_offset);
if (!ADS_ERR_OK(ret)) {
goto failed;
@ -53,14 +50,13 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_princip
/* Determine if the KDC is salting keys for this principal in a
* non-obvious way. */
if (!kerberos_derive_salting_principal(service_principal)) {
DEBUG(1,("Failed to determine correct salting principal for %s\n", service_principal));
if (!kerberos_derive_salting_principal(host_principal)) {
DEBUG(1,("Failed to determine correct salting principal for %s\n", host_principal));
ret = ADS_ERROR_SYSTEM(EACCES);
goto failed;
}
failed:
SAFE_FREE(service_principal);
SAFE_FREE(password);
return ret;
}

8
source/utils/net_ads.c
View File

@ -1529,19 +1529,19 @@ int net_ads_changetrustpw(int argc, const char **argv)
fstrcpy(my_name, global_myname());
strlower_m(my_name);
asprintf(&host_principal, "%s@%s", my_name, ads->config.realm);
d_printf("Changing password for principal: HOST/%s\n", host_principal);
asprintf(&host_principal, "%s$@%s", my_name, ads->config.realm);
d_printf("Changing password for principal: %s\n", host_principal);
ret = ads_change_trust_account_password(ads, host_principal);
if (!ADS_ERR_OK(ret)) {
d_fprintf(stderr, "Password change failed :-( ...\n");
d_fprintf(stderr, "Password change failed: %s\n", ads_errstr(ret));
ads_destroy(&ads);
SAFE_FREE(host_principal);
return -1;
}
d_printf("Password change for principal HOST/%s succeeded.\n", host_principal);
d_printf("Password change for principal %s succeeded.\n", host_principal);
if (lp_use_kerberos_keytab()) {
d_printf("Attempting to update system keytab with new password.\n");