r3451: Finish off kerberos salting patch. Needs testing !

[ira/wip.git] / source / libads / util.c

diff --git a/source/libads/util.c b/source/libads/util.c
index 8f22adb7af4e762de3e354333d337b2f498cc4d9..f5b88735387099e3de6b162a77294e325ca04067 100644 (file)
--- a/source/libads/util.c
+++ b/source/libads/util.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    krb5 set password implementation
    Copyright (C) Remus Koos 2001 (remuskoos@yahoo.com)
    
@@ -25,35 +24,45 @@
 
 ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_principal)
 {
-    char *tmp_password;
-    char *password;
-    char *new_password;
-    char *service_principal;
-    ADS_STATUS ret;
-     
-    if ((password = secrets_fetch_machine_password()) == NULL) {
-       DEBUG(1,("Failed to retrieve password for principal %s\n", host_principal));
-       return ADS_ERROR_SYSTEM(ENOENT);
-    }
-
-    tmp_password = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
-    new_password = strdup(tmp_password);
-    asprintf(&service_principal, "HOST/%s", host_principal);
+       char *password;
+       char *new_password;
+       char *service_principal;
+       ADS_STATUS ret;
+       uint32 sec_channel_type;
     
-    ret = kerberos_set_password(ads->kdc_server, host_principal, password, 
-                               service_principal, new_password);
+       if ((password = secrets_fetch_machine_password(lp_workgroup(), NULL, &sec_channel_type)) == NULL) {
+               DEBUG(1,("Failed to retrieve password for principal %s\n", host_principal));
+               return ADS_ERROR_SYSTEM(ENOENT);
+       }
 
-    if (!secrets_store_machine_password(new_password)) {
-           DEBUG(1,("Failed to save machine password\n"));
-           return ADS_ERROR_SYSTEM(EACCES);
-    }
+       new_password = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
+    
+       asprintf(&service_principal, "HOST/%s", host_principal);
 
-    SAFE_FREE(service_principal);
-    SAFE_FREE(new_password);
+       ret = kerberos_set_password(ads->auth.kdc_server, service_principal, password, service_principal, new_password, ads->auth.time_offset);
 
-    return ret;
-}
+       if (!ADS_ERR_OK(ret)) {
+               goto failed;
+       }
 
+       if (!secrets_store_machine_password(new_password, lp_workgroup(), sec_channel_type)) {
+               DEBUG(1,("Failed to save machine password\n"));
+               ret = ADS_ERROR_SYSTEM(EACCES);
+               goto failed;
+       }
 
+       /* 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));
+               ret = ADS_ERROR_SYSTEM(EACCES);
+               goto failed;
+       }
 
+failed:
+       SAFE_FREE(service_principal);
+       SAFE_FREE(password);
+       SAFE_FREE(new_password);
+       return ret;
+}
 #endif