* getdate.y: remove military timezones and plain integeres as part

 	of date specifications, to reduce confusion by redundancy
 	[krb5-admin/15]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9201 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 6 insertions, 70 deletions

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 90ab3400b..0224f3ec5 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 18 13:47:01 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+	* getdate.y: remove military timezones and plain integeres as part
+ 	of date specifications, to reduce confusion by redundancy
+ 	[krb5-admin/15]
+
 Wed Oct  9 15:23:51 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* kadmin.c (kadmin_addprinc): add "default" policy behavior;
diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
index e322ae663..c10c6a046 100644
--- a/src/kadmin/cli/getdate.y
+++ b/src/kadmin/cli/getdate.y
@@ -224,7 +224,6 @@ item	: time {
 	| rel {
 	    yyHaveRel++;
 	}
-	| number
 	;
 
 time	: tUNUMBER tMERIDIAN {
@@ -368,33 +367,6 @@ relunit	: tUNUMBER tMINUTE_UNIT {
 	}
 	;
 
-number	: tUNUMBER {
-	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
-		yyYear = $1;
-	    else {
-		if($1>10000) {
-		    yyHaveDate++;
-		    yyDay= ($1)%100;
-		    yyMonth= ($1/100)%100;
-		    yyYear = $1/10000;
-		}
-		else {
-		    yyHaveTime++;
-		    if ($1 < 100) {
-			yyHour = $1;
-			yyMinutes = 0;
-		    }
-		    else {
-		    	yyHour = $1 / 100;
-		    	yyMinutes = $1 % 100;
-		    }
-		    yySeconds = 0;
-		    yyMeridian = MER24;
-	        }
-	    }
-	}
-	;
-
 o_merid	: /* NULL */ {
 	    $$ = MER24;
 	}
@@ -562,39 +534,6 @@ static TABLE const TimezoneTable[] = {
     {  NULL  }
 };
 
-/* Military timezone table. */
-static TABLE const MilitaryTable[] = {
-    { "a",	tZONE,	HOUR(  1) },
-    { "b",	tZONE,	HOUR(  2) },
-    { "c",	tZONE,	HOUR(  3) },
-    { "d",	tZONE,	HOUR(  4) },
-    { "e",	tZONE,	HOUR(  5) },
-    { "f",	tZONE,	HOUR(  6) },
-    { "g",	tZONE,	HOUR(  7) },
-    { "h",	tZONE,	HOUR(  8) },
-    { "i",	tZONE,	HOUR(  9) },
-    { "k",	tZONE,	HOUR( 10) },
-    { "l",	tZONE,	HOUR( 11) },
-    { "m",	tZONE,	HOUR( 12) },
-    { "n",	tZONE,	HOUR(- 1) },
-    { "o",	tZONE,	HOUR(- 2) },
-    { "p",	tZONE,	HOUR(- 3) },
-    { "q",	tZONE,	HOUR(- 4) },
-    { "r",	tZONE,	HOUR(- 5) },
-    { "s",	tZONE,	HOUR(- 6) },
-    { "t",	tZONE,	HOUR(- 7) },
-    { "u",	tZONE,	HOUR(- 8) },
-    { "v",	tZONE,	HOUR(- 9) },
-    { "w",	tZONE,	HOUR(-10) },
-    { "x",	tZONE,	HOUR(-11) },
-    { "y",	tZONE,	HOUR(-12) },
-    { "z",	tZONE,	HOUR(  0) },
-    { NULL }
-};
-
-
-
-
 /* ARGSUSED */
 static int
 yyerror(s)
@@ -816,15 +755,6 @@ LookupWord(buff)
 	    return tp->type;
 	}
 
-    /* Military timezones. */
-    if (buff[1] == '\0' && isalpha(*buff)) {
-	for (tp = MilitaryTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-    }
-
     /* Drop out any periods and try the timezone table again. */
     for (i = 0, p = q = buff; *q; q++)
 	if (*q != '.')