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

6
kadmin/dump.c
View File

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

15
kadmin/init.c
View File

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

16
kadmin/load.c
View File

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