From 55a3098f0410f7c7a60b8b4103ec0e29f4078a25 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Thu, 4 Jan 2001 16:03:03 +0000
Subject: [PATCH] (krb5_appdefault_string): handle NULL def_val
 (krb5_appdefault_time): new function

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9449 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/appdefault.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/krb5/appdefault.c b/lib/krb5/appdefault.c
index 4cceb183a..a9f1b4b3d 100644
--- a/lib/krb5/appdefault.c
+++ b/lib/krb5/appdefault.c
@@ -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). 
  * All rights reserved. 
  *
@@ -75,7 +75,6 @@ krb5_appdefault_string(krb5_context context, const char *appname,
 		       krb5_realm realm, const char *option,
 		       const char *def_val, char **ret_val)
 {
-    
     if(appname == NULL)
 	appname = __progname;
     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, 
 						     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;
 }