diff options
| author | Jim McDonough <jmcd@samba.org> | 2003-05-30 19:51:09 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2003-05-30 19:51:09 +0000 |
| commit | 0463fc2d77293f496a4bff8525b8671f7d5b060a (patch) | |
| tree | 49288103b5deff44e7aed1e44e8306ee2bf2f58a | |
| parent | ff0a111d37e6da352f6a00a45aee3231c737af64 (diff) | |
| download | samba-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)
| -rw-r--r-- | source3/libads/krb5_setpw.c | 11 | ||||
| -rw-r--r-- | source3/utils/net_ads.c | 3 |
2 files changed, 8 insertions, 6 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); diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 626db96994..5051f18188 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -300,7 +300,8 @@ static int ads_user_add(int argc, const char **argv) /* try setting the password */ asprintf(&upn, "%s@%s", argv[0], ads->config.realm); - status = krb5_set_password(ads->auth.kdc_server, upn, argv[1], ads->auth.time_offset); + status = ads_krb5_set_password(ads->auth.kdc_server, upn, argv[1], + ads->auth.time_offset); safe_free(upn); if (ADS_ERR_OK(status)) { d_printf("User %s added\n", argv[0]); |