trying to get HEAD building again. If you want the code

[tprouty/samba.git] / source / libads / krb5_setpw.c

diff --git a/source/libads/krb5_setpw.c b/source/libads/krb5_setpw.c
index 214871b3fb5f58293a550c464fb08cf65e96263d..80ef6cdf01c55d623d8783e9a7044aa045c25493 100644 (file)
--- a/source/libads/krb5_setpw.c
+++ b/source/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) {
@@ -457,8 +457,8 @@ static ADS_STATUS do_krb5_kpasswd_request(krb5_context context,
        return ADS_SUCCESS;
 }
 
-ADS_STATUS krb5_set_password(const char *kdc_host, const char *princ, const char *newpw, 
-                            int time_offset)
+ADS_STATUS ads_krb5_set_password(const char *kdc_host, const char *princ, 
+                                const char *newpw, int time_offset)
 {
 
        ADS_STATUS aret;
@@ -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,11 +648,11 @@ 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 krb5_set_password(kpasswd_server, target_principal,
-                                new_password, time_offset);
+       return ads_krb5_set_password(kpasswd_server, target_principal,
+                                    new_password, time_offset);
 }
 
 
@@ -671,15 +671,16 @@ ADS_STATUS ads_set_machine_password(ADS_STRUCT *ads,
        char *host = strdup(hostname);
        char *principal; 
 
-       strlower(host);
+       strlower_m(host);
 
        /*
          we need to use the '$' form of the name here, as otherwise the
          server might end up setting the password for a user instead
         */
-       asprintf(&principal, "%s$@%s", host, ads->auth.realm);
+       asprintf(&principal, "%s$@%s", host, ads->config.realm);
        
-       status = krb5_set_password(ads->auth.kdc_server, principal, password, ads->auth.time_offset);
+       status = ads_krb5_set_password(ads->auth.kdc_server, principal, 
+                                      password, ads->auth.time_offset);
        
        free(host);
        free(principal);