Attachment 191134 Details for Bug 204827 – change krb5 version parsing method

[patch] change krb5 version parsing method

patch-src__external__pac_responder.m4.patch (text/plain), 2.36 KB, created by Joris Dedieu on 2018-03-02 12:51:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joris Dedieu

Created: 2018-03-02 12:51:40 UTC

Size: 2.36 KB

patch

obsolete

>--- security/sssd/files/patch-src_external_pac__responder.m4.orig	2018-03-02 11:50:19.085043000 +0100
>+++ security/sssd/files/patch-src_external_pac__responder.m4	2018-03-02 13:48:08.684202000 +0100
>@@ -1,22 +1,40 @@
>---- src/external/pac_responder.m4.orig	2014-09-17 13:01:37 UTC
>-+++ src/external/pac_responder.m4
>-@@ -14,14 +14,17 @@ then
>+--- src/external/pac_responder.m4.orig	2014-09-17 15:01:37.000000000 +0200
>++++ src/external/pac_responder.m4	2018-03-02 12:42:15.841772000 +0100
>+@@ -14,22 +14,23 @@
>      PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,
>          AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))
>  
> -    AC_PATH_PROG(KRB5_CONFIG, krb5-config)
> +    AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH])
>      AC_MSG_CHECKING(for supported MIT krb5 version)
>-     KRB5_VERSION="`$KRB5_CONFIG --version`"
>-     case $KRB5_VERSION in
>-         Kerberos\ 5\ release\ 1.9* | \
>-         Kerberos\ 5\ release\ 1.10* | \
>-         Kerberos\ 5\ release\ 1.11* | \
>+-    KRB5_VERSION="`$KRB5_CONFIG --version`"
>+-    case $KRB5_VERSION in
>+-        Kerberos\ 5\ release\ 1.9* | \
>+-        Kerberos\ 5\ release\ 1.10* | \
>+-        Kerberos\ 5\ release\ 1.11* | \
> -        Kerberos\ 5\ release\ 1.12*)
>-+        Kerberos\ 5\ release\ 1.12* | \
>-+        Kerberos\ 5\ release\ 1.13* | \
>-+        Kerberos\ 5\ release\ 1.14* | \
>-+        Kerberos\ 5\ release\ 1.15*)
>-             krb5_version_ok=yes
>-             AC_MSG_RESULT([yes])
>-             ;;
>+-            krb5_version_ok=yes
>+-            AC_MSG_RESULT([yes])
>+-            ;;
>+-        *)
>+-            AC_MSG_RESULT([no])
>+-            AC_MSG_WARN([Cannot build authdata plugin with this version of
>++    KRB5_VERSION="`$KRB5_CONFIG --version |awk '{print $2}'`"
>++    KRB5_MINOR="`$KRB5_CONFIG --version |awk -F '.' '{print $2}'`"
>++    if test x$KRB5_VERSION == x5
>++    then
>++	case $KRB5_MINOR in
>++            9|1*)
>++	    	krb5_version_ok=yes
>++            	AC_MSG_RESULT([yes])
>++            	;;
>++            *)
>++                AC_MSG_RESULT([no])
>++                AC_MSG_WARN([Cannot build authdata plugin with this version of
>+                          MIT Kerberos, please use 1.9.x or later])
>+-    esac
>++   	 esac
>++    fi
>+ fi
>+ 
>+ AM_CONDITIONAL([BUILD_PAC_RESPONDER], [test x$build_pac_responder = xyes -a x$ndr_krb5pac_ok = xyes -a x$krb5_version_ok = xyes ])
>

Actions: View | Diff

Attachments on bug 204827: 163548 | 180843 | 191134 | 191971