diff -Naur coda-6.0.5/coda-src/auth2/krb4.c coda-6.0.5-krbfix/coda-src/auth2/krb4.c
--- coda-6.0.5/coda-src/auth2/krb4.c	Fri May 23 19:26:26 2003
+++ coda-6.0.5-krbfix/coda-src/auth2/krb4.c	Wed Mar 24 11:12:30 2004
@@ -51,9 +51,9 @@
     codaconf_init("venus.conf");
     codaconf_init("vice.conf");
     codaconf_init("auth2.conf");
-    CONF_STR(kerberos4service, "kerberos4service", "host");
+    CODACONF_STR(kerberos4service, "kerberos4service", "host");
 
-    CONF_STR(kerberos4realm, "kerberos4realm", NULL)
+    CODACONF_STR(kerberos4realm, "kerberos4realm", NULL)
     /* When no realm has been specified, use the default realm */
     if (!kerberos4realm) {
         krb_get_lrealm(default_realm, 1);
@@ -67,7 +67,7 @@
     if (Krb4CommonInit())
         return -1;
 
-    CONF_STR(kerberos4kinit, "kerberos4kinit", "kinit")
+    CODACONF_STR(kerberos4kinit, "kerberos4kinit", "kinit")
     return 0;
 }
 
diff -Naur coda-6.0.5/coda-src/auth2/krb5.c coda-6.0.5-krbfix/coda-src/auth2/krb5.c
--- coda-6.0.5/coda-src/auth2/krb5.c	Fri May 23 19:26:26 2003
+++ coda-6.0.5-krbfix/coda-src/auth2/krb5.c	Wed Mar 24 11:11:24 2004
@@ -54,7 +54,7 @@
     codaconf_init("venus.conf");
     codaconf_init("vice.conf");
     codaconf_init("auth2.conf");
-    CONF_STR(kerberos5service, "kerberos5service", "host/%s");
+    CODACONF_STR(kerberos5service, "kerberos5service", "host/%s");
 
     /* initialize Kerberos 5 contex */
     krc = krb5_init_context(&krb5context);
@@ -71,7 +71,7 @@
     if (Krb5CommonInit())
         return -1;
 
-    CONF_STR(kerberos5kinit, "kerberos5kinit", "kinit")
+    CODACONF_STR(kerberos5kinit, "kerberos5kinit", "kinit")
     return 0;
 }
 
@@ -144,7 +144,7 @@
     if (Krb5CommonInit())
         return -1;
 
-    CONF_STR(kerberos5realm, "kerberos5realm", NULL)
+    CODACONF_STR(kerberos5realm, "kerberos5realm", NULL)
 
     /* When no realm has been specified, use the default realm */
     if (!kerberos5realm) {
@@ -156,7 +156,7 @@
 
     get_principal(NULL, &krb5principal);
 
-    CONF_STR(kerberos5keytab, "kerberos5keytab", NULL)
+   CODACONF_STR(kerberos5keytab, "kerberos5keytab", NULL)
 
     /* If the user specified a different keytab, load it */
     if (kerberos5keytab) {