(krb5_program_setup): handle krb5_init_context failure consistently
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9442 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -48,13 +48,16 @@ krb5_program_setup(krb5_context *context, int argc, char **argv,
|
|||||||
struct getargs *args, int num_args,
|
struct getargs *args, int num_args,
|
||||||
void (*usage)(int, struct getargs*, int))
|
void (*usage)(int, struct getargs*, int))
|
||||||
{
|
{
|
||||||
|
krb5_error_code ret;
|
||||||
int optind = 0;
|
int optind = 0;
|
||||||
|
|
||||||
if(usage == NULL)
|
if(usage == NULL)
|
||||||
usage = krb5_std_usage;
|
usage = krb5_std_usage;
|
||||||
|
|
||||||
set_progname(argv[0]);
|
set_progname(argv[0]);
|
||||||
krb5_init_context(context);
|
ret = krb5_init_context(context);
|
||||||
|
if (ret)
|
||||||
|
errx (1, "krb5_init_context failed: %d", ret);
|
||||||
|
|
||||||
if(getarg(args, num_args, argc, argv, &optind))
|
if(getarg(args, num_args, argc, argv, &optind))
|
||||||
(*usage)(1, args, num_args);
|
(*usage)(1, args, num_args);
|
||||||
|
Reference in New Issue
Block a user