krb5_setpw_result_string should be internal

Make krb5_setpw_result_string a krb5int_ function prototyped in
k5-int.h.  The prototype was already there, but the code did not match
the function name.
This needs to be pulled up to the release branch to fix Windows build because of a KRB5_CALLCONV issue.

ticket: new
Tags: pullup
Target_Version: 1.3

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15375 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index a560a9640b1ea5c898cd3a43d6393998f16ebdbb..6d60e232adaa1e6c95411bed286d9916b7906586 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-27  Sam Hartman  <hartmans@mit.edu>
+
+       * chpw.c (krb5int_setpw_result_code_string): Make internal 
+
 2003-04-25  Sam Hartman  <hartmans@mit.edu>
 
        * chpw.c (krb5int_rd_setpw_rep): Fix error handling; allow

diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index 9c5a4078af2f864872af1f724fe7a895ad9bf6f4..248c4c88c3a287a84a547dd5e0cb1e7f9ee1708b 100644 (file)
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -462,8 +462,8 @@ krb5int_rd_setpw_rep( krb5_context context, krb5_auth_context auth_context, krb5
     return(ret);
 }
 
-krb5_error_code KRB5_CALLCONV
-krb5_setpw_result_code_string( krb5_context context, int result_code, const char **code_string )
+krb5_error_code 
+krb5int_setpw_result_code_string( krb5_context context, int result_code, const char **code_string )
 {
    switch (result_code)
    {

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 112629b1cf99f224979871c341d0f45527ba3c34..2647d22f286bafae3e57b2949827548eebfd9a3c 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-27  Sam Hartman  <hartmans@mit.edu>
+
+       * changepw.c (krb5_change_set_password): Call
+       krb5_setpw_result_code_string not krb5_setpw_result_code_string  
+
 2003-04-24  Sam Hartman  <hartmans@mit.edu>
 
        * changepw.c (krb5_change_set_password): return error from

diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c
index a4f5422f39f3ca10f225677ef307eb8016b2c6b0..0414848214bc74117f270a06f4ff285257a64f0d 100644 (file)
--- a/src/lib/krb5/os/changepw.c
+++ b/src/lib/krb5/os/changepw.c
@@ -314,7 +314,7 @@ krb5_change_set_password(
 
        if (result_code_string) {
                if( set_password_for )
-               code = krb5_setpw_result_code_string(context, local_result_code, (const char **)&code_string);
+               code = krb5int_setpw_result_code_string(context, local_result_code, (const char **)&code_string);
                else
                code = krb5_chpw_result_code_string(context, local_result_code, &code_string);
                if(code)