Add `database' option.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3296 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
12
kdc/config.c
12
kdc/config.c
@@ -48,6 +48,7 @@ char *keyfile;
|
|||||||
char *max_request_str;
|
char *max_request_str;
|
||||||
size_t max_request;
|
size_t max_request;
|
||||||
time_t kdc_warn_pwexpire;
|
time_t kdc_warn_pwexpire;
|
||||||
|
char *database;
|
||||||
|
|
||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
char *v4_realm;
|
char *v4_realm;
|
||||||
@@ -72,6 +73,10 @@ static struct getargs args[] = {
|
|||||||
"max-request", 0, arg_string, &max_request,
|
"max-request", 0, arg_string, &max_request,
|
||||||
"max size for a kdc-request", "size"
|
"max size for a kdc-request", "size"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"database", 'd', arg_string, &database,
|
||||||
|
"location of database", "database"
|
||||||
|
},
|
||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
{
|
{
|
||||||
"v4-realm", 'r', arg_string, &v4_realm,
|
"v4-realm", 'r', arg_string, &v4_realm,
|
||||||
@@ -83,8 +88,6 @@ static struct getargs args[] = {
|
|||||||
|
|
||||||
static int num_args = sizeof(args) / sizeof(args[0]);
|
static int num_args = sizeof(args) / sizeof(args[0]);
|
||||||
|
|
||||||
extern const char *krb5_config_get_string(krb5_config_section*, ...);
|
|
||||||
|
|
||||||
struct units byte_units[] = {
|
struct units byte_units[] = {
|
||||||
{ "megabyte", 1024 * 1024 },
|
{ "megabyte", 1024 * 1024 },
|
||||||
{ "mbyte", 1024 * 1024 },
|
{ "mbyte", 1024 * 1024 },
|
||||||
@@ -125,6 +128,11 @@ configure(int argc, char **argv)
|
|||||||
keyfile = strdup(p);
|
keyfile = strdup(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(database == NULL){
|
||||||
|
p = krb5_config_get_string (cf, "kdc", "database", NULL);
|
||||||
|
if(p) database = strdup(p);
|
||||||
|
}
|
||||||
|
|
||||||
if(max_request_str){
|
if(max_request_str){
|
||||||
max_request = parse_units(max_request_str, byte_units, NULL);
|
max_request = parse_units(max_request_str, byte_units, NULL);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user