diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-09-06 00:19:38 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-09-06 00:19:38 -0400 |
| commit | 207fa55d00e87d787cc39acb69c582067f37aece (patch) | |
| tree | 291cbaca46f09e71c188f6c4784a834aa4d75b51 | |
| parent | a26dd7c42cfc1ae0b8ffd11eebe36ede12915a80 (diff) | |
| download | krb5-207fa55d00e87d787cc39acb69c582067f37aece.tar.gz krb5-207fa55d00e87d787cc39acb69c582067f37aece.tar.xz krb5-207fa55d00e87d787cc39acb69c582067f37aece.zip | |
- pull in upstream patch for RT#6952, confusion following referrals for cross-realm auth (#734341)krb5-1.9.1-12.fc17krb5-1.9.1-12.fc16
| -rw-r--r-- | krb5-1.9-crossrealm.patch | 14 | ||||
| -rw-r--r-- | krb5.spec | 15 |
2 files changed, 27 insertions, 2 deletions
diff --git a/krb5-1.9-crossrealm.patch b/krb5-1.9-crossrealm.patch new file mode 100644 index 0000000..dae6366 --- /dev/null +++ b/krb5-1.9-crossrealm.patch @@ -0,0 +1,14 @@ +RT#6952 +Index: krb5/src/lib/krb5/krb/get_creds.c +=================================================================== +--- krb5/src/lib/krb5/krb/get_creds.c (revision 25120) ++++ krb5/src/lib/krb5/krb/get_creds.c (revision 25121) +@@ -289,7 +289,7 @@ + /* Construct the principal krbtgt/<realm>@<cur-tgt-realm>. */ + krb5_free_principal(context, ctx->tgt_princ); + ctx->tgt_princ = NULL; +- code = krb5int_tgtname(context, realm, &ctx->cur_tgt->server->realm, ++ code = krb5int_tgtname(context, realm, &ctx->cur_tgt->server->data[1], + &ctx->tgt_princ); + if (code != 0) + return code; @@ -6,7 +6,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.9.1 -Release: 11%{?dist} +Release: 12%{?dist} # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar Source0: krb5-%{version}.tar.gz @@ -61,6 +61,7 @@ Patch84: krb5-1.9.1-sendto_poll.patch Patch85: krb5-trunk-gss_delete_sec.patch Patch86: krb5-1.9-debuginfo.patch Patch87: krb5-1.9.1-sendto_poll2.patch +Patch88: krb5-1.9-crossrealm.patch License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -75,6 +76,8 @@ BuildRequires: texlive-latex BuildRequires: keyutils-libs-devel BuildRequires: libselinux-devel BuildRequires: pam-devel +# For the test framework. +BuildRequires: perl, dejagnu, tcl-devel %if %{WITH_LDAP} BuildRequires: openldap-devel @@ -213,6 +216,7 @@ ln -s NOTICE LICENSE %patch85 -p1 -b .gss_delete_sec %patch86 -p0 -b .debuginfo %patch87 -p1 -b .sendto_poll2 +%patch88 -p1 -b .crossrealm gzip doc/*.ps sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex @@ -263,6 +267,8 @@ autoconf popd %build +# Go ahead and supply tcl info, because configure doesn't know how to find it. +. %{_libdir}/tclConfig.sh pushd src # Work out the CFLAGS and CPPFLAGS which we intend to use. INCLUDES=-I%{_includedir}/et @@ -283,7 +289,7 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`" --with-system-et \ --with-system-ss \ --with-netlib=-lresolv \ - --without-tcl \ + --with-tcl \ --enable-dns-for-realm \ %if %{WITH_LDAP} %if %{WITH_DIRSRV} @@ -672,6 +678,11 @@ exit 0 %{_sbindir}/uuserver %changelog +* Tue Sep 6 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-12 +- pull in upstream patch for RT#6952, confusion following referrals for + cross-realm auth (#734341) +- pull in build-time deps for the tests + * Thu Sep 1 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-11 - switch to the upstream patch for #727829 |