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

make digest, kx509 and krb4

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24484 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-25 20:50:15 +00:00
parent ea4bb739c5
commit 89edf1be0e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kdc/default_config.c
View File

@@ -84,6 +84,7 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
krb5_config_get_bool_default(context, NULL, krb5_config_get_bool_default(context, NULL,
c->enable_v4, c->enable_v4,
"kdc", "enable-524", NULL); "kdc", "enable-524", NULL);
#ifdef DIGEST
c->enable_digest = c->enable_digest =
krb5_config_get_bool_default(context, NULL, krb5_config_get_bool_default(context, NULL,
FALSE, FALSE,
@@ -110,7 +111,9 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
c->enable_digest = 0; c->enable_digest = 0;
} }
} }
#endif
#ifdef KX509
c->enable_kx509 = c->enable_kx509 =
krb5_config_get_bool_default(context, NULL, krb5_config_get_bool_default(context, NULL,
FALSE, FALSE,
@@ -129,6 +132,7 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
c->enable_kx509 = FALSE; c->enable_kx509 = FALSE;
} }
} }
#endif
c->check_ticket_addresses = c->check_ticket_addresses =
krb5_config_get_bool_default(context, NULL, krb5_config_get_bool_default(context, NULL,

13
kdc/process.c
View File

@@ -66,7 +66,9 @@ krb5_kdc_process_request(krb5_context context,
int datagram_reply) int datagram_reply)
{ {
KDC_REQ req; KDC_REQ req;
#ifdef KRB4
Ticket ticket; Ticket ticket;
#endif
#ifdef DIGEST #ifdef DIGEST
DigestREQ digestreq; DigestREQ digestreq;
#endif #endif
@@ -90,10 +92,6 @@ krb5_kdc_process_request(krb5_context context,
ret = _kdc_tgs_rep(context, config, &req, reply, from, addr, datagram_reply); ret = _kdc_tgs_rep(context, config, &req, reply, from, addr, datagram_reply);
free_TGS_REQ(&req); free_TGS_REQ(&req);
return ret; return ret;
}else if(decode_Ticket(buf, len, &ticket, &i) == 0){
ret = _kdc_do_524(context, config, &ticket, reply, from, addr);
free_Ticket(&ticket);
return ret;
#ifdef DIGEST #ifdef DIGEST
}else if(decode_DigestREQ(buf, len, &digestreq, &i) == 0){ }else if(decode_DigestREQ(buf, len, &digestreq, &i) == 0){
ret = _kdc_do_digest(context, config, &digestreq, reply, from, addr); ret = _kdc_do_digest(context, config, &digestreq, reply, from, addr);
@@ -106,15 +104,22 @@ krb5_kdc_process_request(krb5_context context,
free_Kx509Request(&kx509req); free_Kx509Request(&kx509req);
return ret; return ret;
#endif #endif
#ifdef KRB4
}else if(decode_Ticket(buf, len, &ticket, &i) == 0){
ret = _kdc_do_524(context, config, &ticket, reply, from, addr);
free_Ticket(&ticket);
return ret;
} else if(_kdc_maybe_version4(buf, len)){ } else if(_kdc_maybe_version4(buf, len)){
*prependlength = FALSE; /* elbitapmoc sdrawkcab XXX */ *prependlength = FALSE; /* elbitapmoc sdrawkcab XXX */
ret = _kdc_do_version4(context, config, buf, len, reply, from, ret = _kdc_do_version4(context, config, buf, len, reply, from,
(struct sockaddr_in*)addr); (struct sockaddr_in*)addr);
return ret; return ret;
} else if (config->enable_kaserver) { } else if (config->enable_kaserver) {
ret = _kdc_do_kaserver(context, config, buf, len, reply, from, ret = _kdc_do_kaserver(context, config, buf, len, reply, from,
(struct sockaddr_in*)addr); (struct sockaddr_in*)addr);
return ret; return ret;
#endif
} }
return -1; return -1;