vfs_default: also call vfs_offload_token_ctx_init in vfswrap_offload_write_send

[samba.git] / source3 / libnet / libnet_keytab.c

diff --git a/source3/libnet/libnet_keytab.c b/source3/libnet/libnet_keytab.c
index 589d4c2525499e47847925740b4ad6cdcd440eb8..a0f1af8d791d32c2876b43fbe513a9a773e8e89f 100644 (file)
--- a/source3/libnet/libnet_keytab.c
+++ b/source3/libnet/libnet_keytab.c
@@ -20,7 +20,10 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "smb_krb5.h"
+#include "ads.h"
+#include "secrets.h"
+#include "libnet/libnet_keytab.h"
 
 #ifdef HAVE_KRB5
 
@@ -41,9 +44,7 @@ static int keytab_close(struct libnet_keytab_context *ctx)
                krb5_free_context(ctx->context);
        }
 
-       if (ctx->ads) {
-               ads_destroy(&ctx->ads);
-       }
+       TALLOC_FREE(ctx->ads);
 
        TALLOC_FREE(ctx);
 
@@ -64,30 +65,32 @@ krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
 
        struct libnet_keytab_context *r;
 
-       r = TALLOC_ZERO_P(mem_ctx, struct libnet_keytab_context);
+       r = talloc_zero(mem_ctx, struct libnet_keytab_context);
        if (!r) {
                return ENOMEM;
        }
 
        talloc_set_destructor(r, keytab_close);
 
-       initialize_krb5_error_table();
-       ret = krb5_init_context(&context);
+       ret = smb_krb5_init_context_common(&context);
        if (ret) {
-               DEBUG(1,("keytab_init: could not krb5_init_context: %s\n",
-                       error_message(ret)));
+               DBG_ERR("kerberos init context failed (%s)\n",
+                       error_message(ret));
                return ret;
        }
 
-       ret = smb_krb5_open_keytab(context, keytab_name, true, &keytab);
+       ret = smb_krb5_kt_open_relative(context,
+                                       keytab_name,
+                                       true, /* write_access */
+                                       &keytab);
        if (ret) {
-               DEBUG(1,("keytab_init: smb_krb5_open_keytab failed (%s)\n",
-                       error_message(ret)));
+               DBG_WARNING("smb_krb5_kt_open_relative failed (%s)\n",
+                           error_message(ret));
                krb5_free_context(context);
                return ret;
        }
 
-       ret = smb_krb5_keytab_name(mem_ctx, context, keytab, &keytab_string);
+       ret = smb_krb5_kt_get_name(mem_ctx, context, keytab, &keytab_string);
        if (ret) {
                krb5_kt_close(context, keytab);
                krb5_free_context(context);
@@ -212,6 +215,8 @@ static krb5_error_code libnet_keytab_add_entry(krb5_context context,
        krb5_keyblock *keyp;
        krb5_keytab_entry kt_entry;
        krb5_error_code ret;
+       krb5_principal salt_princ = NULL;
+       char *salt_princ_s;
 
        /* remove duplicates first ... */
        ret = libnet_keytab_remove_entries(context, keytab, princ_s, kvno,
@@ -234,9 +239,28 @@ static krb5_error_code libnet_keytab_add_entry(krb5_context context,
 
        keyp = KRB5_KT_KEY(&kt_entry);
 
-       if (create_kerberos_key_from_string(context, kt_entry.principal,
-                                           &password, keyp, enctype, true))
-       {
+       salt_princ_s = kerberos_secrets_fetch_salt_princ();
+       if (salt_princ_s == NULL) {
+               ret = KRB5KRB_ERR_GENERIC;
+               goto done;
+       }
+
+       ret = krb5_parse_name(context, salt_princ_s, &salt_princ);
+       SAFE_FREE(salt_princ_s);
+       if (ret != 0) {
+               ret = KRB5KRB_ERR_GENERIC;
+               goto done;
+       }
+
+       ret = create_kerberos_key_from_string(context,
+                                             kt_entry.principal,
+                                             salt_princ,
+                                             &password,
+                                             keyp,
+                                             enctype,
+                                             true);
+       krb5_free_principal(context, salt_princ);
+       if (ret != 0) {
                ret = KRB5KRB_ERR_GENERIC;
                goto done;
        }
@@ -423,6 +447,8 @@ NTSTATUS libnet_keytab_add_to_keytab_entries(TALLOC_CTX *mem_ctx,
        NT_STATUS_HAVE_NO_MEMORY(entry.principal);
        NT_STATUS_HAVE_NO_MEMORY(entry.password.data);
 
+       DBG_INFO("%s: kvno:%d enctype:%d\n", entry.principal, kvno, enctype);
+
        ADD_TO_ARRAY(mem_ctx, struct libnet_keytab_entry, entry,
                     &ctx->entries, &ctx->count);
        NT_STATUS_HAVE_NO_MEMORY(ctx->entries);