s3:libads: remove unused kdc_host and time_offset arguments to kerberos_set_password()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h
index 94d6447252d37ddf79ab9fbd28df9e3f1efe7d03..b86feda3b7a673c04ed1b2ee3d50488bcf0f72bf 100644 (file)
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -86,10 +86,10 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 
 ADS_STATUS ads_krb5_set_password(const char *princ,
                                 const char *newpw);
-ADS_STATUS kerberos_set_password(const char *kpasswd_server,
-                                const char *auth_principal, const char *auth_password,
-                                const char *target_principal, const char *new_password,
-                                int time_offset);
+ADS_STATUS kerberos_set_password(const char *auth_principal,
+                                const char *auth_password,
+                                const char *target_principal,
+                                const char *new_password);
 
 #ifdef HAVE_KRB5
 int create_kerberos_key_from_string(krb5_context context,

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 1d67290bfa40da09961faeb9a2b64993d9e903a0..62072357693dae9b356811296f3af80391af8066 100644 (file)
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -297,12 +297,12 @@ static ADS_STATUS ads_krb5_chg_password(const char *principal,
        return aret;
 }
 
-ADS_STATUS kerberos_set_password(const char *kpasswd_server,
-                                const char *auth_principal,
+ADS_STATUS kerberos_set_password(const char *auth_principal,
                                 const char *auth_password,
                                 const char *target_principal,
-                                const char *new_password, int time_offset)
+                                const char *new_password)
 {
+       const int time_offset = 0;
        int ret;
 
        if ((ret = kerberos_kinit_password(auth_principal, auth_password, time_offset, NULL))) {

diff --git a/source3/libads/util.c b/source3/libads/util.c
index 4bb97f817998e523bfdca2314a5705d58677a667..0938db5ea641bf48f278996a9a93453287b17a4b 100644 (file)
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -110,7 +110,10 @@ ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_princip
        talloc_keep_secret(new_pw_blob.data);
        new_password = (const char *)new_pw_blob.data;
 
-       ret = kerberos_set_password(ads->auth.kdc_server, host_principal, password, host_principal, new_password, 0);
+       ret = kerberos_set_password(host_principal,
+                                   password,
+                                   host_principal,
+                                   new_password);
 
        if (!ADS_ERR_OK(ret)) {
                status = ads_ntstatus(ret);

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 4e3479c59da151503182f971c4aee1b837ff14d1..1144a31de7aab41c70c824641358e55572122949 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -2697,12 +2697,10 @@ static int net_ads_password(struct net_context *c, int argc, const char **argv)
                goto out;
        }
 
-       status = kerberos_set_password(ads->auth.kdc_server,
-                                      auth_principal,
+       status = kerberos_set_password(auth_principal,
                                       auth_password,
                                       user,
-                                      new_password,
-                                      0);
+                                      new_password);
        memset(new_password, '\0', strlen(new_password));
        if (!ADS_ERR_OK(status)) {
                d_fprintf(stderr, _("Password change failed: %s\n"),