summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/krb/x-deltat.y
diff options
context:
space:
mode:
authorAlexandra Ellwood <lxs@mit.edu>2004-10-13 16:18:27 +0000
committerAlexandra Ellwood <lxs@mit.edu>2004-10-13 16:18:27 +0000
commit267e52dc0b7a040f552eb84f302a08059061078b (patch)
tree640595fdbcd7a25f91f8d3954c460376f0c08a1e /src/lib/krb5/krb/x-deltat.y
parentf03e8f6e527cafe0319ee82a3f5aefc15a802edd (diff)
downloadkrb5-267e52dc0b7a040f552eb84f302a08059061078b.tar.gz
krb5-267e52dc0b7a040f552eb84f302a08059061078b.tar.xz
krb5-267e52dc0b7a040f552eb84f302a08059061078b.zip
krb5_string_to_deltat should default to seconds if no unit is provided. If the format is invalid, it should return a distinct error (KRB5_DELTAT_BADFORMAT, not EINVAL)
ticket: 2734 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16816 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/x-deltat.y')
-rw-r--r--src/lib/krb5/krb/x-deltat.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/x-deltat.y b/src/lib/krb5/krb/x-deltat.y
index 18c644f2a..819602fe1 100644
--- a/src/lib/krb5/krb/x-deltat.y
+++ b/src/lib/krb5/krb/x-deltat.y
@@ -147,6 +147,7 @@ deltat:
| wsnum '-' NUM ':' NUM ':' NUM { DO ($1, $3, $5, $7); }
| wsnum ':' NUM ':' NUM { DO ( 0, $1, $3, $5); }
| wsnum ':' NUM { DO ( 0, $1, $3, 0); }
+ | wsnum { DO ( 0, 0, 0, $1); } /* default to 's' */
;
opt_hms:
@@ -222,7 +223,7 @@ krb5_string_to_deltat(char *string, krb5_deltat *deltatp)
p.delta = 0;
p.p = string;
if (yyparse (&p))
- return EINVAL;
+ return KRB5_DELTAT_BADFORMAT;
*deltatp = p.delta;
return 0;
}