Coda 6.0.5 and Krb RPMS

[Mark Phalan]

Hi,

I've build RPMS for redhat 7.3. I've also built RPMS which include
kerberos5 support.

The RPMs may be found here -> http://www.maths.tcd.ie/~phalanm/coda/

Whilst building in krb5 support I came across a number of errors. I've
attached two small patches to fix them.

Also I noticed that the memleak in auth2.c hasn't been fixed. I'll try
and submit a patch for that this week.

Cheers,

Mark



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) {

diff -Naur coda-6.0.5/coda-src/auth2/auser.c coda-6.0.5-krb5fix/coda-src/auth2/auser.c
--- coda-6.0.5/coda-src/auth2/auser.c	Fri Nov 14 17:42:15 2003
+++ coda-6.0.5-krb5fix/coda-src/auth2/auser.c	Wed Mar 24 11:23:55 2004
@@ -341,7 +341,7 @@
 		if (Krb5GetSecret(AuthHost.ai_canonname, &uName, &uNamelen,
 				  &uPasswd, &uPasswdlen, interactive))
 		{
-		    fprintf(stderr, "Failed to get secret for %s\n", AuthHost->ai_canonname);
+		    fprintf(stderr, "Failed to get secret for %s\n", AuthHost.ai_canonname);
 		    continue;
 		}
 	    }