Don't suppress the error code from an error message when the error message
contains e-data.  RT#6893
--- src/lib/krb5/krb/chpw.c
+++ src/lib/krb5/krb/chpw.c
@@ -111,18 +111,13 @@
 		if (krb5_is_krb_error(packet)) {
 
 			if ((ret = krb5_rd_error(context, packet, &krberror)))
-			return(ret);
+				return(ret);
 
-			if (krberror->e_data.data  == NULL) {
-				ret = ERROR_TABLE_BASE_krb5 + (krb5_error_code) krberror->error;
-				krb5_free_error(context, krberror);
-				return (ret);
-			}
-		}
-		else
-		{
-			return(KRB5KRB_AP_ERR_MODIFIED);
+			ret = ERROR_TABLE_BASE_krb5 + (krb5_error_code) krberror->error;
+			krb5_free_error(context, krberror);
+			return (ret);
 		}
+		return(KRB5KRB_AP_ERR_MODIFIED);
 	}