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

(_kdc_check_flags): make it take hdb_entry_ex to avoid ?:'s at callers

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16947 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-02 01:52:32 +00:00
parent 3dfde09cb0
commit b3f8381a4d
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kdc/kerberos5.c
View File

@@ -686,11 +686,13 @@ get_pa_etype_info2(krb5_context context,
krb5_error_code krb5_error_code
_kdc_check_flags(krb5_context context, _kdc_check_flags(krb5_context context,
krb5_kdc_configuration *config, krb5_kdc_configuration *config,
hdb_entry *client, const char *client_name, hdb_entry_ex *client_ex, const char *client_name,
hdb_entry *server, const char *server_name, hdb_entry_ex *server_ex, const char *server_name,
krb5_boolean is_as_req) krb5_boolean is_as_req)
{ {
if(client != NULL) { if(client_ex != NULL) {
hdb_entry *client = &client_ex->entry;
/* check client */ /* check client */
if (client->flags.invalid) { if (client->flags.invalid) {
kdc_log(context, config, 0, kdc_log(context, config, 0,
@@ -725,7 +727,7 @@ _kdc_check_flags(krb5_context context,
} }
if (client->pw_end && *client->pw_end < kdc_time if (client->pw_end && *client->pw_end < kdc_time
&& !server->flags.change_pw) { && (server_ex == NULL || !server_ex->entry.flags.change_pw)) {
char pwend_str[100]; char pwend_str[100];
krb5_format_time(context, *client->pw_end, krb5_format_time(context, *client->pw_end,
pwend_str, sizeof(pwend_str), TRUE); pwend_str, sizeof(pwend_str), TRUE);
@@ -738,7 +740,9 @@ _kdc_check_flags(krb5_context context,
/* check server */ /* check server */
if (server != NULL) { if (server_ex != NULL) {
hdb_entry *server = &server_ex->entry;
if (server->flags.invalid) { if (server->flags.invalid) {
kdc_log(context, config, 0, kdc_log(context, config, 0,
"Server has invalid flag set -- %s", server_name); "Server has invalid flag set -- %s", server_name);
@@ -804,6 +808,7 @@ check_addresses(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
krb5_address addr; krb5_address addr;
krb5_boolean result; krb5_boolean result;
int i;
if(config->check_ticket_addresses == 0) if(config->check_ticket_addresses == 0)
return TRUE; return TRUE;
@@ -895,8 +900,8 @@ _kdc_as_rep(krb5_context context,
} }
ret = _kdc_check_flags(context, config, ret = _kdc_check_flags(context, config,
&client->entry, client_name, client, client_name,
&server->entry, server_name, server, server_name,
TRUE); TRUE);
if(ret) if(ret)
goto out; goto out;
@@ -2396,8 +2401,8 @@ tgs_rep2(krb5_context context,
} }
ret = _kdc_check_flags(context, config, ret = _kdc_check_flags(context, config,
&client->entry, cpn, client, cpn,
&server->entry, spn, server, spn,
FALSE); FALSE);
if(ret) if(ret)
goto out; goto out;