s3:libads: remove krb5_set_real_time() from ads_krb5_set_password()

Callers typically only pass in 0 anyway.

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 8203c25d454621a6186620765bfbc7ddc6714c3d..94d6447252d37ddf79ab9fbd28df9e3f1efe7d03 100644 (file)
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -85,7 +85,7 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 /* The following definitions come from libads/krb5_setpw.c  */
 
 ADS_STATUS ads_krb5_set_password(const char *princ,
-                                const char *newpw, int time_offset);
+                                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,

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 12a62d6d216c0c9644a12338eef185ee15f92ede..f8cde9730d57f7492c3043efd870ae2b5c64abd2 100644 (file)
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -57,7 +57,7 @@ static krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code)
 }
 
 ADS_STATUS ads_krb5_set_password(const char *principal,
-                                const char *newpw, int time_offset)
+                                const char *newpw)
 {
 
        ADS_STATUS aret;
@@ -86,10 +86,6 @@ ADS_STATUS ads_krb5_set_password(const char *principal,
                }
        }
 
-       if (time_offset != 0) {
-               krb5_set_real_time(context, time(NULL) + time_offset, 0);
-       }
-
        ret = krb5_cc_default(context, &ccache);
        if (ret) {
                krb5_free_principal(context, princ);
@@ -322,7 +318,7 @@ ADS_STATUS kerberos_set_password(const char *kpasswd_server,
                                             time_offset);
        } else {
                return ads_krb5_set_password(target_principal,
-                                            new_password, time_offset);
+                                            new_password);
        }
 }
 

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 84ba1c20e811906124983dc06a6597f8c2a24ef9..4e3479c59da151503182f971c4aee1b837ff14d1 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1037,7 +1037,7 @@ static int ads_user_add(struct net_context *c, int argc, const char **argv)
                goto done;
        }
 
-       status = ads_krb5_set_password(upn, argv[1], 0);
+       status = ads_krb5_set_password(upn, argv[1]);
        if (ADS_ERR_OK(status)) {
                d_printf(_("User %s added\n"), argv[0]);
                rc = 0;