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

adapt to new hdb interface

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3628 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-10-16 04:14:00 +00:00
parent 5d5e4f8c7a
commit ae31038985
18 changed files with 77 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kdc/config.c
View File

@@ -49,6 +49,7 @@ static char *max_request_str;
size_t max_request;
time_t kdc_warn_pwexpire;
char *database;
HDB *db;
char *port_str;
int enable_http = -1;

8
kdc/hprop.c
View File

@@ -333,8 +333,12 @@ int main(int argc, char **argv)
}else
#endif
{
ret = hdb_open(context, &db, database, O_RDONLY, 0);
if(ret) krb5_err(context, 1, ret, "hdb_open");
ret = hdb_create (context, &db, database);
if(ret)
krb5_err(context, 1, ret, "hdb_create: %s", database);
ret = db->open(context, db, O_RDONLY, 0);
if(ret)
krb5_err(context, 1, ret, "db->open");
}
if(to_stdout){

8
kdc/hpropd.c
View File

@@ -188,8 +188,12 @@ int main(int argc, char **argv)
}
asprintf(&tmp_db, "%s~", database);
ret = hdb_open(context, &db, tmp_db, O_RDWR | O_CREAT | O_TRUNC, 0600);
if(ret) krb5_err(context, 1, ret, "hdb_open");
ret = hdb_create(context, &db, tmp_db);
if(ret)
krb5_err(context, 1, ret, "hdb_open(%s)", tmp_db);
ret = db->open(context, db, O_RDWR | O_CREAT | O_TRUNC, 0600);
if(ret)
krb5_err(context, 1, ret, "hdb_open");
nprincs = 0;
while(1){

1
kdc/kdc_locl.h
View File

@@ -53,6 +53,7 @@ extern char *keyfile;
extern size_t max_request;
extern time_t kdc_warn_pwexpire;
extern char *database;
extern HDB *db;
extern char *port_str;
extern int enable_http;

19
kdc/main.c
View File

@@ -53,24 +53,19 @@ int
main(int argc, char **argv)
{
krb5_error_code ret;
EncryptionKey key;
set_progname(argv[0]);
krb5_init_context(&context);
configure(argc, argv);
ret = hdb_read_master_key(context, keyfile, &key);
if(ret && ret != ENOENT)
krb5_err(context, 1, ret, "Failed to open master key file");
if(ret == 0){
set_master_key(key);
memset(key.keyvalue.data, 0, key.keyvalue.length);
free_EncryptionKey(&key);
kdc_log(5, "Database is encrypted");
}else
kdc_log(5, "Database is not encrypted");
ret = hdb_create(context, &db, database);
if(ret)
krb5_err(context, 1, ret, "hdb_create %s", database);
ret = hdb_set_master_key(context, db, keyfile);
if (ret)
krb5_err(context, 1, ret, "hdb_set_master_key");
#ifdef HAVE_SIGACTION
{
struct sigaction sa;