--- a/components/krb5/patches/032-pam-krb5.patch Fri Sep 23 11:19:39 2016 -0700
+++ b/components/krb5/patches/032-pam-krb5.patch Mon Sep 26 15:58:55 2016 -0700
@@ -13,7 +13,6 @@
# presented to MIT.
# Patch source: in-house
#
-diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -299,7 +299,7 @@ _kadm5_initialize_rpcsec_gss_handle(kadm5_server_handle_t handle,
@@ -151,7 +150,6 @@
server_out);
/* Improved error messages */
if (code == KRB5KRB_AP_ERR_BAD_INTEGRITY) code = KADM5_BAD_PASSWORD;
-diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -5,6 +5,17 @@
@@ -217,7 +215,7 @@
krb5_error_code ret;
int use_master;
krb5_kdc_rep *as_reply;
-@@ -503,8 +543,12 @@ cleanup:
+@@ -505,8 +545,12 @@ cleanup:
memset(pw0array, 0, sizeof(pw0array));
memset(pw1array, 0, sizeof(pw1array));
krb5_free_cred_contents(context, &chpw_creds);
@@ -232,7 +230,6 @@
k5_clear_error(&errsave);
return(ret);
-diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -644,6 +644,7 @@ do_iprop()