summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-05-30 20:03:18 +0000
committerJim McDonough <jmcd@samba.org>2003-05-30 20:03:18 +0000
commit1f3b2790766361c8405632a5dfbfa2934ac33436 (patch)
treee19340d4360725cb11318ac8056bf5fad5d883bb /source3
parent0463fc2d77293f496a4bff8525b8671f7d5b060a (diff)
downloadsamba-1f3b2790766361c8405632a5dfbfa2934ac33436.tar.gz
samba-1f3b2790766361c8405632a5dfbfa2934ac33436.tar.bz2
samba-1f3b2790766361c8405632a5dfbfa2934ac33436.zip
More on bug 137: rename remainder of krb5_xxx functions to not start with krb5_
(This used to be commit 4169de6d8fb1b13de3892ec787886cc1543736a1)
Diffstat (limited to 'source3')
-rw-r--r--source3/libads/krb5_setpw.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index ece305f7e8..df749d04d3 100644
--- 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);