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

prefix all struct HDB elements with hdb_

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12880 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-09-19 00:25:35 +00:00
parent ef91ed3046
commit 0540f13b86
29 changed files with 372 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kdc/hprop.c
View File

@@ -845,9 +845,9 @@ main(int argc, char **argv)
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);
ret = db->hdb_open(context, db, O_RDONLY, 0);
if(ret)
krb5_err(context, 1, ret, "db->open");
krb5_err(context, 1, ret, "db->hdb_open");
break;
default:
krb5_errx(context, 1, "unknown dump type `%d'", type);
@@ -864,7 +864,7 @@ main(int argc, char **argv)
krb5_cc_destroy(context, ccache);
if(db != NULL)
(*db->destroy)(context, db);
(*db->hdb_destroy)(context, db);
krb5_free_context(context);
return 0;

32
kdc/hpropd.c
View File

@@ -65,9 +65,11 @@ dump_krb4(krb5_context context, hdb_entry *ent, int fd)
ret = krb5_524_conv_principal(context, ent->principal,
name, instance, realm);
if (ret) {
krb5_unparse_name(context, ent->principal, &princ_name);
krb5_warn(context, ret, "%s", princ_name);
free(princ_name);
ret = krb5_unparse_name(context, ent->principal, &princ_name);
if (ret == 0) {
krb5_warn(context, ret, "%s", princ_name);
free(princ_name);
}
return -1;
}
@@ -141,9 +143,11 @@ dump_krb4(krb5_context context, hdb_entry *ent, int fd)
ret = krb5_524_conv_principal(context, modifier->principal,
name, instance, realm);
if (ret) {
krb5_unparse_name(context, modifier->principal, &princ_name);
krb5_warn(context, ret, "%s", princ_name);
free(princ_name);
ret = krb5_unparse_name(context, modifier->principal, &princ_name);
if (ret == 0) {
krb5_warn(context, ret, "%s", princ_name);
free(princ_name);
}
return -1;
}
asprintf(&p, "%s %s %s\n", time2str(modifier->time),
@@ -322,7 +326,9 @@ main(int argc, char **argv)
principalname2krb5_principal(&c2, authent->cname, authent->crealm);
if(!krb5_principal_compare(context, c1, c2)) {
char *s;
krb5_unparse_name(context, c2, &s);
ret = krb5_unparse_name(context, c2, &s);
if (ret)
s = "unparseable name";
krb5_errx(context, 1, "Unauthorized connection from %s", s);
}
krb5_free_principal(context, c1);
@@ -347,7 +353,7 @@ main(int argc, char **argv)
ret = hdb_create(context, &db, tmp_db);
if(ret)
krb5_err(context, 1, ret, "hdb_create(%s)", tmp_db);
ret = db->open(context, db, O_RDWR | O_CREAT | O_TRUNC, 0600);
ret = db->hdb_open(context, db, O_RDWR | O_CREAT | O_TRUNC, 0600);
if(ret)
krb5_err(context, 1, ret, "hdb_open(%s)", tmp_db);
}
@@ -395,10 +401,10 @@ main(int argc, char **argv)
} else
#endif /* KRB4 */
{
ret = db->rename(context, db, database);
ret = db->hdb_rename(context, db, database);
if(ret)
krb5_err(context, 1, ret, "db_rename");
ret = db->close(context, db);
ret = db->hdb_close(context, db);
if(ret)
krb5_err(context, 1, ret, "db_close");
}
@@ -419,10 +425,12 @@ main(int argc, char **argv)
else
#endif /* KRB4 */
{
ret = db->store(context, db, 0, &entry);
ret = db->hdb_store(context, db, 0, &entry);
if(ret == HDB_ERR_EXISTS) {
char *s;
krb5_unparse_name(context, entry.principal, &s);
ret = krb5_unparse_name(context, entry.principal, &s);
if (ret)
s = strdup("unparseable name");
krb5_warnx(context, "Entry exists: %s", s);
free(s);
} else if(ret)

6
kdc/misc.c
View File

@@ -50,14 +50,14 @@ db_fetch(krb5_principal principal, hdb_entry **h)
ent->principal = principal;
for(i = 0; i < num_db; i++) {
ret = db[i]->open(context, db[i], O_RDONLY, 0);
ret = db[i]->hdb_open(context, db[i], O_RDONLY, 0);
if (ret) {
kdc_log(0, "Failed to open database: %s",
krb5_get_err_text(context, ret));
continue;
}
ret = db[i]->fetch(context, db[i], HDB_F_DECRYPT, ent);
db[i]->close(context, db[i]);
ret = db[i]->hdb_fetch(context, db[i], HDB_F_DECRYPT, ent);
db[i]->hdb_close(context, db[i]);
if(ret == 0) {
*h = ent;
return 0;