From: Jonathan Reams <jreams@columbia.edu>
Date: Fri, 15 Feb 2013 07:11:57 +0000 (-0500)
Subject: Convert success in krb5_chpw_result_code_string
X-Git-Tag: krb5-1.10.4-final~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6abd90b73b1f8abae9fcf42e89758348a40d1dc1;p=thirdparty%2Fkrb5.git

Convert success in krb5_chpw_result_code_string

Result code 0 used to be converted properly by krb5_set_password,
though not krb5_change_password; this changed in 1.10 when
krb5int_setpw_result_code_string was folded into
krb5_chpw_result_code_string.  Restore the old behavior, and make it
apply to krb5_change_password as well, by making
krb5_chpw_result_code_string convert result code 0.

[ghudson@mit.edu: commit message]

(cherry picked from commit 316bf74b4696058e2b60c95c9d0fc90d6c2c2ffe)

ticket: 7576 (new)
version_fixed: 1.10.4
status: resolved
---

diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index 7e43dcf1a1..2ea23054c3 100644
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -268,6 +268,9 @@ krb5_chpw_result_code_string(krb5_context context, int result_code,
     case KRB5_KPASSWD_INITIAL_FLAG_NEEDED:
         *code_string = _("Initial password required");
         break;
+    case 0:
+        *code_string = _("Success");
+        break;
     default:
         *code_string = _("Password change failed");
         break;