diff -urNp -x '*.orig' sssd-1.13.4.org/src/external/krb5.m4 sssd-1.13.4/src/external/krb5.m4 --- sssd-1.13.4.org/src/external/krb5.m4 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/external/krb5.m4 2021-03-03 21:59:13.332396954 +0100 @@ -37,8 +37,8 @@ SAVE_CFLAGS=$CFLAGS SAVE_LIBS=$LIBS CFLAGS="$CFLAGS $KRB5_CFLAGS" LIBS="$LIBS $KRB5_LIBS" -AC_CHECK_HEADERS([krb5.h krb5/krb5.h]) -AC_CHECK_TYPES([krb5_ticket_times, krb5_times, krb5_trace_info], [], [], +AC_CHECK_HEADERS([krb5.h krb5/krb5.h profile.h]) +AC_CHECK_TYPES([krb5_ticket_times, krb5_times, krb5_trace_info, krb5_authdatatype], [], [], [ #ifdef HAVE_KRB5_KRB5_H #include #else @@ -46,6 +46,7 @@ AC_CHECK_TYPES([krb5_ticket_times, krb5_ #endif ]) AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc krb5_get_error_message \ + krb5_unparse_name_ext \ krb5_free_unparsed_name \ krb5_get_init_creds_opt_set_expire_callback \ krb5_get_init_creds_opt_set_fast_ccache_name \ @@ -65,7 +66,28 @@ AC_CHECK_FUNCS([krb5_get_init_creds_opt_ krb5_set_trace_callback \ krb5_find_authdata \ krb5_kt_have_content \ + krb5_get_kdc_sec_offset \ + krb5_free_string \ + krb5_xfree \ krb5_cc_get_full_name]) + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_KRB5_KRB5_H + #include + #else + #include + #endif + ]], + [[ krb5_get_init_creds_opt_set_canonicalize(NULL, 0); ]])], + [AC_DEFINE([KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE_ARGS], [2], [number of arguments])]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_KRB5_KRB5_H + #include + #else + #include + #endif + ]], + [[ krb5_get_init_creds_opt_set_canonicalize(NULL, NULL, 0); ]])], + [AC_DEFINE([KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE_ARGS], [3], [number of arguments])]) + CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS CFLAGS="$CFLAGS $KRB5_CFLAGS" diff -urNp -x '*.orig' sssd-1.13.4.org/src/krb5_plugin/sssd_krb5_locator_plugin.c sssd-1.13.4/src/krb5_plugin/sssd_krb5_locator_plugin.c --- sssd-1.13.4.org/src/krb5_plugin/sssd_krb5_locator_plugin.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/krb5_plugin/sssd_krb5_locator_plugin.c 2021-03-03 21:59:13.332396954 +0100 @@ -339,6 +339,7 @@ krb5_error_code sssd_krb5_locator_lookup switch (socktype) { case SOCK_STREAM: case SOCK_DGRAM: + case 0: /* any */ break; default: return KRB5_PLUGIN_NO_HANDLE; @@ -373,7 +374,7 @@ krb5_error_code sssd_krb5_locator_lookup ai->ai_family, ai->ai_socktype)); if ((family == AF_UNSPEC || ai->ai_family == family) && - ai->ai_socktype == socktype) { + (ai->ai_socktype == socktype || socktype == 0)) { ret = cbfunc(cbdata, socktype, ai->ai_addr); if (ret != 0) { diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/ad/ad_common.c sssd-1.13.4/src/providers/ad/ad_common.c --- sssd-1.13.4.org/src/providers/ad/ad_common.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/ad/ad_common.c 2021-03-03 21:59:13.332396954 +0100 @@ -644,7 +644,7 @@ errno_t ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, const char *primary_servers, const char *backup_servers, - const char *krb5_realm, + const char *krb5_realm_str, const char *ad_service, const char *ad_gc_service, const char *ad_domain, @@ -704,13 +704,13 @@ ad_failover_init(TALLOC_CTX *mem_ctx, st service->sdap->kinit_service_name = service->krb5_service->name; service->gc->kinit_service_name = service->krb5_service->name; - if (!krb5_realm) { + if (!krb5_realm_str) { DEBUG(SSSDBG_CRIT_FAILURE, "No Kerberos realm set\n"); ret = EINVAL; goto done; } service->krb5_service->realm = - talloc_strdup(service->krb5_service, krb5_realm); + talloc_strdup(service->krb5_service, krb5_realm_str); if (!service->krb5_service->realm) { ret = ENOMEM; goto done; @@ -918,7 +918,7 @@ ad_set_sdap_options(struct ad_options *a struct sdap_options *id_opts) { errno_t ret; - char *krb5_realm; + char *krb5_realm_str; char *keytab_path; /* We only support Kerberos password policy with AD, so @@ -933,20 +933,20 @@ ad_set_sdap_options(struct ad_options *a } /* Set the Kerberos Realm for GSSAPI */ - krb5_realm = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM); - if (!krb5_realm) { + krb5_realm_str = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM); + if (!krb5_realm_str) { /* Should be impossible, this is set in ad_get_common_options() */ DEBUG(SSSDBG_FATAL_FAILURE, "No Kerberos realm\n"); ret = EINVAL; goto done; } - ret = dp_opt_set_string(id_opts->basic, SDAP_KRB5_REALM, krb5_realm); + ret = dp_opt_set_string(id_opts->basic, SDAP_KRB5_REALM, krb5_realm_str); if (ret != EOK) goto done; DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", id_opts->basic[SDAP_KRB5_REALM].opt_name, - krb5_realm); + krb5_realm_str); keytab_path = dp_opt_get_string(ad_opts->basic, AD_KEYTAB); if (keytab_path) { @@ -1137,7 +1137,7 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx, errno_t ret; struct dp_option *krb5_options; const char *ad_servers; - const char *krb5_realm; + const char *krb5_realm_str; TALLOC_CTX *tmp_ctx = talloc_new(NULL); if (!tmp_ctx) return ENOMEM; @@ -1164,8 +1164,8 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx, /* Set krb5 realm */ /* Set the Kerberos Realm for GSSAPI */ - krb5_realm = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM); - if (!krb5_realm) { + krb5_realm_str = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM); + if (!krb5_realm_str) { /* Should be impossible, this is set in ad_get_common_options() */ DEBUG(SSSDBG_FATAL_FAILURE, "No Kerberos realm\n"); ret = EINVAL; @@ -1175,12 +1175,12 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx, /* Force the kerberos realm to match the AD_KRB5_REALM (which may have * been upper-cased in ad_common_options() */ - ret = dp_opt_set_string(krb5_options, KRB5_REALM, krb5_realm); + ret = dp_opt_set_string(krb5_options, KRB5_REALM, krb5_realm_str); if (ret != EOK) goto done; DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", krb5_options[KRB5_REALM].opt_name, - krb5_realm); + krb5_realm_str); /* Set flag that controls whether we want to write the * kdcinfo files at all diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/krb5/krb5_child.c sssd-1.13.4/src/providers/krb5/krb5_child.c --- sssd-1.13.4.org/src/providers/krb5/krb5_child.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/krb5/krb5_child.c 2021-03-03 21:59:13.332396954 +0100 @@ -136,7 +136,7 @@ static krb5_error_code set_lifetime_opti return 0; } -static void set_canonicalize_option(krb5_get_init_creds_opt *opts) +static void set_canonicalize_option(krb5_context ctx, krb5_get_init_creds_opt *opts) { int canonicalize = 0; char *tmp_str; @@ -147,23 +147,23 @@ static void set_canonicalize_option(krb5 } DEBUG(SSSDBG_CONF_SETTINGS, "%s is set to [%s]\n", SSSD_KRB5_CANONICALIZE, tmp_str ? tmp_str : "not set"); - sss_krb5_get_init_creds_opt_set_canonicalize(opts, canonicalize); + sss_krb5_get_init_creds_opt_set_canonicalize(ctx, opts, canonicalize); } -static void set_changepw_options(krb5_get_init_creds_opt *options) +static void set_changepw_options(krb5_context ctx, krb5_get_init_creds_opt *options) { - sss_krb5_get_init_creds_opt_set_canonicalize(options, 0); + sss_krb5_get_init_creds_opt_set_canonicalize(ctx, options, 0); krb5_get_init_creds_opt_set_forwardable(options, 0); krb5_get_init_creds_opt_set_proxiable(options, 0); krb5_get_init_creds_opt_set_renew_life(options, 0); krb5_get_init_creds_opt_set_tkt_life(options, 5*60); } -static void revert_changepw_options(krb5_get_init_creds_opt *options) +static void revert_changepw_options(krb5_context ctx, krb5_get_init_creds_opt *options) { krb5_error_code kerr; - set_canonicalize_option(options); + set_canonicalize_option(ctx, options); /* Currently we do not set forwardable and proxiable explicitly, the flags * must be removed so that libkrb5 can take the defaults from krb5.conf */ @@ -177,6 +177,7 @@ static void revert_changepw_options(krb5 } +#ifdef HAVE_PAC_RESPONDER static errno_t sss_send_pac(krb5_authdata **pac_authdata) { struct sss_cli_req_data sss_data; @@ -199,6 +200,7 @@ static errno_t sss_send_pac(krb5_authdat return EOK; } +#endif /* HAVE_PAC_RESPONDER */ static void sss_krb5_expire_callback_func(krb5_context context, void *data, krb5_timestamp password_expiration, @@ -630,7 +632,8 @@ static krb5_error_code create_empty_cred { krb5_error_code kerr; krb5_creds *cred = NULL; - krb5_data *krb5_realm; + const char *realm_name; + int realm_length; cred = calloc(sizeof(krb5_creds), 1); if (cred == NULL) { @@ -644,12 +647,12 @@ static krb5_error_code create_empty_cred goto done; } - krb5_realm = krb5_princ_realm(ctx, princ); + sss_krb5_princ_realm(ctx, princ, &realm_name, &realm_length); kerr = krb5_build_principal_ext(ctx, &cred->server, - krb5_realm->length, krb5_realm->data, + realm_length, realm_name, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME, - krb5_realm->length, krb5_realm->data, 0); + realm_length, realm_name, 0); if (kerr != 0) { DEBUG(SSSDBG_CRIT_FAILURE, "krb5_build_principal_ext failed.\n"); goto done; @@ -987,7 +990,8 @@ static errno_t add_ticket_times_and_upn_ goto done; } - kerr = krb5_unparse_name_ext(kr->ctx, kr->creds->client, &upn, &upn_len); + kerr = sss_krb5_unparse_name_ext(kr->ctx, kr->creds->client, + &upn, &upn_len); if (kerr != 0) { DEBUG(SSSDBG_OP_FAILURE, "krb5_unparse_name failed.\n"); goto done; @@ -995,7 +999,7 @@ static errno_t add_ticket_times_and_upn_ ret = pam_add_response(kr->pd, SSS_KRB5_INFO_UPN, upn_len, (uint8_t *) upn); - krb5_free_unparsed_name(kr->ctx, upn); + sss_krb5_free_unparsed_name(kr->ctx, upn); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, "pack_response_packet failed.\n"); goto done; @@ -1017,7 +1021,9 @@ static krb5_error_code validate_tgt(stru krb5_principal validation_princ = NULL; bool realm_entry_found = false; krb5_ccache validation_ccache = NULL; +#ifdef HAVE_PAC_RESPONDER krb5_authdata **pac_authdata = NULL; +#endif memset(&keytab, 0, sizeof(keytab)); kerr = krb5_kt_resolve(kr->ctx, kr->keytab, &keytab); @@ -1111,6 +1117,7 @@ static krb5_error_code validate_tgt(stru goto done; } +#ifdef HAVE_PAC_RESPONDER /* Try to find and send the PAC to the PAC responder. * Failures are not critical. */ if (kr->send_pac) { @@ -1133,6 +1140,7 @@ static krb5_error_code validate_tgt(stru kerr = 0; } } +#endif /* HAVE_PAC_RESPONDER */ done: if (validation_ccache != NULL) { @@ -1168,7 +1176,7 @@ static krb5_error_code get_and_save_tgt_ krb5_get_init_creds_opt_set_address_list(&options, NULL); krb5_get_init_creds_opt_set_forwardable(&options, 0); krb5_get_init_creds_opt_set_proxiable(&options, 0); - set_canonicalize_option(&options); + set_canonicalize_option(ctx, &options); kerr = krb5_get_init_creds_keytab(ctx, &creds, princ, keytab, 0, NULL, &options); @@ -1382,7 +1390,7 @@ static errno_t changepw_child(struct krb prompter = sss_krb5_prompter; } - set_changepw_options(kr->options); + set_changepw_options(kr->ctx, kr->options); sss_krb5_princ_realm(kr->ctx, kr->princ, &realm_name, &realm_length); if (realm_length == 0) { DEBUG(SSSDBG_CRIT_FAILURE, "sss_krb5_princ_realm failed.\n"); @@ -1434,9 +1442,9 @@ static errno_t changepw_child(struct krb memset(&result_code_string, 0, sizeof(krb5_data)); memset(&result_string, 0, sizeof(krb5_data)); - kerr = krb5_change_password(kr->ctx, kr->creds, - discard_const(newpassword), &result_code, - &result_code_string, &result_string); + kerr = krb5_set_password(kr->ctx, kr->creds, + discard_const(newpassword), NULL, + &result_code, &result_code_string, &result_string); if (kerr == KRB5_KDC_UNREACH) { return ERR_NETWORK_IO; @@ -1450,7 +1458,7 @@ static errno_t changepw_child(struct krb if (result_code_string.length > 0) { DEBUG(SSSDBG_CRIT_FAILURE, "krb5_change_password failed [%d][%.*s].\n", result_code, - result_code_string.length, result_code_string.data); + (int) result_code_string.length, (char *) result_code_string.data); user_error_message = talloc_strndup(kr->pd, result_code_string.data, result_code_string.length); if (user_error_message == NULL) { @@ -1458,10 +1466,10 @@ static errno_t changepw_child(struct krb } } - if (result_string.length > 0 && result_string.data[0] != '\0') { + if (result_string.length > 0 && ((char *) result_string.data)[0] != '\0') { DEBUG(SSSDBG_CRIT_FAILURE, "krb5_change_password failed [%d][%.*s].\n", result_code, - result_string.length, result_string.data); + (int) result_string.length, (char *) result_string.data); talloc_free(user_error_message); user_error_message = talloc_strndup(kr->pd, result_string.data, result_string.length); @@ -1512,7 +1520,7 @@ static errno_t changepw_child(struct krb /* We changed some of the gic options for the password change, now we have * to change them back to get a fresh TGT. */ - revert_changepw_options(kr->options); + revert_changepw_options(kr->ctx, kr->options); kerr = get_and_save_tgt(kr, newpassword); @@ -1583,7 +1591,7 @@ static errno_t tgt_req_child(struct krb5 "Failed to unset expire callback, continue ...\n"); } - set_changepw_options(kr->options); + set_changepw_options(kr->ctx, kr->options); kerr = krb5_get_init_creds_password(kr->ctx, kr->creds, kr->princ, discard_const(password), sss_krb5_prompter, kr, 0, @@ -2166,7 +2174,8 @@ static errno_t k5c_recv_data(struct krb5 static int k5c_setup_fast(struct krb5_req *kr, bool demand) { krb5_principal fast_princ_struct; - krb5_data *realm_data; + const char *realm_name; + int realm_length; char *fast_principal_realm; char *fast_principal; krb5_error_code kerr; @@ -2195,8 +2204,11 @@ static int k5c_setup_fast(struct krb5_re return KRB5KRB_ERR_GENERIC; } free(tmp_str); - realm_data = krb5_princ_realm(kr->ctx, fast_princ_struct); - fast_principal_realm = talloc_asprintf(kr, "%.*s", realm_data->length, realm_data->data); + sss_krb5_princ_realm(kr->ctx, fast_princ_struct, + &realm_name, &realm_length); + + fast_principal_realm = talloc_asprintf(kr, "%.*s", + realm_length, realm_name); if (!fast_principal_realm) { DEBUG(SSSDBG_CRIT_FAILURE, "talloc_asprintf failed.\n"); return ENOMEM; @@ -2482,7 +2494,7 @@ static int k5c_setup(struct krb5_req *kr } if (!offline) { - set_canonicalize_option(kr->options); + set_canonicalize_option(kr->ctx, kr->options); } /* TODO: set options, e.g. diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/krb5/krb5_common.c sssd-1.13.4/src/providers/krb5/krb5_common.c --- sssd-1.13.4.org/src/providers/krb5/krb5_common.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/krb5/krb5_common.c 2021-03-03 21:59:13.332396954 +0100 @@ -33,7 +33,7 @@ #include "providers/krb5/krb5_opts.h" #include "providers/krb5/krb5_utils.h" -#ifdef HAVE_KRB5_CC_COLLECTION +#ifdef HAVE_PROFILE_H /* krb5 profile functions */ #include #endif @@ -91,7 +91,7 @@ done: return ret; } -#ifdef HAVE_KRB5_CC_COLLECTION +#ifdef HAVE_PROFILE_H /* source default_ccache_name from krb5.conf */ static errno_t sss_get_system_ccname_template(TALLOC_CTX *mem_ctx, char **ccname) @@ -921,7 +921,7 @@ errno_t krb5_install_offline_callback(st { int ret; struct remove_info_files_ctx *ctx; - const char *krb5_realm; + const char *krb5_realm_str; if (krb5_ctx->service == NULL || krb5_ctx->service->name == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "Missing KDC service name!\n"); @@ -934,14 +934,14 @@ errno_t krb5_install_offline_callback(st return ENOMEM; } - krb5_realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); - if (krb5_realm == NULL) { + krb5_realm_str = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); + if (krb5_realm_str == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "Missing krb5_realm option!\n"); ret = EINVAL; goto done; } - ctx->realm = talloc_strdup(ctx, krb5_realm); + ctx->realm = talloc_strdup(ctx, krb5_realm_str); if (ctx->realm == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup failed!\n"); ret = ENOMEM; @@ -976,19 +976,19 @@ done: errno_t krb5_install_sigterm_handler(struct tevent_context *ev, struct krb5_ctx *krb5_ctx) { - const char *krb5_realm; + const char *krb5_realm_str; char *sig_realm; struct tevent_signal *sige; BlockSignals(false, SIGTERM); - krb5_realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); - if (krb5_realm == NULL) { + krb5_realm_str = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); + if (krb5_realm_str == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "Missing krb5_realm option!\n"); return EINVAL; } - sig_realm = talloc_strdup(krb5_ctx, krb5_realm); + sig_realm = talloc_strdup(krb5_ctx, krb5_realm_str); if (sig_realm == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup failed!\n"); return ENOMEM; diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/krb5/krb5_init.c sssd-1.13.4/src/providers/krb5/krb5_init.c --- sssd-1.13.4.org/src/providers/krb5/krb5_init.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/krb5/krb5_init.c 2021-03-03 21:59:13.332396954 +0100 @@ -64,7 +64,7 @@ int sssm_krb5_auth_init(struct be_ctx *b const char *krb5_backup_servers; const char *krb5_kpasswd_servers; const char *krb5_backup_kpasswd_servers; - const char *krb5_realm; + const char *krb5_realm_str; const char *errstr; int errval; int errpos; @@ -103,15 +103,15 @@ int sssm_krb5_auth_init(struct be_ctx *b krb5_servers = dp_opt_get_string(ctx->opts, KRB5_KDC); krb5_backup_servers = dp_opt_get_string(ctx->opts, KRB5_BACKUP_KDC); - krb5_realm = dp_opt_get_string(ctx->opts, KRB5_REALM); - if (krb5_realm == NULL) { + krb5_realm_str = dp_opt_get_string(ctx->opts, KRB5_REALM); + if (krb5_realm_str == NULL) { DEBUG(SSSDBG_FATAL_FAILURE, "Missing krb5_realm option!\n"); return EINVAL; } ret = krb5_service_init(ctx, bectx, SSS_KRB5KDC_FO_SRV, krb5_servers, - krb5_backup_servers, krb5_realm, + krb5_backup_servers, krb5_realm_str, dp_opt_get_bool(krb5_options->opts, KRB5_USE_KDCINFO), &ctx->service); @@ -138,7 +138,7 @@ int sssm_krb5_auth_init(struct be_ctx *b } else { ret = krb5_service_init(ctx, bectx, SSS_KRB5KPASSWD_FO_SRV, krb5_kpasswd_servers, - krb5_backup_kpasswd_servers, krb5_realm, + krb5_backup_kpasswd_servers, krb5_realm_str, dp_opt_get_bool(krb5_options->opts, KRB5_USE_KDCINFO), &ctx->kpasswd_service); diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/krb5/krb5_keytab.c sssd-1.13.4/src/providers/krb5/krb5_keytab.c --- sssd-1.13.4.org/src/providers/krb5/krb5_keytab.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/krb5/krb5_keytab.c 2021-03-03 21:59:13.332396954 +0100 @@ -85,6 +85,10 @@ static krb5_error_code do_keytab_copy(kr return 0; } +#ifndef MAX_KEYTAB_NAME_LEN +#define MAX_KEYTAB_NAME_LEN 1100 +#endif + krb5_error_code copy_keytab_into_memory(TALLOC_CTX *mem_ctx, krb5_context kctx, const char *inp_keytab_file, char **_mem_name, diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/ldap/ldap_child.c sssd-1.13.4/src/providers/ldap/ldap_child.c --- sssd-1.13.4.org/src/providers/ldap/ldap_child.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/ldap/ldap_child.c 2021-03-03 21:59:13.332396954 +0100 @@ -99,7 +99,7 @@ static errno_t unpack_buffer(uint8_t *bu /* ticket lifetime */ SAFEALIGN_COPY_UINT32_CHECK(&ibuf->lifetime, buf + p, size, &p); - DEBUG(SSSDBG_TRACE_LIBS, "lifetime: %u\n", ibuf->lifetime); + DEBUG(SSSDBG_TRACE_LIBS, "lifetime: %ld\n", (long)(ibuf->lifetime)); /* UID and GID to run as */ SAFEALIGN_COPY_UINT32_CHECK(&ibuf->uid, buf + p, size, &p); @@ -384,7 +384,8 @@ static krb5_error_code ldap_child_get_tg DEBUG(SSSDBG_CONF_SETTINGS, "Will canonicalize principals\n"); canonicalize = 1; } - sss_krb5_get_init_creds_opt_set_canonicalize(&options, canonicalize); + sss_krb5_get_init_creds_opt_set_canonicalize(context, + &options, canonicalize); ccname_file = talloc_asprintf(tmp_ctx, "%s/ccache_%s", DB_PATH, realm_name); @@ -463,8 +464,7 @@ static krb5_error_code ldap_child_get_tg } DEBUG(SSSDBG_TRACE_INTERNAL, "credentials stored\n"); -#ifdef HAVE_KRB5_GET_TIME_OFFSETS - krberr = krb5_get_time_offsets(context, &kdc_time_offset, + krberr = sss_krb5_get_time_offsets(context, &kdc_time_offset, &kdc_time_offset_usec); if (krberr) { DEBUG(SSSDBG_OP_FAILURE, "Failed to get KDC time offset: %s\n", @@ -476,10 +476,6 @@ static krb5_error_code ldap_child_get_tg } } DEBUG(SSSDBG_TRACE_INTERNAL, "Got KDC time offset\n"); -#else - /* If we don't have this function, just assume no offset */ - kdc_time_offset = 0; -#endif DEBUG(SSSDBG_TRACE_INTERNAL, "Renaming [%s] to [%s]\n", ccname_file_dummy, ccname_file); diff -urNp -x '*.orig' sssd-1.13.4.org/src/providers/ldap/ldap_common.c sssd-1.13.4/src/providers/ldap/ldap_common.c --- sssd-1.13.4.org/src/providers/ldap/ldap_common.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/providers/ldap/ldap_common.c 2021-03-03 21:59:13.332396954 +0100 @@ -363,7 +363,7 @@ done: static const char * sdap_gssapi_get_default_realm(TALLOC_CTX *mem_ctx) { - char *krb5_realm = NULL; + char *krb5_realm_str = NULL; const char *realm = NULL; krb5_error_code krberr; krb5_context context = NULL; @@ -374,15 +374,15 @@ sdap_gssapi_get_default_realm(TALLOC_CTX goto done; } - krberr = krb5_get_default_realm(context, &krb5_realm); + krberr = krb5_get_default_realm(context, &krb5_realm_str); if (krberr) { DEBUG(SSSDBG_OP_FAILURE, "Failed to get default realm name: %s\n", sss_krb5_get_error_message(context, krberr)); goto done; } - realm = talloc_strdup(mem_ctx, krb5_realm); - krb5_free_default_realm(context, krb5_realm); + realm = talloc_strdup(mem_ctx, krb5_realm_str); + krb5_free_default_realm(context, krb5_realm_str); if (!realm) { DEBUG(SSSDBG_FATAL_FAILURE, "Out of memory\n"); goto done; @@ -415,7 +415,7 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx int ret; const char *krb5_servers; const char *krb5_backup_servers; - const char *krb5_realm; + const char *krb5_realm_str; const char *krb5_opt_realm; struct krb5_service *service = NULL; TALLOC_CTX *tmp_ctx; @@ -430,16 +430,16 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx if (krb5_opt_realm == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Missing krb5_realm option, will use libkrb default\n"); - krb5_realm = sdap_gssapi_get_default_realm(tmp_ctx); - if (krb5_realm == NULL) { + krb5_realm_str = sdap_gssapi_get_default_realm(tmp_ctx); + if (krb5_realm_str == NULL) { DEBUG(SSSDBG_FATAL_FAILURE, "Cannot determine the Kerberos realm, aborting\n"); ret = EIO; goto done; } } else { - krb5_realm = talloc_strdup(tmp_ctx, krb5_opt_realm); - if (krb5_realm == NULL) { + krb5_realm_str = talloc_strdup(tmp_ctx, krb5_opt_realm); + if (krb5_realm_str == NULL) { ret = ENOMEM; goto done; } @@ -447,7 +447,7 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx ret = krb5_service_init(mem_ctx, bectx, SSS_KRB5KDC_FO_SRV, krb5_servers, - krb5_backup_servers, krb5_realm, + krb5_backup_servers, krb5_realm_str, dp_opt_get_bool(opts, SDAP_KRB5_USE_KDCINFO), &service); @@ -456,14 +456,14 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx goto done; } - ret = sdap_install_sigterm_handler(mem_ctx, bectx->ev, krb5_realm); + ret = sdap_install_sigterm_handler(mem_ctx, bectx->ev, krb5_realm_str); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, "Failed to install sigterm handler\n"); goto done; } ret = sdap_install_offline_callback(mem_ctx, bectx, - krb5_realm, SSS_KRB5KDC_FO_SRV); + krb5_realm_str, SSS_KRB5KDC_FO_SRV); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, "Failed to install sigterm handler\n"); goto done; diff -urNp -x '*.orig' sssd-1.13.4.org/src/tests/krb5_child-test.c sssd-1.13.4/src/tests/krb5_child-test.c --- sssd-1.13.4.org/src/tests/krb5_child-test.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/tests/krb5_child-test.c 2021-03-03 21:59:13.332396954 +0100 @@ -283,17 +283,17 @@ child_done(struct tevent_req *req) static void printtime(krb5_timestamp ts) { +#ifdef HAVE_KRB5_TIMESTAMP_TO_SFSTRING krb5_error_code kret; char timestring[BUFSIZ]; char fill = '\0'; -#ifdef HAVE_KRB5_TIMESTAMP_TO_SFSTRING kret = krb5_timestamp_to_sfstring(ts, timestring, BUFSIZ, &fill); if (kret) { KRB5_CHILD_TEST_DEBUG(SSSDBG_OP_FAILURE, kret); } printf("%s", timestring); -#else +#elif defined(HAVE_KRB5_FORMAT_TIME) printf("%s", ctime(&ts)); #endif /* HAVE_KRB5_TIMESTAMP_TO_SFSTRING */ } @@ -326,8 +326,8 @@ print_creds(krb5_context kcontext, krb5_ } done: - krb5_free_unparsed_name(kcontext, name); - krb5_free_unparsed_name(kcontext, sname); + sss_krb5_free_unparsed_name(kcontext, name); + sss_krb5_free_unparsed_name(kcontext, sname); } static errno_t @@ -374,7 +374,7 @@ print_ccache(const char *cc) ret = EOK; done: krb5_cc_close(kcontext, cache); - krb5_free_unparsed_name(kcontext, defname); + sss_krb5_free_unparsed_name(kcontext, defname); krb5_free_principal(kcontext, princ); krb5_free_context(kcontext); return ret; diff -urNp -x '*.orig' sssd-1.13.4.org/src/util/sss_krb5.c sssd-1.13.4/src/util/sss_krb5.c --- sssd-1.13.4.org/src/util/sss_krb5.c 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/util/sss_krb5.c 2021-03-03 21:59:13.332396954 +0100 @@ -20,7 +20,9 @@ #include #include #include +#ifdef HAVE_PROFILE_H #include +#endif #include "config.h" @@ -485,7 +487,9 @@ void KRB5_CALLCONV sss_krb5_get_init_cre void KRB5_CALLCONV sss_krb5_free_unparsed_name(krb5_context context, char *name) { -#ifdef HAVE_KRB5_FREE_UNPARSED_NAME +#ifdef HAVE_KRB5_XFREE + krb5_xfree(name); +#elif HAVE_KRB5_FREE_UNPARSED_NAME krb5_free_unparsed_name(context, name); #else if (name != NULL) { @@ -495,6 +499,15 @@ void KRB5_CALLCONV sss_krb5_free_unparse #endif } +void KRB5_CALLCONV sss_krb5_free_string(krb5_context ctx, char *val) +{ +/* TODO: ensure at least on is available in krb5.m4 */ +#ifdef HAVE_KRB5_FREE_STRING + krb5_free_string(ctx, val); +#elif HAVE_KRB5_XFREE + (void) krb5_xfree(val); +#endif +} krb5_error_code KRB5_CALLCONV sss_krb5_get_init_creds_opt_set_expire_callback( krb5_context context, @@ -753,15 +766,16 @@ cleanup: #endif /* HAVE_KRB5_UNPARSE_NAME_FLAGS */ } -void sss_krb5_get_init_creds_opt_set_canonicalize(krb5_get_init_creds_opt *opts, +void sss_krb5_get_init_creds_opt_set_canonicalize(krb5_context ctx, + krb5_get_init_creds_opt *opts, int canonicalize) { - /* FIXME: The extra check for HAVE_KRB5_TICKET_TIMES is a workaround due to Heimdal - * defining krb5_get_init_creds_opt_set_canonicalize() with a different set of - * arguments. We should use a better configure check in the future. - */ -#if defined(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE) && defined(HAVE_KRB5_TICKET_TIMES) +#if defined(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE) && \ + KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE_ARGS == 2 krb5_get_init_creds_opt_set_canonicalize(opts, canonicalize); +#elif defined(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE) && \ + KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE_ARGS == 3 + (void) krb5_get_init_creds_opt_set_canonicalize(ctx, opts, canonicalize); #else DEBUG(SSSDBG_OP_FAILURE, "Kerberos principal canonicalization is not available!\n"); #endif @@ -1023,7 +1037,7 @@ done: KRB5_DEBUG(SSSDBG_MINOR_FAILURE, ctx, kerr); } } - krb5_free_string(ctx, tmp_ccname); + sss_krb5_free_string(ctx, tmp_ccname); return ret_ccname; #else @@ -1076,6 +1090,7 @@ krb5_error_code sss_krb5_kt_have_content bool sss_krb5_realm_has_proxy(const char *realm) { +#ifdef HAVE_PROFILE_H krb5_context context = NULL; krb5_error_code kerr; struct _profile_t *profile = NULL; @@ -1128,4 +1143,48 @@ done: krb5_free_context(context); return res; +#else + return false; +#endif +} + +krb5_error_code KRB5_CALLCONV +sss_krb5_unparse_name_ext(krb5_context ctx, + krb5_const_principal principal, + char **name, + unsigned int *len) +{ + krb5_error_code kerr; + +#ifdef HAVE_KRB5_UNPARSE_NAME_EXT + kerr = krb5_unparse_name_ext(ctx, principal, name, len); +#else + kerr = krb5_unparse_name(ctx, principal, name); + if (kerr == 0 && *name) + *len = strlen(*name); +#endif /* HAVE_KRB5_UNPARSE_NAME_EXT */ + + return kerr; +} + +krb5_error_code KRB5_CALLCONV +sss_krb5_get_time_offsets(krb5_context ctx, + krb5_timestamp *seconds, + int32_t *microseconds) +{ +#if defined(HAVE_KRB5_GET_TIME_OFFSETS) + return krb5_get_time_offsets(ctx, seconds, microseconds); +#elif defined(HAVE_KRB5_GET_KDC_SEC_OFFSET) + int32_t _seconds; + krb5_error_code ret; + + ret = krb5_get_kdc_sec_offset(ctx, &_seconds, microseconds); + *seconds = _seconds; + return ret; +#else + (void) ctx; + *seconds = 0; + *microseconds = 0; + return 0; +#endif } diff -urNp -x '*.orig' sssd-1.13.4.org/src/util/sss_krb5.h sssd-1.13.4/src/util/sss_krb5.h --- sssd-1.13.4.org/src/util/sss_krb5.h 2016-04-13 16:48:41.000000000 +0200 +++ sssd-1.13.4/src/util/sss_krb5.h 2021-03-03 21:59:13.332396954 +0100 @@ -70,6 +70,8 @@ void KRB5_CALLCONV sss_krb5_get_init_cre void KRB5_CALLCONV sss_krb5_free_unparsed_name(krb5_context context, char *name); +void KRB5_CALLCONV sss_krb5_free_string(krb5_context ctx, char *val); + krb5_error_code find_principal_in_keytab(krb5_context ctx, krb5_keytab keytab, const char *pattern_primary, @@ -133,7 +135,8 @@ krb5_error_code sss_krb5_unparse_name_flags(krb5_context context, krb5_const_principal principal, int flags, char **name); -void sss_krb5_get_init_creds_opt_set_canonicalize(krb5_get_init_creds_opt *opts, +void sss_krb5_get_init_creds_opt_set_canonicalize(krb5_context ctx, + krb5_get_init_creds_opt *opts, int canonicalize); enum sss_krb5_cc_type { @@ -164,6 +167,10 @@ typedef krb5_times sss_krb5_ticket_times /* Redirect libkrb5 tracing towards our DEBUG statements */ errno_t sss_child_set_krb5_tracing(krb5_context ctx); +#ifndef HAVE_KRB5_AUTHDATATYPE +typedef int32_t krb5_authdatatype; +#endif + krb5_error_code sss_krb5_find_authdata(krb5_context context, krb5_authdata *const *ticket_authdata, krb5_authdata *const *ap_req_authdata, @@ -186,4 +193,14 @@ krb5_error_code sss_krb5_kt_have_content krb5_keytab keytab); bool sss_krb5_realm_has_proxy(const char *realm); + +krb5_error_code KRB5_CALLCONV +sss_krb5_unparse_name_ext(krb5_context ctx, + krb5_const_principal principal, + char **name, + unsigned int *len); +krb5_error_code KRB5_CALLCONV +sss_krb5_get_time_offsets(krb5_context ctx, + krb5_timestamp *seconds, + int32_t *microseconds); #endif /* __SSS_KRB5_H__ */