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

(krb5_appdefault_string): handle NULL def_val

Browse Source 
(krb5_appdefault_time): new function


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9449 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-01-04 16:03:03 +00:00
parent c2b307f959
commit 55a3098f04
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/krb5/appdefault.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 2000, 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -75,7 +75,6 @@ krb5_appdefault_string(krb5_context context, const char *appname,
krb5_realm realm, const char *option, krb5_realm realm, const char *option,
const char *def_val, char **ret_val) const char *def_val, char **ret_val)
{ {
if(appname == NULL) if(appname == NULL)
appname = __progname; appname = __progname;
def_val = krb5_config_get_string_default(context, NULL, def_val, def_val = krb5_config_get_string_default(context, NULL, def_val,
@@ -102,5 +101,23 @@ krb5_appdefault_string(krb5_context context, const char *appname,
option, option,
NULL); NULL);
} }
*ret_val = strdup(def_val); if(def_val == NULL)
*ret_val = strdup(def_val);
else
*ret_val = NULL;
}
void
krb5_appdefault_time(krb5_context context, const char *appname,
krb5_realm realm, const char *option,
time_t def_val, time_t *ret_val)
{
time_t t;
char tstr[32];
char *val;
snprintf(tstr, sizeof(tstr), "%ld", (long)def_val);
krb5_appdefault_string(context, appname, realm, option, tstr, &val);
t = parse_time (val, NULL);
free(val);
*ret_val = t;
} }