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

(do_version4): check client and server max_life

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14714 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2005-04-01 15:53:18 +00:00
parent 441228af89
commit ffa0f87aa6
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kdc/kerberos4.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2004 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2005 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -383,9 +383,12 @@ do_version4(unsigned char *buf,
goto out2; goto out2;
} }
#if 0 snprintf (client_name, sizeof(client_name),
"%s.%s@%s",
ad.pname, ad.pinst, ad.prealm);
ret = db_fetch4(ad.pname, ad.pinst, ad.prealm, &client); ret = db_fetch4(ad.pname, ad.pinst, ad.prealm, &client);
if(ret){ if(ret != HDB_ERR_NOENTRY ||
(ret == HDB_ERR_NOENTRY && strcmp(ad.prealm, v4_realm) == 0)) {
char *s; char *s;
s = kdc_log_msg(0, "Client not found in database: (krb4) " s = kdc_log_msg(0, "Client not found in database: (krb4) "
"%s.%s@%s: %s", "%s.%s@%s: %s",
@@ -395,7 +398,6 @@ do_version4(unsigned char *buf,
free(s); free(s);
goto out2; goto out2;
} }
#endif
ret = db_fetch4(sname, sinst, v4_realm, &server); ret = db_fetch4(sname, sinst, v4_realm, &server);
if(ret){ if(ret){
@@ -407,7 +409,7 @@ do_version4(unsigned char *buf,
goto out2; goto out2;
} }
ret = check_flags (NULL, NULL, ret = check_flags (client, client_name,
server, server_name, server, server_name,
FALSE); FALSE);
if (ret) { if (ret) {
@@ -427,6 +429,10 @@ do_version4(unsigned char *buf,
max_end = krb_life_to_time(ad.time_sec, ad.life); max_end = krb_life_to_time(ad.time_sec, ad.life);
max_end = min(max_end, krb_life_to_time(kdc_time, life)); max_end = min(max_end, krb_life_to_time(kdc_time, life));
if(server->max_life)
max_end = min(max_end, kdc_time + server->max_life);
if(client && client->max_life)
max_end = min(max_end, kdc_time + client->max_life);
life = min(life, krb_time_to_life(kdc_time, max_end)); life = min(life, krb_time_to_life(kdc_time, max_end));
issue_time = kdc_time; issue_time = kdc_time;