oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

kadm5: allow setting password_lifetime to 0 to clear

Browse Source 
when [kadmin] password_lifetime is set to 0, it should clear the time
rather than making the freshly-changed password expire immediately
This commit is contained in:
Daria Phoebe Brashear
2023-11-13 14:42:33 -05:00
committed by Jeffrey Altman
parent 12ed86de90
commit 3c62b6f5d7
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/kadm5/bump_pw_expire.c
View File

@@ -53,7 +53,12 @@ _kadm5_bump_pw_expire(kadm5_server_context *context,
"password_lifetime", "password_lifetime",
NULL); NULL);
*(ent->pw_end) = time(NULL) + life; if (life != 0)
*(ent->pw_end) = time(NULL) + life;
else {
free(ent->pw_end);
ent->pw_end = NULL;
}
} }
return 0; return 0;
} }

3
lib/krb5/krb5.conf.5
View File

@@ -1301,7 +1301,8 @@ Certification authority related parameters are as for
.Bl -tag -width "xxx" -offset indent .Bl -tag -width "xxx" -offset indent
.It Li password_lifetime = Va time .It Li password_lifetime = Va time
If a principal already have its password set for expiration, this is If a principal already have its password set for expiration, this is
the time it will be valid for after a change. the time it will be valid for after a change. A value of 0 will clear
the password expiration after a successful password change.
.It Li default_keys = Va keytypes... .It Li default_keys = Va keytypes...
For each entry in For each entry in
.Va default_keys .Va default_keys

1
lib/roken/parse_time-test.c
View File

@@ -51,6 +51,7 @@ static struct testcase {
{ 15, 3601, "1 hour 1 second" }, { 15, 3601, "1 hour 1 second" },
{ 16, 3602, "1 hour 2 seconds" }, { 16, 3602, "1 hour 2 seconds" },
{ 9, 300, "5 minutes" }, { 9, 300, "5 minutes" },
{ 1, 0, "0" },
}; };
int int