X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=submit%2Fsubmitd.c;h=f373618444ea5ff8855d05ed5009d55be58c8564;hb=4d52eeffe7f6bcf2bcd16f073aed7aca1ae968a5;hp=4c1415b48d08d44aa31bdebbee9116a26d3c9d97;hpb=a56d61d402c68c3746f5e84be6dbfb949d897db1;p=eval.git diff --git a/submit/submitd.c b/submit/submitd.c index 4c1415b..f373618 100644 --- a/submit/submitd.c +++ b/submit/submitd.c @@ -30,9 +30,11 @@ static uns port = 8888; static uns dh_bits = 1024; static uns max_conn = 10; static uns session_timeout; +uns max_versions; static byte *ca_cert_name = "?"; static byte *server_cert_name = "?"; static byte *server_key_name = "?"; +byte *history_format; static clist access_rules; static uns trace_tls; uns max_request_size; @@ -67,9 +69,11 @@ static struct cf_section submitd_conf = { CF_UNS("SessionTimeout", &session_timeout), CF_UNS("MaxRequestSize", &max_request_size), CF_UNS("MaxAttachSize", &max_attachment_size), + CF_UNS("MaxVersions", &max_versions), CF_STRING("CACert", &ca_cert_name), CF_STRING("ServerCert", &server_cert_name), CF_STRING("ServerKey", &server_key_name), + CF_STRING("History", &history_format), CF_LIST("Access", &access_rules, &access_conf), CF_UNS("TraceTLS", &trace_tls), CF_UNS("TraceCommands", &trace_commands), @@ -165,7 +169,7 @@ tls_new_session(int sk) int err; err = gnutls_init(&s, GNUTLS_SERVER); TLS_CHECK(gnutls_init); - err = gnutls_set_default_priority(s); TLS_CHECK(gnutls_set_default_priority); // FIXME + err = gnutls_set_default_priority(s); TLS_CHECK(gnutls_set_default_priority); gnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, cert_cred); gnutls_certificate_server_set_request(s, GNUTLS_CERT_REQUEST); gnutls_dh_set_prime_bits(s, dh_bits);