View | Details | Raw Unified | Return to bug 204827 | Differences between
and this patch

Collapse All | Expand All

(-)security/sssd/files/patch-src_external_pac__responder.m4 (-15 / +33 lines)
Lines 1-22 Link Here
1
--- src/external/pac_responder.m4.orig	2014-09-17 13:01:37 UTC
1
--- src/external/pac_responder.m4.orig	2014-09-17 15:01:37.000000000 +0200
2
+++ src/external/pac_responder.m4
2
+++ src/external/pac_responder.m4	2018-03-02 12:42:15.841772000 +0100
3
@@ -14,14 +14,17 @@ then
3
@@ -14,22 +14,23 @@
4
     PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,
4
     PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,
5
         AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))
5
         AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))
6
 
6
 
7
-    AC_PATH_PROG(KRB5_CONFIG, krb5-config)
7
-    AC_PATH_PROG(KRB5_CONFIG, krb5-config)
8
+    AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH])
8
+    AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH])
9
     AC_MSG_CHECKING(for supported MIT krb5 version)
9
     AC_MSG_CHECKING(for supported MIT krb5 version)
10
     KRB5_VERSION="`$KRB5_CONFIG --version`"
10
-    KRB5_VERSION="`$KRB5_CONFIG --version`"
11
     case $KRB5_VERSION in
11
-    case $KRB5_VERSION in
12
         Kerberos\ 5\ release\ 1.9* | \
12
-        Kerberos\ 5\ release\ 1.9* | \
13
         Kerberos\ 5\ release\ 1.10* | \
13
-        Kerberos\ 5\ release\ 1.10* | \
14
         Kerberos\ 5\ release\ 1.11* | \
14
-        Kerberos\ 5\ release\ 1.11* | \
15
-        Kerberos\ 5\ release\ 1.12*)
15
-        Kerberos\ 5\ release\ 1.12*)
16
+        Kerberos\ 5\ release\ 1.12* | \
16
-            krb5_version_ok=yes
17
+        Kerberos\ 5\ release\ 1.13* | \
17
-            AC_MSG_RESULT([yes])
18
+        Kerberos\ 5\ release\ 1.14* | \
18
-            ;;
19
+        Kerberos\ 5\ release\ 1.15*)
19
-        *)
20
             krb5_version_ok=yes
20
-            AC_MSG_RESULT([no])
21
             AC_MSG_RESULT([yes])
21
-            AC_MSG_WARN([Cannot build authdata plugin with this version of
22
             ;;
22
+    KRB5_VERSION="`$KRB5_CONFIG --version |awk '{print $2}'`"
23
+    KRB5_MINOR="`$KRB5_CONFIG --version |awk -F '.' '{print $2}'`"
24
+    if test x$KRB5_VERSION == x5
25
+    then
26
+	case $KRB5_MINOR in
27
+            9|1*)
28
+	    	krb5_version_ok=yes
29
+            	AC_MSG_RESULT([yes])
30
+            	;;
31
+            *)
32
+                AC_MSG_RESULT([no])
33
+                AC_MSG_WARN([Cannot build authdata plugin with this version of
34
                          MIT Kerberos, please use 1.9.x or later])
35
-    esac
36
+   	 esac
37
+    fi
38
 fi
39
 
40
 AM_CONDITIONAL([BUILD_PAC_RESPONDER], [test x$build_pac_responder = xyes -a x$ndr_krb5pac_ok = xyes -a x$krb5_version_ok = xyes ])

Return to bug 204827