From 97cfa9b2f813469992c18fc655b0f369082a5441fcd3c6276a01dede09fdc874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Thu, 10 Aug 2017 13:18:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_krb5?expand=0&rev=35 --- bug-641008_pam_krb5-2.3.11-setcred-log.diff | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bug-641008_pam_krb5-2.3.11-setcred-log.diff b/bug-641008_pam_krb5-2.3.11-setcred-log.diff index eb3823b..b75d435 100644 --- a/bug-641008_pam_krb5-2.3.11-setcred-log.diff +++ b/bug-641008_pam_krb5-2.3.11-setcred-log.diff @@ -1,26 +1,27 @@ -Index: pam_krb5-2.4.4/src/auth.c +Index: pam_krb5-2.4.13/src/auth.c =================================================================== ---- pam_krb5-2.4.4.orig/src/auth.c -+++ pam_krb5-2.4.4/src/auth.c -@@ -434,13 +434,32 @@ int - pam_sm_setcred(pam_handle_t *pamh, int flags, +--- pam_krb5-2.4.13.orig/src/auth.c ++++ pam_krb5-2.4.13/src/auth.c +@@ -435,13 +435,33 @@ pam_sm_setcred(pam_handle_t *pamh, int f int argc, PAM_KRB5_MAYBE_CONST char **argv) { + const char *why = ""; + krb5_context ctx; + struct _pam_krb5_options *options; struct _pam_krb5_perms *saved_perms; - notice("pam_setcred (%s) called", -- (flags & PAM_ESTABLISH_CRED)?"establish credential": -- (flags & PAM_REINITIALIZE_CRED)?"reinitialize credential": -- (flags & PAM_REFRESH_CRED)?"refresh credential": -- (flags & PAM_DELETE_CRED)?"delete credential":"unknown flag"); +- (flags & PAM_ESTABLISH_CRED)?"establish credential": +- (flags & PAM_REINITIALIZE_CRED)?"reinitialize credential": +- (flags & PAM_REFRESH_CRED)?"refresh credential": +- (flags & PAM_DELETE_CRED)?"delete credential":"unknown flag"); + + if (_pam_krb5_init_ctx(&ctx, argc, argv) != 0) { + warn("error initializing Kerberos"); + return PAM_SERVICE_ERR; + } + -+ options = _pam_krb5_options_init(pamh, argc, argv, ctx); ++ options = _pam_krb5_options_init(pamh, argc, argv, ctx, ++ _pam_krb5_option_role_general); + if (options == NULL) { + warn("error parsing options (shouldn't happen)"); + krb5_free_context(ctx); @@ -40,7 +41,7 @@ Index: pam_krb5-2.4.4/src/auth.c return _pam_krb5_open_session(pamh, flags, argc, argv, "pam_setcred(PAM_ESTABLISH_CRED)", _pam_krb5_session_caller_setcred); -@@ -455,21 +474,31 @@ pam_sm_setcred(pam_handle_t *pamh, int f +@@ -464,20 +484,30 @@ pam_sm_setcred(pam_handle_t *pamh, int f } saved_perms = NULL; @@ -55,7 +56,6 @@ Index: pam_krb5-2.4.4/src/auth.c if (saved_perms != NULL) { _pam_krb5_restore_perms_r2e(saved_perms); } - saved_perms = NULL; + _pam_krb5_options_free(pamh, ctx, options); + krb5_free_context(ctx); return PAM_IGNORE;