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

4
admin/ank.c
View File

@@ -43,13 +43,13 @@ RCSID("$Id$");
static void static void
doit(const char *principal) doit(const char *principal)
{ {
HDB *db;
hdb_entry ent; hdb_entry ent;
krb5_error_code ret; krb5_error_code ret;
krb5_principal ent_principal; krb5_principal ent_principal;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
if((ret = hdb_open(context, &db, database, O_RDWR, 0600))) { ret = db->open(context, db, O_RDWR, 0600);
if (ret) {
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return; return;
} }

4
admin/delete.c
View File

@@ -43,7 +43,6 @@ RCSID("$Id$");
int int
del_entry(int argc, char **argv) del_entry(int argc, char **argv)
{ {
HDB *db;
krb5_error_code ret; krb5_error_code ret;
hdb_entry ent; hdb_entry ent;
@@ -54,7 +53,8 @@ del_entry(int argc, char **argv)
krb5_parse_name(context, argv[1], &ent.principal); krb5_parse_name(context, argv[1], &ent.principal);
if((ret = hdb_open(context, &db, database, O_RDWR, 0600))){ ret = db->open(context, db, O_RDWR, 0600);
if(ret) {
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
} }

6
admin/dump.c
View File

@@ -169,8 +169,7 @@ print_entry(krb5_context context, HDB *db, hdb_entry *entry, void *data)
int int
dump(int argc, char **argv) dump(int argc, char **argv)
{ {
HDB *db; krb5_error_code ret;
int ret;
FILE *f; FILE *f;
if(argc < 2) if(argc < 2)
@@ -178,8 +177,7 @@ dump(int argc, char **argv)
else else
f = fopen(argv[1], "w"); f = fopen(argv[1], "w");
ret = db->open(context, db, O_RDONLY, 0600);
ret = hdb_open(context, &db, database, O_RDONLY, 0600);
if(ret){ if(ret){
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
if(f != stdout) if(f != stdout)

6
admin/extkeytab.c
View File

@@ -43,7 +43,6 @@ RCSID("$Id$");
int int
ext_keytab(int argc, char **argv) ext_keytab(int argc, char **argv)
{ {
HDB *db;
hdb_entry ent; hdb_entry ent;
krb5_keytab kid; krb5_keytab kid;
krb5_principal principal; krb5_principal principal;
@@ -55,7 +54,7 @@ ext_keytab(int argc, char **argv)
return 0; return 0;
} }
ret = hdb_open(context, &db, database, O_RDONLY, 0600); ret = db->open(context, db, O_RDONLY, 0600);
if(ret){ if(ret){
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
@@ -95,14 +94,13 @@ ext_keytab(int argc, char **argv)
krb5_copy_principal (context, principal, &key_entry.principal); krb5_copy_principal (context, principal, &key_entry.principal);
key_entry.vno = ent.kvno; key_entry.vno = ent.kvno;
k = unseal_key(&ent.keys.val[i]); k = &ent.keys.val[i];
key_entry.keyblock.keytype = k->key.keytype; key_entry.keyblock.keytype = k->key.keytype;
key_entry.keyblock.keyvalue.length = 0; key_entry.keyblock.keyvalue.length = 0;
krb5_data_copy(&key_entry.keyblock.keyvalue, krb5_data_copy(&key_entry.keyblock.keyvalue,
k->key.keyvalue.data, k->key.keyvalue.data,
k->key.keyvalue.length); k->key.keyvalue.length);
hdb_free_key (k);
ret = krb5_kt_add_entry(context, ret = krb5_kt_add_entry(context,
kid, kid,

6
admin/get.c
View File

@@ -43,8 +43,7 @@ RCSID("$Id$");
int int
get_entry(int argc, char **argv) get_entry(int argc, char **argv)
{ {
HDB *db; krb5_error_code ret;
int ret;
hdb_entry ent; hdb_entry ent;
int i; int i;
krb5_principal principal; krb5_principal principal;
@@ -54,7 +53,8 @@ get_entry(int argc, char **argv)
return 0; return 0;
} }
if((ret = hdb_open(context, &db, database, O_RDONLY, 0600))) { ret = db->open(context, db, O_RDONLY, 0600);
if(ret) {
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
} }

15
admin/init.c
View File

@@ -43,8 +43,7 @@ RCSID("$Id$");
int int
init(int argc, char **argv) init(int argc, char **argv)
{ {
HDB *db; krb5_error_code ret;
int err;
int i; int i;
int default_life = 86400; int default_life = 86400;
@@ -54,9 +53,9 @@ init(int argc, char **argv)
hdb_entry ent; hdb_entry ent;
err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600); ret = db->open(context, db, O_RDWR | O_CREAT, 0600);
if(err){ if(ret){
krb5_warn(context, err, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
@@ -66,8 +65,8 @@ init(int argc, char **argv)
"krbtgt", "krbtgt",
argv[i], argv[i],
NULL); NULL);
err = db->fetch(context, db, &ent); ret = db->fetch(context, db, &ent);
switch(err){ switch(ret){
case 0: case 0:
krb5_warnx(context, "Entry already exists"); krb5_warnx(context, "Entry already exists");
krb5_free_principal(context, ent.principal); krb5_free_principal(context, ent.principal);
@@ -75,7 +74,7 @@ init(int argc, char **argv)
case HDB_ERR_NOENTRY: case HDB_ERR_NOENTRY:
break; break;
default: default:
krb5_warn(context, err, "hdb_fetch"); krb5_warn(context, ret, "hdb_fetch");
db->close(context, db); db->close(context, db);
return 0; return 0;
} }

24
admin/kdb_edit.c
View File

@@ -83,6 +83,7 @@ static SL_cmd commands[] = {
krb5_context context; krb5_context context;
char database[256] = HDB_DEFAULT_DB; char database[256] = HDB_DEFAULT_DB;
HDB *db = NULL;
int int
help(int argc, char **argv) help(int argc, char **argv)
@@ -100,6 +101,11 @@ exit_kdb_edit (int argc, char **argv)
int int
set_db(int argc, char **argv) set_db(int argc, char **argv)
{ {
krb5_error_code ret;
if (db)
db->destroy(context, db);
switch(argc){ switch(argc){
case 1: case 1:
strcpy(database, HDB_DEFAULT_DB); strcpy(database, HDB_DEFAULT_DB);
@@ -110,6 +116,12 @@ set_db(int argc, char **argv)
default: default:
fprintf(stderr, "Usage: database [database]\n"); fprintf(stderr, "Usage: database [database]\n");
} }
ret = hdb_create(context, &db, database);
if (ret)
krb5_err(context, 1, ret, "opening database %s", database);
ret = hdb_set_master_key(context, db, keyfile);
if (ret)
krb5_err(context, 1, ret, "setting master key");
return 0; return 0;
} }
@@ -127,7 +139,6 @@ main(int argc, char **argv)
krb5_config_section *cf; krb5_config_section *cf;
int optind = 0; int optind = 0;
int e; int e;
EncryptionKey key;
set_progname(argv[0]); set_progname(argv[0]);
@@ -157,16 +168,7 @@ main(int argc, char **argv)
keyfile = strdup(p); keyfile = strdup(p);
} }
ret = hdb_read_master_key(context, keyfile, &key); set_db(1, NULL);
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);
krb5_warnx (context, "Database is encrypted");
}else
krb5_warnx (context, "Database is not encrypted");
return sl_loop(commands, "kdb_edit> ") != 0; return sl_loop(commands, "kdb_edit> ") != 0;
} }

16
admin/load.c
View File

@@ -184,14 +184,12 @@ parse_hdbflags2int(char *str)
static void static void
doit(char *filename, int merge) doit(char *filename, int merge)
{ {
krb5_error_code ret;
FILE *f; FILE *f;
HDB *db;
char s[1024]; char s[1024];
char *p; char *p;
int line; int line;
int err;
int flags = O_RDWR; int flags = O_RDWR;
struct entry e; struct entry e;
hdb_entry ent; hdb_entry ent;
@@ -202,9 +200,9 @@ doit(char *filename, int merge)
} }
if(!merge) if(!merge)
flags |= O_CREAT | O_TRUNC; flags |= O_CREAT | O_TRUNC;
err = hdb_open(context, &db, database, flags, 0600); ret = db->open(context, db, flags, 0600);
if(err){ if(ret){
krb5_warn(context, err, "hdb_open"); krb5_warn(context, ret, "hdb_open");
fclose(f); fclose(f);
return; return;
} }
@@ -250,12 +248,12 @@ doit(char *filename, int merge)
p = skip_next(p); p = skip_next(p);
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
err = krb5_parse_name(context, e.principal, &ent.principal); ret = krb5_parse_name(context, e.principal, &ent.principal);
if(err){ if(ret){
fprintf(stderr, "%s:%s:%s (%s)\n", fprintf(stderr, "%s:%s:%s (%s)\n",
filename, filename,
line, line,
krb5_get_err_text(context, err), krb5_get_err_text(context, ret),
e.principal); e.principal);
continue; continue;
} }

5
admin/mod.c
View File

@@ -84,13 +84,12 @@ doit2(HDB *db, hdb_entry *ent)
static void static void
doit(const char *principal) doit(const char *principal)
{ {
HDB *db;
hdb_entry ent; hdb_entry ent;
krb5_error_code ret; krb5_error_code ret;
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
if((ret = hdb_open(context, &db, database, O_RDWR, 0600))){ ret = db->open(context, db, O_RDWR, 0600);
if(ret) {
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return; return;
} }

2
admin/util.c
View File

@@ -44,7 +44,6 @@ add_key(Key *k, krb5_keytype keytype)
{ {
memset(k, 0, sizeof(*k)); memset(k, 0, sizeof(*k));
krb5_generate_random_keyblock(context, keytype, &k->key); krb5_generate_random_keyblock(context, keytype, &k->key);
seal_key(k);
} }
void void
@@ -73,7 +72,6 @@ set_keys(hdb_entry *ent, char *password)
for(i = 0; i < ent->keys.len; i++) { for(i = 0; i < ent->keys.len; i++) {
krb5_string_to_key(password, &salt, ent->keys.val[i].key.keytype, krb5_string_to_key(password, &salt, ent->keys.val[i].key.keytype,
&ent->keys.val[i].key); /* XXX */ &ent->keys.val[i].key); /* XXX */
seal_key(&ent->keys.val[i]);
} }
krb5_data_free(&salt); krb5_data_free(&salt);
ent->kvno++; ent->kvno++;

6
kadmin/dump.c
View File

@@ -169,8 +169,7 @@ print_entry(krb5_context context, HDB *db, hdb_entry *entry, void *data)
int int
dump(int argc, char **argv) dump(int argc, char **argv)
{ {
HDB *db; krb5_error_code ret;
int ret;
FILE *f; FILE *f;
if(argc < 2) if(argc < 2)
@@ -178,8 +177,7 @@ dump(int argc, char **argv)
else else
f = fopen(argv[1], "w"); f = fopen(argv[1], "w");
ret = db->open(context, db, O_RDONLY, 0600);
ret = hdb_open(context, &db, database, O_RDONLY, 0600);
if(ret){ if(ret){
krb5_warn(context, ret, "hdb_open"); krb5_warn(context, ret, "hdb_open");
if(f != stdout) if(f != stdout)

15
kadmin/init.c
View File

@@ -43,8 +43,7 @@ RCSID("$Id$");
int int
init(int argc, char **argv) init(int argc, char **argv)
{ {
HDB *db; krb5_error_code ret;
int err;
int i; int i;
int default_life = 86400; int default_life = 86400;
@@ -54,9 +53,9 @@ init(int argc, char **argv)
hdb_entry ent; hdb_entry ent;
err = hdb_open(context, &db, database, O_RDWR | O_CREAT, 0600); ret = db->open(context, db, O_RDWR | O_CREAT, 0600);
if(err){ if(ret){
krb5_warn(context, err, "hdb_open"); krb5_warn(context, ret, "hdb_open");
return 0; return 0;
} }
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
@@ -66,8 +65,8 @@ init(int argc, char **argv)
"krbtgt", "krbtgt",
argv[i], argv[i],
NULL); NULL);
err = db->fetch(context, db, &ent); ret = db->fetch(context, db, &ent);
switch(err){ switch(ret){
case 0: case 0:
krb5_warnx(context, "Entry already exists"); krb5_warnx(context, "Entry already exists");
krb5_free_principal(context, ent.principal); krb5_free_principal(context, ent.principal);
@@ -75,7 +74,7 @@ init(int argc, char **argv)
case HDB_ERR_NOENTRY: case HDB_ERR_NOENTRY:
break; break;
default: default:
krb5_warn(context, err, "hdb_fetch"); krb5_warn(context, ret, "hdb_fetch");
db->close(context, db); db->close(context, db);
return 0; return 0;
} }

16
kadmin/load.c
View File

@@ -184,14 +184,12 @@ parse_hdbflags2int(char *str)
static void static void
doit(char *filename, int merge) doit(char *filename, int merge)
{ {
krb5_error_code ret;
FILE *f; FILE *f;
HDB *db;
char s[1024]; char s[1024];
char *p; char *p;
int line; int line;
int err;
int flags = O_RDWR; int flags = O_RDWR;
struct entry e; struct entry e;
hdb_entry ent; hdb_entry ent;
@@ -202,9 +200,9 @@ doit(char *filename, int merge)
} }
if(!merge) if(!merge)
flags |= O_CREAT | O_TRUNC; flags |= O_CREAT | O_TRUNC;
err = hdb_open(context, &db, database, flags, 0600); ret = db->open(context, db, flags, 0600);
if(err){ if(ret){
krb5_warn(context, err, "hdb_open"); krb5_warn(context, ret, "hdb_open");
fclose(f); fclose(f);
return; return;
} }
@@ -250,12 +248,12 @@ doit(char *filename, int merge)
p = skip_next(p); p = skip_next(p);
memset(&ent, 0, sizeof(ent)); memset(&ent, 0, sizeof(ent));
err = krb5_parse_name(context, e.principal, &ent.principal); ret = krb5_parse_name(context, e.principal, &ent.principal);
if(err){ if(ret){
fprintf(stderr, "%s:%s:%s (%s)\n", fprintf(stderr, "%s:%s:%s (%s)\n",
filename, filename,
line, line,
krb5_get_err_text(context, err), krb5_get_err_text(context, ret),
e.principal); e.principal);
continue; continue;
} }

1
kdc/config.c
View File

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

8
kdc/hprop.c
View File

@@ -333,8 +333,12 @@ int main(int argc, char **argv)
}else }else
#endif #endif
{ {
ret = hdb_open(context, &db, database, O_RDONLY, 0); ret = hdb_create (context, &db, database);
if(ret) krb5_err(context, 1, ret, "hdb_open"); 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){ if(to_stdout){

8
kdc/hpropd.c
View File

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

1
kdc/kdc_locl.h
View File

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

17
kdc/main.c
View File

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