summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-05-30 19:51:09 +0000
committerJim McDonough <jmcd@samba.org>2003-05-30 19:51:09 +0000
commit0463fc2d77293f496a4bff8525b8671f7d5b060a (patch)
tree49288103b5deff44e7aed1e44e8306ee2bf2f58a /source3/libads
parentff0a111d37e6da352f6a00a45aee3231c737af64 (diff)
downloadsamba-0463fc2d77293f496a4bff8525b8671f7d5b060a.tar.gz
samba-0463fc2d77293f496a4bff8525b8671f7d5b060a.tar.bz2
samba-0463fc2d77293f496a4bff8525b8671f7d5b060a.zip
Fix bug #137: krb5_set_password is already defined in MIT 1.3 libs, so
we wouldn't build. (This used to be commit 0e9836c4e9e71494b10d71a5f3d5f7da2888c5ef)
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/krb5_setpw.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 856809decc..ece305f7e8 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -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;
@@ -651,8 +651,8 @@ ADS_STATUS kerberos_set_password(const char *kpasswd_server,
return 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);
}
@@ -679,7 +679,8 @@ ADS_STATUS ads_set_machine_password(ADS_STRUCT *ads,
*/
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);