hdb_set_master_key -> hdb_set_master_keyfile
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5392 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997, 1999 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -62,9 +62,9 @@ main(int argc, char **argv)
|
|||||||
ret = hdb_create(context, &db, database);
|
ret = hdb_create(context, &db, database);
|
||||||
if(ret)
|
if(ret)
|
||||||
krb5_err(context, 1, ret, "hdb_create %s", database);
|
krb5_err(context, 1, ret, "hdb_create %s", database);
|
||||||
ret = hdb_set_master_key(context, db, keyfile);
|
ret = hdb_set_master_keyfile(context, db, keyfile);
|
||||||
if (ret)
|
if (ret)
|
||||||
krb5_err(context, 1, ret, "hdb_set_master_key");
|
krb5_err(context, 1, ret, "hdb_set_master_keyfile");
|
||||||
|
|
||||||
#ifdef HAVE_SIGACTION
|
#ifdef HAVE_SIGACTION
|
||||||
{
|
{
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -57,8 +57,8 @@ kadm5_s_init_with_context(krb5_context context,
|
|||||||
ret = hdb_create(ctx->context, &ctx->db, NULL);
|
ret = hdb_create(ctx->context, &ctx->db, NULL);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = hdb_set_master_key (ctx->context,
|
ret = hdb_set_master_keyfile (ctx->context,
|
||||||
ctx->db, NULL); /* XXX get from conf */
|
ctx->db, NULL); /* XXX get from conf */
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user