More on bug 137: rename remainder of krb5_xxx functions to not start with krb5_

(This used to be commit 4169de6d8fb1b13de3892ec787886cc1543736a1)

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index ece305f7e8f9e57d078b434a19fe246dacc77d6e..df749d04d36d554f646cb4f80737038b39770248 100644 (file)
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -195,9 +195,9 @@ static const struct kpasswd_errors {
        {0, NULL}
 };
 
-static krb5_error_code krb5_setpw_result_code_string(krb5_context context,
-                                                    int result_code,
-                                                    const char **code_string)
+static krb5_error_code setpw_result_code_string(krb5_context context,
+                                               int result_code,
+                                               const char **code_string)
 {
         unsigned int idx = 0;
 
@@ -311,7 +311,7 @@ static krb5_error_code parse_setpw_reply(krb5_context context,
                        return 0;
        else {
                const char *errstr;
-               krb5_setpw_result_code_string(context, res_code, &errstr);
+               setpw_result_code_string(context, res_code, &errstr);
                DEBUG(1, ("Error changing password: %s\n", errstr));
 
                switch(res_code) {
@@ -570,11 +570,11 @@ kerb_prompter(krb5_context ctx, void *data,
        return 0;
 }
 
-static ADS_STATUS krb5_chg_password(const char *kdc_host,
-                                   const char *principal,
-                                   const char *oldpw, 
-                                   const char *newpw, 
-                                   int time_offset)
+static ADS_STATUS ads_krb5_chg_password(const char *kdc_host,
+                                       const char *principal,
+                                       const char *oldpw, 
+                                       const char *newpw, 
+                                       int time_offset)
 {
     ADS_STATUS aret;
     krb5_error_code ret;
@@ -648,8 +648,8 @@ ADS_STATUS kerberos_set_password(const char *kpasswd_server,
     }
 
     if (!strcmp(auth_principal, target_principal))
-       return krb5_chg_password(kpasswd_server, target_principal,
-                                   auth_password, new_password, time_offset);
+       return ads_krb5_chg_password(kpasswd_server, target_principal,
+                                    auth_password, new_password, time_offset);
     else
        return ads_krb5_set_password(kpasswd_server, target_principal,
                                     new_password, time_offset);