r17994: Add debugs that showed me why my site code wasn't
[kai/samba.git] / source3 / libads / kerberos.c
index c82310dd08429faeca510b49a455568c39fcbda1..fb15ace7c7016b0d5909a2a4cfd4449292c1f00e 100644 (file)
@@ -5,6 +5,7 @@
    Copyright (C) Remus Koos 2001
    Copyright (C) Nalin Dahyabhai <nalin@redhat.com> 2004.
    Copyright (C) Jeremy Allison 2004.
+   Copyright (C) Gerald Carter 2006.
 
    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
@@ -44,7 +45,8 @@ kerb_prompter(krb5_context ctx, void *data,
        memset(prompts[0].reply->data, '\0', prompts[0].reply->length);
        if (prompts[0].reply->length > 0) {
                if (data) {
-                       strncpy(prompts[0].reply->data, data, prompts[0].reply->length-1);
+                       strncpy(prompts[0].reply->data, (const char *)data,
+                               prompts[0].reply->length-1);
                        prompts[0].reply->length = strlen(prompts[0].reply->data);
                } else {
                        prompts[0].reply->length = 0;
@@ -58,13 +60,14 @@ kerb_prompter(krb5_context ctx, void *data,
   place in default cache location.
   remus@snapserver.com
 */
-int kerberos_kinit_password(const char *principal,
+int kerberos_kinit_password_ext(const char *principal,
                                const char *password,
                                int time_offset,
                                time_t *expire_time,
                                time_t *renew_till_time,
                                const char *cache_name,
                                BOOL request_pac,
+                               BOOL add_netbios_addr,
                                time_t renewable_time)
 {
        krb5_context ctx = NULL;
@@ -73,6 +76,7 @@ int kerberos_kinit_password(const char *principal,
        krb5_principal me;
        krb5_creds my_creds;
        krb5_get_init_creds_opt opt;
+       smb_krb5_addresses *addr = NULL;
 
        initialize_krb5_error_table();
        if ((code = krb5_init_context(&ctx)))
@@ -90,7 +94,7 @@ int kerberos_kinit_password(const char *principal,
                return code;
        }
        
-       if ((code = krb5_parse_name(ctx, principal, &me))) {
+       if ((code = smb_krb5_parse_name(ctx, principal, &me))) {
                krb5_free_context(ctx); 
                return code;
        }
@@ -101,19 +105,36 @@ int kerberos_kinit_password(const char *principal,
        
        if (request_pac) {
 #ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST
-               krb5_get_init_creds_opt_set_pac_request(ctx, &opt, True);
+               code = krb5_get_init_creds_opt_set_pac_request(ctx, &opt, True);
+               if (code) {
+                       krb5_free_principal(ctx, me);
+                       krb5_free_context(ctx);
+                       return code;
+               }
 #endif
        }
 
+       if (add_netbios_addr) {
+               code = smb_krb5_gen_netbios_krb5_address(&addr);
+               if (code) {
+                       krb5_free_principal(ctx, me);
+                       krb5_free_context(ctx);         
+                       return code;    
+               }
+               krb5_get_init_creds_opt_set_address_list(&opt, addr->addrs);
+       }
+
        if ((code = krb5_get_init_creds_password(ctx, &my_creds, me, CONST_DISCARD(char *,password), 
-                                                kerb_prompter, 
-                                                NULL, 0, NULL, &opt))) {
+                                                kerb_prompter, NULL, 0, NULL, &opt)))
+       {
+               smb_krb5_free_addresses(ctx, addr);
                krb5_free_principal(ctx, me);
                krb5_free_context(ctx);         
                return code;
        }
        
        if ((code = krb5_cc_initialize(ctx, cc, me))) {
+               smb_krb5_free_addresses(ctx, addr);
                krb5_free_cred_contents(ctx, &my_creds);
                krb5_free_principal(ctx, me);
                krb5_free_context(ctx);         
@@ -122,6 +143,7 @@ int kerberos_kinit_password(const char *principal,
        
        if ((code = krb5_cc_store_cred(ctx, cc, &my_creds))) {
                krb5_cc_close(ctx, cc);
+               smb_krb5_free_addresses(ctx, addr);
                krb5_free_cred_contents(ctx, &my_creds);
                krb5_free_principal(ctx, me);
                krb5_free_context(ctx);         
@@ -137,6 +159,7 @@ int kerberos_kinit_password(const char *principal,
        }
 
        krb5_cc_close(ctx, cc);
+       smb_krb5_free_addresses(ctx, addr);
        krb5_free_cred_contents(ctx, &my_creds);
        krb5_free_principal(ctx, me);
        krb5_free_context(ctx);         
@@ -174,17 +197,18 @@ int ads_kinit_password(ADS_STRUCT *ads)
        }
 
        if (!ads->auth.password) {
+               SAFE_FREE(s);
                return KRB5_LIBOS_CANTREADPWD;
        }
        
-       ret = kerberos_kinit_password(s, ads->auth.password, ads->auth.time_offset,
-                       &ads->auth.expire, NULL, NULL, False, ads->auth.renewable);
+       ret = kerberos_kinit_password_ext(s, ads->auth.password, ads->auth.time_offset,
+                       &ads->auth.expire, NULL, NULL, False, False, ads->auth.renewable);
 
        if (ret) {
                DEBUG(0,("kerberos_kinit_password %s failed: %s\n", 
                         s, error_message(ret)));
        }
-       free(s);
+       SAFE_FREE(s);
        return ret;
 }
 
@@ -246,11 +270,85 @@ static char *kerberos_secrets_fetch_salting_principal(const char *service, int e
 }
 
 /************************************************************************
- Routine to get the salting principal for this service.  Active
- Directory may use a non-obvious principal name to generate the salt
- when it determines the key to use for encrypting tickets for a service,
- and hopefully we detected that when we joined the domain.
- Caller must free if return is not null.
+ Return the standard DES salt key
+************************************************************************/
+
+char* kerberos_standard_des_salt( void )
+{
+       fstring salt;
+
+       fstr_sprintf( salt, "host/%s.%s@", global_myname(), lp_realm() );
+       strlower_m( salt );
+       fstrcat( salt, lp_realm() );
+
+       return SMB_STRDUP( salt );
+}
+
+/************************************************************************
+************************************************************************/
+
+static char* des_salt_key( void )
+{
+       char *key;
+
+       asprintf(&key, "%s/DES/%s", SECRETS_SALTING_PRINCIPAL, lp_realm());
+
+       return key;
+}
+
+/************************************************************************
+************************************************************************/
+
+BOOL kerberos_secrets_store_des_salt( const char* salt )
+{
+       char* key;
+       BOOL ret;
+
+       if ( (key = des_salt_key()) == NULL ) {
+               DEBUG(0,("kerberos_secrets_store_des_salt: failed to generate key!\n"));
+               return False;
+       }
+
+       if ( !salt ) {
+               DEBUG(8,("kerberos_secrets_store_des_salt: deleting salt\n"));
+               secrets_delete( key );
+               return True;
+       }
+
+       DEBUG(3,("kerberos_secrets_store_des_salt: Storing salt \"%s\"\n", salt));
+
+       ret = secrets_store( key, salt, strlen(salt)+1 );
+
+       SAFE_FREE( key );
+
+       return ret;
+}
+
+/************************************************************************
+************************************************************************/
+
+char* kerberos_secrets_fetch_des_salt( void )
+{
+       char *salt, *key;
+
+       if ( (key = des_salt_key()) == NULL ) {
+               DEBUG(0,("kerberos_secrets_fetch_des_salt: failed to generate key!\n"));
+               return False;
+       }
+
+       salt = (char*)secrets_fetch( key, NULL );
+
+       SAFE_FREE( key );
+
+       return salt;
+}
+
+
+/************************************************************************
+ Routine to get the salting principal for this service.  This is 
+ maintained for backwards compatibilty with releases prior to 3.0.24.
+ Since we store the salting principal string only at join, we may have 
+ to look for the older tdb keys.  Caller must free if return is not null.
  ************************************************************************/
 
 krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
@@ -259,23 +357,29 @@ krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
 {
        char *unparsed_name = NULL, *salt_princ_s = NULL;
        krb5_principal ret_princ = NULL;
+       
+       /* lookup new key first */
 
-       if (krb5_unparse_name(context, host_princ, &unparsed_name) != 0) {
-               return (krb5_principal)NULL;
-       }
+       if ( (salt_princ_s = kerberos_secrets_fetch_des_salt()) == NULL ) {
+       
+               /* look under the old key.  If this fails, just use the standard key */
 
-       if ((salt_princ_s = kerberos_secrets_fetch_salting_principal(unparsed_name, enctype)) == NULL) {
-               krb5_free_unparsed_name(context, unparsed_name);
-               return (krb5_principal)NULL;
+               if (smb_krb5_unparse_name(context, host_princ, &unparsed_name) != 0) {
+                       return (krb5_principal)NULL;
+               }
+               if ((salt_princ_s = kerberos_secrets_fetch_salting_principal(unparsed_name, enctype)) == NULL) {
+                       /* fall back to host/machine.realm@REALM */
+                       salt_princ_s = kerberos_standard_des_salt();
+               }
        }
 
-       if (krb5_parse_name(context, salt_princ_s, &ret_princ) != 0) {
-               krb5_free_unparsed_name(context, unparsed_name);
-               SAFE_FREE(salt_princ_s);
-               return (krb5_principal)NULL;
+       if (smb_krb5_parse_name(context, salt_princ_s, &ret_princ) != 0) {
+               ret_princ = NULL;
        }
-       krb5_free_unparsed_name(context, unparsed_name);
+       
+       SAFE_FREE(unparsed_name);
        SAFE_FREE(salt_princ_s);
+       
        return ret_princ;
 }
 
@@ -308,11 +412,11 @@ BOOL kerberos_secrets_store_salting_principal(const char *service,
                asprintf(&princ_s, "%s@%s", service, lp_realm());
        }
 
-       if (krb5_parse_name(context, princ_s, &princ) != 0) {
+       if (smb_krb5_parse_name(context, princ_s, &princ) != 0) {
                goto out;
                
        }
-       if (krb5_unparse_name(context, princ, &unparsed_name) != 0) {
+       if (smb_krb5_unparse_name(context, princ, &unparsed_name) != 0) {
                goto out;
        }
 
@@ -331,10 +435,8 @@ BOOL kerberos_secrets_store_salting_principal(const char *service,
 
        SAFE_FREE(key);
        SAFE_FREE(princ_s);
+       SAFE_FREE(unparsed_name);
 
-       if (unparsed_name) {
-               krb5_free_unparsed_name(context, unparsed_name);
-       }
        if (context) {
                krb5_free_context(context);
        }
@@ -342,463 +444,115 @@ BOOL kerberos_secrets_store_salting_principal(const char *service,
        return ret;
 }
 
-/************************************************************************
- Routine to get initial credentials as a service ticket for the local machine.
- Returns a buffer initialized with krb5_mk_req_extended.
- ************************************************************************/
-
-static krb5_error_code get_service_ticket(krb5_context ctx,
-                                       krb5_ccache ccache,
-                                       const char *service_principal,
-                                       int enctype,
-                                       krb5_data *p_outbuf)
-{
-       krb5_creds creds, *new_creds = NULL;
-       char *service_s = NULL;
-       char *machine_account = NULL, *password = NULL;
-       krb5_data in_data;
-       krb5_auth_context auth_context = NULL;
-       krb5_error_code err = 0;
-
-       ZERO_STRUCT(creds);
-
-       asprintf(&machine_account, "%s$@%s", global_myname(), lp_realm());
-       if (machine_account == NULL) {
-               goto out;
-       }
-       password = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
-       if (password == NULL) {
-               goto out;
-       }
-       if ((err = kerberos_kinit_password(machine_account, password, 0, NULL, NULL, 
-                                          LIBADS_CCACHE_NAME, False, 0)) != 0) {
-               DEBUG(0,("get_service_ticket: kerberos_kinit_password %s failed: %s\n", 
-                       machine_account,
-                       error_message(err)));
-               goto out;
-       }
-
-       /* Ok - the above call has gotten a TGT. Now we need to get a service
-          ticket to ourselves. */
-
-       /* Set up the enctype and client and server principal fields for krb5_get_credentials. */
-       kerberos_set_creds_enctype(&creds, enctype);
-
-       if ((err = krb5_cc_get_principal(ctx, ccache, &creds.client))) {
-               DEBUG(3, ("get_service_ticket: krb5_cc_get_principal failed: %s\n", 
-                       error_message(err)));
-               goto out;
-       }
-
-       if (strchr_m(service_principal, '@')) {
-               asprintf(&service_s, "%s", service_principal);
-       } else {
-               asprintf(&service_s, "%s@%s", service_principal, lp_realm());
-       }
-
-       if ((err = krb5_parse_name(ctx, service_s, &creds.server))) {
-               DEBUG(0,("get_service_ticket: krb5_parse_name %s failed: %s\n", 
-                       service_s, error_message(err)));
-               goto out;
-       }
-
-       if ((err = krb5_get_credentials(ctx, 0, ccache, &creds, &new_creds))) {
-               DEBUG(5,("get_service_ticket: krb5_get_credentials for %s enctype %d failed: %s\n", 
-                       service_s, enctype, error_message(err)));
-               goto out;
-       }
-
-       memset(&in_data, '\0', sizeof(in_data));
-       if ((err = krb5_mk_req_extended(ctx, &auth_context, 0, &in_data,
-                       new_creds, p_outbuf)) != 0) {
-               DEBUG(0,("get_service_ticket: krb5_mk_req_extended failed: %s\n", 
-                       error_message(err)));
-               goto out;
-       }
-
- out:
-
-       if (auth_context) {
-               krb5_auth_con_free(ctx, auth_context);
-       }
-       if (new_creds) {
-               krb5_free_creds(ctx, new_creds);
-       }
-       if (creds.server) {
-               krb5_free_principal(ctx, creds.server);
-       }
-       if (creds.client) {
-               krb5_free_principal(ctx, creds.client);
-       }
-
-       SAFE_FREE(service_s);
-       SAFE_FREE(password);
-       SAFE_FREE(machine_account);
-       return err;
-}
 
 /************************************************************************
- Check if the machine password can be used in conjunction with the salting_principal
- to generate a key which will successfully decrypt the AP_REQ already
- gotten as a message to the local machine.
- ************************************************************************/
+************************************************************************/
 
-static BOOL verify_service_password(krb5_context ctx,
-                                   int enctype,
-                                   const char *salting_principal,
-                                   krb5_data *in_data)
+int kerberos_kinit_password(const char *principal,
+                           const char *password,
+                           int time_offset,
+                           const char *cache_name)
 {
-       BOOL ret = False;
-       krb5_principal salting_kprinc = NULL;
-       krb5_ticket *ticket = NULL;
-       krb5_keyblock key;
-       krb5_data passdata;
-       char *salting_s = NULL;
-       char *machine_account = NULL, *password = NULL;
-       krb5_auth_context auth_context = NULL;
-       krb5_error_code err;
-
-       memset(&passdata, '\0', sizeof(passdata));
-       memset(&key, '\0', sizeof(key));
-
-       asprintf(&machine_account, "%s$@%s", global_myname(), lp_realm());
-       if (machine_account == NULL) {
-               goto out;
-       }
-       password = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
-       if (password == NULL) {
-               goto out;
-       }
-
-       if (strchr_m(salting_principal, '@')) {
-               asprintf(&salting_s, "%s", salting_principal);
-       } else {
-               asprintf(&salting_s, "%s@%s", salting_principal, lp_realm());
-       }
-
-       if ((err = krb5_parse_name(ctx, salting_s, &salting_kprinc))) {
-               DEBUG(0,("verify_service_password: krb5_parse_name %s failed: %s\n", 
-                       salting_s, error_message(err)));
-               goto out;
-       }
-
-       passdata.length = strlen(password);
-       passdata.data = (char*)password;
-       if ((err = create_kerberos_key_from_string_direct(ctx, salting_kprinc, &passdata, &key, enctype))) {
-               DEBUG(0,("verify_service_password: create_kerberos_key_from_string %d failed: %s\n",
-                       enctype, error_message(err)));
-               goto out;
-       }
-
-       if ((err = krb5_auth_con_init(ctx, &auth_context)) != 0) {
-               DEBUG(0,("verify_service_password: krb5_auth_con_init failed %s\n", error_message(err)));
-               goto out;
-       }
-
-       if ((err = krb5_auth_con_setuseruserkey(ctx, auth_context, &key)) != 0) {
-               DEBUG(0,("verify_service_password: krb5_auth_con_setuseruserkey failed %s\n", error_message(err)));
-               goto out;
-       }
-
-       if (!(err = krb5_rd_req(ctx, &auth_context, in_data, NULL, NULL, NULL, &ticket))) {
-               DEBUG(10,("verify_service_password: decrypted message with enctype %u salt %s!\n",
-                               (unsigned int)enctype, salting_s));
-               ret = True;
-       }
-
- out:
-
-       memset(&passdata, 0, sizeof(passdata));
-       krb5_free_keyblock_contents(ctx, &key);
-       if (ticket != NULL) {
-               krb5_free_ticket(ctx, ticket);
-       }
-       if (salting_kprinc) {
-               krb5_free_principal(ctx, salting_kprinc);
-       }
-       SAFE_FREE(salting_s);
-       SAFE_FREE(password);
-       SAFE_FREE(machine_account);
-       return ret;
+       return kerberos_kinit_password_ext(principal, 
+                                          password, 
+                                          time_offset, 
+                                          0, 
+                                          0,
+                                          cache_name,
+                                          False,
+                                          False,
+                                          0);
 }
 
 /************************************************************************
- *
- * From the current draft of kerberos-clarifications:
- *
- *     It is not possible to reliably generate a user's key given a pass
- *     phrase without contacting the KDC, since it will not be known
- *     whether alternate salt or parameter values are required.
- *
- * And because our server has a password, we have this exact problem.  We
- * make multiple guesses as to which principal name provides the salt which
- * the KDC is using.
- *
- ************************************************************************/
+ Create  a specific krb5.conf file in the private directory pointing
+ at a specific kdc for a realm. Keyed off domain name. Sets
+ KRB5_CONFIG environment variable to point to this file. Must be
+ run as root or will fail (which is a good thing :-).
+************************************************************************/
 
-static void kerberos_derive_salting_principal_for_enctype(const char *service_principal,
-                                                         krb5_context ctx,
-                                                         krb5_ccache ccache,
-                                                         krb5_enctype enctype,
-                                                         krb5_enctype *enctypes)
+BOOL create_local_private_krb5_conf_for_domain(const char *realm, const char *domain, struct in_addr ip)
 {
-       char *salting_principals[3] = {NULL, NULL, NULL}, *second_principal = NULL;
-       krb5_error_code err = 0;
-       krb5_data outbuf;
-       int i, j;
-
-       memset(&outbuf, '\0', sizeof(outbuf));
-
-       /* Check that the service_principal is useful. */
-       if ((service_principal == NULL) || (strlen(service_principal) == 0)) {
-               return;
+       XFILE *xfp = NULL;
+       char *fname = talloc_asprintf(NULL, "%s/smb_krb5.conf.%s", lp_private_dir(), domain);
+       char *file_contents = NULL;
+       size_t flen = 0;
+       char *realm_upper = NULL;
+       int loopcount = 0;
+
+       if (!fname) {
+               return False;
        }
 
-       /* Generate our first guess -- the principal as-given. */
-       asprintf(&salting_principals[0], "%s", service_principal);
-       if ((salting_principals[0] == NULL) || (strlen(salting_principals[0]) == 0)) {
-               return;
-       }
+       DEBUG(10,("create_local_private_krb5_conf_for_domain: fname = %s, realm = %s, domain = %s\n",
+               fname, realm, domain ));
 
-       /* Generate our second guess -- the computer's principal, as Win2k3. */
-       asprintf(&second_principal, "host/%s.%s", global_myname(), lp_realm());
-       if (second_principal != NULL) {
-               strlower_m(second_principal);
-               asprintf(&salting_principals[1], "%s@%s", second_principal, lp_realm());
-               SAFE_FREE(second_principal);
-       }
-       if ((salting_principals[1] == NULL) || (strlen(salting_principals[1]) == 0)) {
-               goto out;
-       }
+       realm_upper = talloc_strdup(fname, realm);
+       strupper_m(realm_upper);
 
-       /* Generate our third guess -- the computer's principal, as Win2k. */
-       asprintf(&second_principal, "HOST/%s", global_myname());
-       if (second_principal != NULL) {
-               strlower_m(second_principal + 5);
-               asprintf(&salting_principals[2], "%s@%s",
-                       second_principal, lp_realm());
-               SAFE_FREE(second_principal);
-       }
-       if ((salting_principals[2] == NULL) || (strlen(salting_principals[2]) == 0)) {
-               goto out;
-       }
+       file_contents = talloc_asprintf(fname, "[libdefaults]\n\tdefault_realm = %s\n"
+                               "[realms]\n\t%s = {\n"
+                               "\t\tkdc = %s\n]\n",
+                               realm_upper, realm_upper, inet_ntoa(ip));
 
-       /* Get a service ticket for ourselves into our memory ccache. */
-       /* This will commonly fail if there is no principal by that name (and we're trying
-          many names). So don't print a debug 0 error. */
-
-       if ((err = get_service_ticket(ctx, ccache, service_principal, enctype, &outbuf)) != 0) {
-               DEBUG(3, ("verify_service_password: get_service_ticket failed: %s\n", 
-                       error_message(err)));
-               goto out;
-       }
-
-       /* At this point we have a message to ourselves, salted only the KDC knows how. We
-          have to work out what that salting is. */
-
-       /* Try and find the correct salting principal. */
-       for (i = 0; i < sizeof(salting_principals) / sizeof(salting_principals[i]); i++) {
-               if (verify_service_password(ctx, enctype, salting_principals[i], &outbuf)) {
-                       break;
-               }
+       if (!file_contents) {
+               TALLOC_FREE(fname);
+               return False;
        }
 
-       /* If we failed to get a match, return. */
-       if (i >= sizeof(salting_principals) / sizeof(salting_principals[i])) {
-               goto out;
-       }
+       flen = strlen(file_contents);
 
-       /* If we succeeded, store the principal for use for all enctypes which
-        * share the same cipher and string-to-key function.  Doing this here
-        * allows servers which just pass a keytab to krb5_rd_req() to work
-        * correctly. */
-       for (j = 0; enctypes[j] != 0; j++) {
-               if (enctype != enctypes[j]) {
-                       /* If this enctype isn't compatible with the one which
-                        * we used, skip it. */
+       while (loopcount < 10) {
+               SMB_STRUCT_STAT st;
 
-                       if (!kerberos_compatible_enctypes(ctx, enctypes[j], enctype))
-                               continue;
+               xfp = x_fopen(fname, O_CREAT|O_WRONLY, 0600);
+               if (!xfp) {
+                       TALLOC_FREE(fname);
+                       return False;
                }
-               /* If the principal which gives us the proper salt is the one
-                * which we would normally guess, don't bother noting anything
-                * in the secrets tdb. */
-               if (strcmp(service_principal, salting_principals[i]) != 0) {
-                       kerberos_secrets_store_salting_principal(service_principal,
-                                                               enctypes[j],
-                                                               salting_principals[i]);
+               /* Lock the file. */
+               if (!fcntl_lock(xfp->fd, F_SETLKW, 0, 1, F_WRLCK)) {
+                       unlink(fname);
+                       x_fclose(xfp);
+                       TALLOC_FREE(fname);
+                       return False;
                }
-       }
-
- out :
-
-       kerberos_free_data_contents(ctx, &outbuf);
-       SAFE_FREE(salting_principals[0]);
-       SAFE_FREE(salting_principals[1]);
-       SAFE_FREE(salting_principals[2]);
-       SAFE_FREE(second_principal);
-}
-
-/************************************************************************
- Go through all the possible enctypes for this principal.
- ************************************************************************/
 
-static void kerberos_derive_salting_principal_direct(krb5_context context,
-                                       krb5_ccache ccache,
-                                       krb5_enctype *enctypes,
-                                       char *service_principal)
-{
-       int i;
-
-       /* Try for each enctype separately, because the rules are
-        * different for different enctypes. */
-       for (i = 0; enctypes[i] != 0; i++) {
-               /* Delete secrets entry first. */
-               kerberos_secrets_store_salting_principal(service_principal, 0, NULL);
-#ifdef ENCTYPE_ARCFOUR_HMAC
-               if (enctypes[i] == ENCTYPE_ARCFOUR_HMAC) {
-                       /* Of course this'll always work, so just save
-                        * ourselves the effort. */
-                       continue;
+               /* We got the lock. Is the file still there ? */
+               if (sys_stat(fname,&st)==-1) {
+                       if (errno == ENOENT) {
+                               /* Nope - try again up to 10x */
+                               x_fclose(xfp);
+                               loopcount++;
+                               continue;       
+                       }
+                       unlink(fname);
+                       x_fclose(xfp);
+                       TALLOC_FREE(fname);
+                       return False;
                }
-#endif
-               /* Try to figure out what's going on with this
-                * principal. */
-               kerberos_derive_salting_principal_for_enctype(service_principal,
-                                                               context,
-                                                               ccache,
-                                                               enctypes[i],
-                                                               enctypes);
+               break;
        }
-}
-
-/************************************************************************
- Wrapper function for the above.
- ************************************************************************/
 
-BOOL kerberos_derive_salting_principal(char *service_principal)
-{
-       krb5_context context = NULL;
-       krb5_enctype *enctypes = NULL;
-       krb5_ccache ccache = NULL;
-       krb5_error_code ret = 0;
-
-       initialize_krb5_error_table();
-       if ((ret = krb5_init_context(&context)) != 0) {
-               DEBUG(1,("kerberos_derive_cifs_salting_principals: krb5_init_context failed. %s\n",
-                       error_message(ret)));
+       if (x_fwrite(file_contents, flen, 1, xfp) != flen) {
+               unlink(fname);
+               x_fclose(xfp);
+               TALLOC_FREE(fname);
                return False;
        }
-       if ((ret = get_kerberos_allowed_etypes(context, &enctypes)) != 0) {
-               DEBUG(1,("kerberos_derive_cifs_salting_principals: get_kerberos_allowed_etypes failed. %s\n",
-                       error_message(ret)));
-               goto out;
-       }
-
-       if ((ret = krb5_cc_resolve(context, LIBADS_CCACHE_NAME, &ccache)) != 0) {
-               DEBUG(3, ("get_service_ticket: krb5_cc_resolve for %s failed: %s\n", 
-                       LIBADS_CCACHE_NAME, error_message(ret)));
-               goto out;
-       }
-
-       kerberos_derive_salting_principal_direct(context, ccache, enctypes, service_principal);
-
-  out: 
-       if (enctypes) {
-               free_kerberos_etypes(context, enctypes);
-       }
-       if (ccache) {
-               krb5_cc_destroy(context, ccache);
-       }
-       if (context) {
-               krb5_free_context(context);
-       }
-
-       return ret ? False : True;
-}
-
-/************************************************************************
- Core function to try and determine what salt is being used for any keytab
- keys.
- ************************************************************************/
-
-BOOL kerberos_derive_cifs_salting_principals(void)
-{
-       fstring my_fqdn;
-       char *service = NULL;
-       krb5_context context = NULL;
-       krb5_enctype *enctypes = NULL;
-       krb5_ccache ccache = NULL;
-       krb5_error_code ret = 0;
-       BOOL retval = False;
-
-       initialize_krb5_error_table();
-       if ((ret = krb5_init_context(&context)) != 0) {
-               DEBUG(1,("kerberos_derive_cifs_salting_principals: krb5_init_context failed. %s\n",
-                       error_message(ret)));
+       if (x_fclose(xfp)==-1) {
+               unlink(fname);
+               TALLOC_FREE(fname);
                return False;
        }
-       if ((ret = get_kerberos_allowed_etypes(context, &enctypes)) != 0) {
-               DEBUG(1,("kerberos_derive_cifs_salting_principals: get_kerberos_allowed_etypes failed. %s\n",
-                       error_message(ret)));
-               goto out;
-       }
+       /* Set the environment variable to this file. */
+       setenv("KRB5_CONFIG", fname, 1);
+       TALLOC_FREE(fname);
 
-       if ((ret = krb5_cc_resolve(context, LIBADS_CCACHE_NAME, &ccache)) != 0) {
-               DEBUG(3, ("get_service_ticket: krb5_cc_resolve for %s failed: %s\n", 
-                       LIBADS_CCACHE_NAME, error_message(ret)));
-               goto out;
-       }
+       DEBUG(5,("create_local_private_krb5_conf_for_domain: wrote "
+               "file %s with realm %s KDC = %s\n",
+               fname, realm_upper, inet_ntoa(ip) ));
 
-       if (asprintf(&service, "%s$", global_myname()) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-       if (asprintf(&service, "cifs/%s", global_myname()) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-       if (asprintf(&service, "host/%s", global_myname()) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-       if (asprintf(&service, "cifs/%s.%s", global_myname(), lp_realm()) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-       if (asprintf(&service, "host/%s.%s", global_myname(), lp_realm()) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-       name_to_fqdn(my_fqdn, global_myname());
-       if (asprintf(&service, "cifs/%s", my_fqdn) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-       if (asprintf(&service, "host/%s", my_fqdn) != -1) {
-               strlower_m(service);
-               kerberos_derive_salting_principal_direct(context, ccache, enctypes, service);
-               SAFE_FREE(service);
-       }
-
-       retval = True;
-
-  out: 
-       if (enctypes) {
-               free_kerberos_etypes(context, enctypes);
-       }
-       if (ccache) {
-               krb5_cc_destroy(context, ccache);
-       }
-       if (context) {
-               krb5_free_context(context);
-       }
-       return retval;
+       return True;
 }
 #endif