From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 12 Oct 1999 23:13:39 +0000 (+0000)
Subject: * conv_princ.c (sconv_list): Don't do conversion for "zephyr" principal.
X-Git-Tag: krb5-1.2-beta1~214
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18b3dbf2a90a1697de606effc2fa08ef30fa3cdc;p=krb5.git

* conv_princ.c (sconv_list): Don't do conversion for "zephyr" principal.
(Noticed by Derrick Brashear.)  Delete about a dozen duplicate entries.

* str_conv.c (dt_output_donly, dt_output_dhms, dt_output_hms,
sftime_default_fmt): Replace char arrays with macros, so gcc can do better
format-string checking.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index a749b6c17..f21a54520 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-12  Ken Raeburn  <raeburn@mit.edu>
+
+	* conv_princ.c (sconv_list): Don't do conversion for "zephyr"
+	principal.  (Noticed by Derrick Brashear.)  Delete about a dozen
+	duplicate entries.
+
+	* str_conv.c (dt_output_donly, dt_output_dhms, dt_output_hms,
+	sftime_default_fmt): Replace char arrays with macros, so gcc can
+	do better format-string checking.
+
 1999-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* init_ctx.c (get_profile_etype_list): Update name of the des3
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index 1ce414143..b90289ab5 100644
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -84,7 +84,7 @@ static const struct krb_convert sconv_list[] = {
     {"abs",   "abs",          DO_REALM_CONVERSION},
     {"nfs",   "nfs",          DO_REALM_CONVERSION},
     {"tftp",  "tftp",         DO_REALM_CONVERSION},
-    {"zephyr",        "zephyr",       DO_REALM_CONVERSION},
+    {"zephyr",        "zephyr",       0},
     {"http",  "http",         DO_REALM_CONVERSION},
     {"khttp", "khttp",        DO_REALM_CONVERSION},
     {"pgpsigner", "pgpsigner",        DO_REALM_CONVERSION},
@@ -92,18 +92,6 @@ static const struct krb_convert sconv_list[] = {
     {"mandarin-agent",        "mandarin-agent",       DO_REALM_CONVERSION},
     {"write", "write",        DO_REALM_CONVERSION},
     {"palladium", "palladium",        DO_REALM_CONVERSION},
-    {"news",	"news",		DO_REALM_CONVERSION},
-    {"abs",	"abs",		DO_REALM_CONVERSION},
-    {"nfs",	"nfs",		DO_REALM_CONVERSION},
-    {"tftp",	"tftp",		DO_REALM_CONVERSION},
-    {"zephyr",	"zephyr",	DO_REALM_CONVERSION},
-    {"http",	"http",		DO_REALM_CONVERSION},
-    {"khttp",	"khttp",	DO_REALM_CONVERSION},
-    {"pgpsigner", "pgpsigner",	DO_REALM_CONVERSION},
-    {"irc",	"irc",		DO_REALM_CONVERSION},
-    {"mandarin-agent",	"mandarin-agent",	DO_REALM_CONVERSION},
-    {"write",	"write",	DO_REALM_CONVERSION},
-    {"palladium", "palladium",	DO_REALM_CONVERSION},
     {0,		0,		0},
 };
 
diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c
index 156bf22d3..be7631c60 100644
--- a/src/lib/krb5/krb/str_conv.c
+++ b/src/lib/krb5/krb/str_conv.c
@@ -114,7 +114,7 @@ static const char sftime_med_fmt[]	= "%d %b %Y %T";
 static const char sftime_short_fmt[]	= "%x %X";
 static const char sftime_last_fmt[]	= "%d/%m/%Y %R";
 #endif	/* HAVE_STRFTIME */
-static const char sftime_default_fmt[]	= "%02d/%02d/%4d %02d:%02d";
+#define sftime_default_fmt		"%02d/%02d/%4d %02d:%02d"
 static const size_t sftime_default_len	= 2+1+2+1+4+1+2+1+2+1;
 
 /* Delta time strings */
@@ -130,9 +130,9 @@ static const char dtscan_minutes[]	= "%d%[m]";
 static const char dtscan_seconds[]	= "%d%[s]";
 static const char dt_day_singular[]	= "day";
 static const char dt_day_plural[]	= "days";
-static const char dt_output_donly[]	= "%d %s";
-static const char dt_output_dhms[]	= "%d %s %02d:%02d:%02d";
-static const char dt_output_hms[]	= "%d:%02d:%02d";
+#define dt_output_donly			"%d %s"
+#define dt_output_dhms			"%d %s %02d:%02d:%02d"
+#define dt_output_hms			"%d:%02d:%02d"
 
 /*
  * Lookup tables.