FreeBSD port changes.

svn path=/trunk/; revision=1288

4 files changed, 17 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index d032ec48..e99eea28 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ fetchmail-4.1.2 ()
 * Prevent buffer spamming in SockOpen by a broken DNS.
 * Al Youngwerth's fix to prevent segfaults when Return-Path has no address.
 * Phillippe De Muyter's port changes for sysV68 R3V7.1.
+* Port changes for Kerberos under FreeBSD, thanks to Benjamin Greenwald.
+
+There are 285 people on the fetchmail-friends list.
 
 fetchmail-4.1.1 (Fri Aug 15 21:02:50 EDT 1997)
 * Fix an obvious bug in some snprintf calls (non-Linux systems only)
diff --git a/daemon.c b/daemon.c
index fe6243fe..1335ef1a 100644
--- a/daemon.c
+++ b/daemon.c
@@ -54,7 +54,7 @@ sigchld_handler (int sig)
 {
   pid_t pid;
 
-#if defined(HAVE_UNION_WAIT)
+#if defined(HAVE_UNION_WAIT) && !defined(__FreeBSD__)
   union wait status;
 #else
   int status;
diff --git a/driver.c b/driver.c
index 41528a7e..e4e951ca 100644
--- a/driver.c
+++ b/driver.c
@@ -46,8 +46,14 @@
 #include <krb.h>
 #define krb_get_err_text(e) (krb_err_txt[e])
 #else
+#if defined(__FreeBSD__)
+#define krb_get_err_text(e) (krb_err_txt[e])
+#include <krb.h>
+#include <des.h>
+#else
 #include <krb.h>
 #include <des.h>
+#endif /* ! defined (__FreeBSD__) */
 #endif /* ! defined (__bsdi__) */
 #include <netinet/in.h>
 #include <netdb.h>
@@ -1219,7 +1225,11 @@ int
 kerberos_auth (socket, canonical) 
 /* authenticate to the server host using Kerberos V4 */
 int socket;		/* socket to server host */
+#ifdef __FreeBSD__
+char *canonical;	/* server name */
+#else
 const char *canonical;	/* server name */
+#endif
 {
     char * host_primary;
     KTEXT ticket;
diff --git a/imap.c b/imap.c
index f1d5a225..9540593d 100644
--- a/imap.c
+++ b/imap.c
@@ -20,6 +20,9 @@
 #include <des.h>
 #define krb_get_err_text(e) (krb_err_txt[e])
 #endif
+#if defined (__FreeBSD__)
+#define krb_get_err_text(e) (krb_err_txt[e])
+#endif
 #include <krb.h>
 #endif /* KERBEROS_V4 */