[193] in Kerberos-V5-bugs
kinit fixes: allow user to specify units for lifetime.
daemon@ATHENA.MIT.EDU (Bill Sommerfeld)
Thu Aug 29 16:08:06 1991
Date: Thu, 29 Aug 91 15:09:17 EDT
From: sommerfeld@apollo.com (Bill Sommerfeld)
To: krb5-bugs@ATHENA.MIT.EDU
I found this helpful for testing code which handles ticket expiration
as gracefully as possible.
Diffs are relative to beta1.
This has one minor user interface change (which can be tweaked easily
enough): the default unit for -l is "days", not "hours". Move the
default: in the switch to fix this.
Perhaps krb5_parse_lifetime should move into libkrb or libos .
- Bill
*** kinit.c/MIT-beta1 Thu Jun 6 10:00:52 1991
--- kinit.c/MIT-beta1/lifetime Tue Aug 27 16:05:45 1991
***************
*** 45,56 ****
extern int optind;
extern char *optarg;
krb5_error_code
krb5_parse_lifetime (time, len)
char *time;
long *len;
{
! *len = atoi (time) * 60 * 60; /* XXX stub version */
return 0;
}
--- 45,117 ----
extern int optind;
extern char *optarg;
+ /*
+ * this next function was lifted from the source to sendmail, which is:
+ *
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement: ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+ time_t
+ convtime(p)
+ char *p;
+ {
+ register time_t t, r;
+ register char c;
+
+ r = 0;
+ while (*p != '\0')
+ {
+ t = 0;
+ while (isdigit(c = *p++))
+ t = t * 10 + (c - '0');
+ if (c == '\0')
+ p--;
+ switch (c)
+ {
+ case 'w': /* weeks */
+ t *= 7;
+
+ case 'd': /* days */
+ default:
+ t *= 24;
+
+ case 'h': /* hours */
+ t *= 60;
+
+ case 'm': /* minutes */
+ t *= 60;
+
+ case 's': /* seconds */
+ break;
+ }
+ r += t;
+ }
+
+ return (r);
+ }
+
krb5_error_code
krb5_parse_lifetime (time, len)
char *time;
long *len;
{
! *len = convtime(time);
return 0;
}
