From efb70690b34f62d57cf90f515c9f4368c4c7d9eb Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 26 Feb 2025 18:47:53 +0100 Subject: [PATCH 1/2] [client,x11] improve action script logging --- client/X11/xf_utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/X11/xf_utils.c b/client/X11/xf_utils.c index 6d5e73888..e18182c60 100644 --- a/client/X11/xf_utils.c +++ b/client/X11/xf_utils.c @@ -203,7 +203,7 @@ BOOL run_action_script(xfContext* xfc, const char* what, const char* arg, fn_act if (!keyScript) { - WLog_ERR(TAG, "Failed to execute '%s'", command); + WLog_ERR(TAG, "[ActionScript] Failed to execute '%s'", command); goto fail; } @@ -223,6 +223,8 @@ BOOL run_action_script(xfContext* xfc, const char* what, const char* arg, fn_act } rc = read_data; + if (!rc) + WLog_ERR(TAG, "[ActionScript] No data returned from command '%s'", command); fail: if (keyScript) pclose(keyScript); From e2af30739b25a19a4fb35759212a6efc1c74ab4d Mon Sep 17 00:00:00 2001 From: Raphael ZHOU Date: Wed, 26 Feb 2025 17:38:33 +0100 Subject: [PATCH 2/2] [shadow,kerberos] Fix Shadow crashing when calling krb5_get_init_creds_keytab if no suitable entry is found in keytab. --- winpr/libwinpr/sspi/Kerberos/kerberos.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/winpr/libwinpr/sspi/Kerberos/kerberos.c b/winpr/libwinpr/sspi/Kerberos/kerberos.c index b8dbf21db..97e65e24d 100644 --- a/winpr/libwinpr/sspi/Kerberos/kerberos.c +++ b/winpr/libwinpr/sspi/Kerberos/kerberos.c @@ -1361,7 +1361,10 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext( (!realm || krb_log_exec_bool(krb5_realm_compare, credentials->ctx, principal, entry.principal))) break; - if (krb_log_exec(krb5glue_free_keytab_entry_contents, credentials->ctx, &entry)) + const krb5_error_code res = + krb_log_exec(krb5glue_free_keytab_entry_contents, credentials->ctx, &entry); + memset(&entry, 0, sizeof(entry)); + if (res != 0) goto cleanup; } while (1);