From 255e76978571e73316161244d8b724f52cdf4aa2 Mon Sep 17 00:00:00 2001
From: "Robbie Harwood (frozencemetery)" <rharwood@redhat.com>
Date: Thu, 22 Oct 2015 18:30:25 +0000
Subject: [PATCH] Ensure pwsize is initialized in chpass_util.c

---
 krb5-1.14-pwsize_initialize.patch | 24 ++++++++++++++++++++++++
 krb5.spec                         |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 krb5-1.14-pwsize_initialize.patch

diff --git a/krb5-1.14-pwsize_initialize.patch b/krb5-1.14-pwsize_initialize.patch
new file mode 100644
index 0000000..36ead7f
--- /dev/null
+++ b/krb5-1.14-pwsize_initialize.patch
@@ -0,0 +1,24 @@
+From eb7aa0386f60496aabcb1f30893649bb6599d6d1 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 22 Oct 2015 14:27:33 -0400
+Subject: [PATCH] Ensure pwsize is initialized
+
+---
+ src/lib/kadm5/chpass_util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/kadm5/chpass_util.c b/src/lib/kadm5/chpass_util.c
+index 408b0eb..02305be 100644
+--- a/src/lib/kadm5/chpass_util.c
++++ b/src/lib/kadm5/chpass_util.c
+@@ -74,6 +74,7 @@ kadm5_ret_t _kadm5_chpass_principal_util(void *server_handle,
+     if (ret_pw)
+         *ret_pw = NULL;
+ 
++    pwsize = 0;
+     if (new_pw != NULL) {
+         new_password = new_pw;
+     } else { /* read the password */
+-- 
+2.6.1
+
diff --git a/krb5.spec b/krb5.spec
index 8f1a3e2..01ba53e 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -43,7 +43,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 # - Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
 # - The sources below are stored in a lookaside cache. Upload with
@@ -89,6 +89,7 @@ Patch134: krb5-1.11-kpasswdtest.patch
 Patch143: krb5-tests_use_libs_from_build.patch
 Patch146: krb5-1.14-no_system_krb5_conf.patch
 Patch148: krb5-disable_ofd_locks.patch
+Patch149: krb5-1.14-pwsize_initialize.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -274,6 +275,7 @@ ln NOTICE LICENSE
 %patch143 -p1 -b .krb5-tests_use_libs_from_build
 %patch146 -p1 -b .no_system_krb5_conf
 %patch148 -p1 -b .disable_ofd_locks
+%patch149 -p1 -b .pwsize_initialize
 
 # Take the execute bit off of documentation.
 chmod -x doc/krb5-protocol/*.txt doc/ccapi/*.html
@@ -889,6 +891,9 @@ exit 0
 
 
 %changelog
+* Thu Oct 22 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-beta1-5
+- Ensure pwsize is initialized in chpass_util.c
+
 * Thu Oct 22 2015 Robbie Harwood <rharwood@redhat.com> - 1.14-beta1-4
 - Fix typo of crypto-policies file in previous version