diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-01-22 23:19:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:21 -0500 |
| commit | e239a46dbc97c34c428a6ef42ee6bf91525eac82 (patch) | |
| tree | 90352a3cc1ce46352302933b44d546fefd45b6ff /source4/kdc/hdb-ldb.c | |
| parent | d8d745a09eceb91f72ddc2277b224f4cc9ab7915 (diff) | |
| download | samba-e239a46dbc97c34c428a6ef42ee6bf91525eac82.tar.gz samba-e239a46dbc97c34c428a6ef42ee6bf91525eac82.tar.bz2 samba-e239a46dbc97c34c428a6ef42ee6bf91525eac82.zip | |
r13069: adding a hack on instructions from andrew
(This used to be commit 65cf522b5e079de2cfd5fc989350cc127f6c5baa)
Diffstat (limited to 'source4/kdc/hdb-ldb.c')
| -rw-r--r-- | source4/kdc/hdb-ldb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index 7cb02b8224..43009c1c1b 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -355,7 +355,8 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db, *entry_ex->entry.valid_end = nt_time_to_unix(acct_expiry); } - if (!(userAccountControl & UF_DONT_EXPIRE_PASSWD)) { + if (!(userAccountControl & UF_DONT_EXPIRE_PASSWD) && + (ent_type != HDB_LDB_ENT_TYPE_KRBTGT)) { NTTIME must_change_time = samdb_result_force_password_change((struct ldb_context *)db->hdb_db, mem_ctx, domain_dn, msg, |