Fix more asprintf warnings and some error path errors.

[jra/samba/.git] / source3 / libads / util.c

diff --git a/source3/libads/util.c b/source3/libads/util.c
index 8f22adb7af4e762de3e354333d337b2f498cc4d9..2c7ccfebd6cf53cb826123866dcf4900f9839883 100644 (file)
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -1,12 +1,11 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    krb5 set password implementation
    Copyright (C) Remus Koos 2001 (remuskoos@yahoo.com)
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -25,35 +23,101 @@
 
 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;
+       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(talloc_tos(), DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
+    
+       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;
+       }
 
-    SAFE_FREE(service_principal);
-    SAFE_FREE(new_password);
+       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;
+       }
 
-    return ret;
+failed:
+       SAFE_FREE(password);
+       return ret;
 }
 
+ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
+                                      char **returned_principal)
+{
+       char *princ = NULL;
+
+       if (ads->server.realm && ads->server.ldap_server) {
+               char *server, *server_realm;
+
+               server = SMB_STRDUP(ads->server.ldap_server);
+               server_realm = SMB_STRDUP(ads->server.realm);
+
+               if (!server || !server_realm) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               strlower_m(server);
+               strupper_m(server_realm);
+               if (asprintf(&princ, "ldap/%s@%s", server, server_realm) == -1) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               SAFE_FREE(server);
+               SAFE_FREE(server_realm);
+
+               if (!princ) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+       } else if (ads->config.realm && ads->config.ldap_server_name) {
+               char *server, *server_realm;
 
+               server = SMB_STRDUP(ads->config.ldap_server_name);
+               server_realm = SMB_STRDUP(ads->config.realm);
+
+               if (!server || !server_realm) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               strlower_m(server);
+               strupper_m(server_realm);
+               if (asprintf(&princ, "ldap/%s@%s", server, server_realm) == -1) {
+                       SAFE_FREE(server);
+                       SAFE_FREE(server_realm);
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+
+               SAFE_FREE(server);
+               SAFE_FREE(server_realm);
+
+               if (!princ) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
+       }
+
+       if (!princ) {
+               return ADS_ERROR(LDAP_PARAM_ERROR);
+       }
+
+       *returned_principal = princ;
+
+       return ADS_SUCCESS;
+}
 
 #endif