Ticket #41: zephyr-com-err.patch

zephyr/aclocal.m4

@@ -194 +194 @@
 dnl ----- Kerberos 4 -----
 
 AC_DEFUN([ATHENA_KRB4_CHECK],
-[AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
+[AC_REQUIRE([AC_CANONICAL_TARGET])
+AC_CHECK_FUNC(gethostbyname, :, AC_CHECK_LIB(nsl, gethostbyname))
 AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket))
 AC_CHECK_LIB(gen, compile)
 if test "$krb4" != yes; then
@@ -210 +211 @@
                            [KRB4_LIBS="-lkrb -ldes"],
                            [AC_MSG_ERROR(Kerberos 4 libraries not found)],
                            -ldes)],
-             -ldes425 -lkrb5 -lk5crypto -lcom_err)])
+             -ldes425 -lkrb5 -lk5crypto -lcom_err)
+if test "$KRB4_LIBS" != "" ; then
+        case "$target_os" in
+        darwin*) KRB4_LIBS="$KRB4_LIBS -framework Kerberos"
+        esac
+fi])
 
 AC_DEFUN([ATHENA_KRB4],
 [AC_ARG_WITH(krb4,

zephyr/configure.in

@@ -10 +10 @@
 AC_SUBST(lsbindir)
 
 AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 AC_DEFINE_UNQUOTED(MACHINE_TYPE, "$host")
 
 dnl Checks for programs.
@@ -112 +113 @@
       KRB5_LIBS="-lkrb5 -l5crypto -lcom_err"
    fi
    AC_DEFINE(HAVE_KRB5)
+
+   case "$target_os" in
+   darwin*) KRB5_LIBS="$KRB5_LIBS -framework Kerberos"
+   esac
 fi
 AC_SUBST(KRB5_LIBS)
 

zephyr/lib/ZInit.c

@@ -59 +59 @@
 #endif
 #endif
 
-#ifdef HAVE_KRB4
+#if defined(__APPLE__) && defined(__MACH__)
+    /* On OS X you don't need to initialize the Kerberos error tables
+       as long as you link with -framework Kerberos */
+    add_error_table(&et_zeph_error_table);
+#else
+# ifdef HAVE_KRB4
     initialize_krb_error_table();
-#endif
-#ifdef HAVE_KRB5
+# endif
+# ifdef HAVE_KRB5
     initialize_krb5_error_table();
-#endif
+# endif
 
     initialize_zeph_error_table();
+#endif
     
     (void) memset((char *)&__HM_addr, 0, sizeof(__HM_addr));
 

zephyr/server/main.c

@@ -417 +417 @@
     if (*my_realm) 
       strcpy(__Zephyr_realm, my_realm);
 #endif
-    init_zsrv_err_tbl();        /* set up err table */
+
+    /* set up err table */
+#if defined(__APPLE__) && defined(__MACH__)
+    add_error_table(&et_zsrv_error_table);
+#else
+    init_zsrv_err_tbl();
+#endif
 
     ZSetFD(srv_socket);         /* set up the socket as the input fildes */