Subject: Collected Debian patches for pam-krb5
Author: Russ Allbery <rra@debian.org>

Since I am also upstream for this package, there will normally not be any
patches to apply to the upstream source.  However, occasionally I'll pull
up specific upstream commits prior to making an upstream release.  When
this happens, this patch will collect all of those modifications.

I use Git to maintain both the upstream source and the Debian packages,
and generating individual patches rather than using git cherry-pick takes
extra work for no gain.  Since I'm also upstream, there's no need to
separate the patches for later upstream submission.  Hence, I take this
approach with a unified patch when it's necessary.

For full commit history and separated commits, see the upstream Git
repsitory.
--- libpam-krb5-4.5.orig/pam-util/options.c
+++ libpam-krb5-4.5/pam-util/options.c
@@ -138,6 +138,11 @@ putil_args_defaults(struct pam_args *arg
     for (opt = 0; opt < optlen; opt++) {
         bool *bp;
         long *lp;
+#ifdef HAVE_KERBEROS
+        krb5_deltat *tp;
+#else
+        long *tp;
+#endif
         char **sp;
         struct vector **vp;
 
@@ -147,10 +152,13 @@ putil_args_defaults(struct pam_args *arg
             *bp = options[opt].defaults.boolean;
             break;
         case TYPE_NUMBER:
-        case TYPE_TIME:
             lp = CONF_NUMBER(args->config, options[opt].location);
             *lp = options[opt].defaults.number;
             break;
+        case TYPE_TIME:
+            tp = CONF_TIME(args->config, options[opt].location);
+            *tp = options[opt].defaults.number;
+            break;
         case TYPE_STRING:
             sp = CONF_STRING(args->config, options[opt].location);
             if (options[opt].defaults.string == NULL)
