fix OSX build issues

diff --git a/configure.in b/configure.in
index 2a24b6c44187413b976f4755695e32a8ac3f71f8..a657c2664c27905e9b964bbfbccc5204d52bfb5b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.10 2003-10-30 05:57:43 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.11 2003-11-01 02:38:09 bfernhomberg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -681,6 +681,8 @@ if test x"$this_os" = "xmacosx"; then
        AC_DEFINE(HAVE_BROKEN_CPP, 1, [Define if cpp is broken])
        AC_DEFINE(HAVE_2ARG_DBTOB, 1, [Define if dbtob takes two arguments])
        dnl AC_DEFINE(NO_DLFCN_H)
+       AC_DEFINE(NO_DDP, 1, [Define if DDP should be disabled])
+       AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if Quota support should be disabled])
        AC_DEFINE(MACOSX_SERVER, 1, [Define if compiling for MacOS X Server])
 fi
 

diff --git a/etc/afpd/ofork.c b/etc/afpd/ofork.c
index a9aee77976ad5fa2b0fceab4a0b860a44ca86413..378d7c1b5e67c38f46f7cea8544bcf2f2e96779f 100644 (file)
--- a/etc/afpd/ofork.c
+++ b/etc/afpd/ofork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ofork.c,v 1.20.6.2 2003-09-30 14:52:45 didg Exp $
+ * $Id: ofork.c,v 1.20.6.3 2003-11-01 02:38:09 bfernhomberg Exp $
  *
  * Copyright (c) 1996 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -11,6 +11,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <string.h>
 #include <sys/stat.h> /* works around a bug */
 #include <sys/param.h>

diff --git a/etc/uams/uams_dhx_pam.c b/etc/uams/uams_dhx_pam.c
index 8024388e6df7fb49dc9c3d2732349d4ec122578e..e655863136d00b9823be7495b3a6bde1b6aa6970 100644 (file)
--- a/etc/uams/uams_dhx_pam.c
+++ b/etc/uams/uams_dhx_pam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx_pam.c,v 1.24.6.3 2003-10-30 00:21:46 bfernhomberg Exp $
+ * $Id: uams_dhx_pam.c,v 1.24.6.4 2003-11-01 02:38:09 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -20,8 +20,13 @@
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <errno.h>
-
+#ifdef HAVE_SECURITY_PAM_APPL_H
 #include <security/pam_appl.h>
+#endif
+#ifdef HAVE_PAM_PAM_APPL_H
+#include <pam/pam_appl.h>
+#endif
+
 
 #if defined(GNUTLS_DHX)
 #include <gnutls/openssl.h>

diff --git a/etc/uams/uams_pam.c b/etc/uams/uams_pam.c
index dd22384a1f5e4793caea396f72e67f695b524106..625f5afc49dc6068f35f65d22e34aac4d01dca3b 100644 (file)
--- a/etc/uams/uams_pam.c
+++ b/etc/uams/uams_pam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_pam.c,v 1.15.2.1.2.3 2003-10-30 00:21:47 bfernhomberg Exp $
+ * $Id: uams_pam.c,v 1.15.2.1.2.4 2003-11-01 02:38:09 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -34,7 +34,12 @@ char *strchr (), *strrchr ();
 
 #include <atalk/logger.h>
 
+#ifdef HAVE_SECURITY_PAM_APPL_H
 #include <security/pam_appl.h>
+#endif
+#ifdef HAVE_PAM_PAM_APPL_H
+#include <pam/pam_appl.h>
+#endif
 
 #include <atalk/afp.h>
 #include <atalk/uam.h>

diff --git a/include/atalk/server_ipc.h b/include/atalk/server_ipc.h
index b462c6f971687e7c82a586ac5e04f6a9896a96ca..eb899f8c891564cb7fe2a509c9a0531eba6d8475 100644 (file)
--- a/include/atalk/server_ipc.h
+++ b/include/atalk/server_ipc.h
@@ -8,7 +8,7 @@ void *server_ipc_create(void);
 int server_ipc_child(void *obj);
 int server_ipc_parent(void *obj);
 int server_ipc_read(server_child *children);
-int server_ipc_write(uint16_t command, int len, void *token);
+int server_ipc_write(u_int16_t command, int len, void *token);
 
 
 

diff --git a/include/atalk/unicode.h b/include/atalk/unicode.h
index 3165f6a99ac726ad3f83b5d89e17126ce4f1c6d7..90ec8822e04dd17b668382f4592566360e769b33 100644 (file)
--- a/include/atalk/unicode.h
+++ b/include/atalk/unicode.h
@@ -16,6 +16,10 @@
 
 #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
 
+#ifndef EILSEQ
+#define EILSEQ       84      /* Illegal byte sequence.  */
+#endif
+
 /* generic iconv conversion structure */
 typedef struct {
         size_t (*direct)(void *cd, char **inbuf, size_t *inbytesleft,

diff --git a/libatalk/netddp/netddp_sendto.c b/libatalk/netddp/netddp_sendto.c
index 1a95b68d547008ec01005328c47c6300597552d4..b90956f737598a57b4de84496ad4115a7adc3b3a 100644 (file)
--- a/libatalk/netddp/netddp_sendto.c
+++ b/libatalk/netddp/netddp_sendto.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_sendto.c,v 1.6 2003-02-17 02:02:25 srittau Exp $
+ * $Id: netddp_sendto.c,v 1.6.6.1 2003-11-01 02:38:09 bfernhomberg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -54,7 +54,7 @@ int netddp_sendto(int fd, void *buf, size_t buflen, unsigned int dummy,
       return -1;
 
     memset(&ddphdr, 0, sizeof(ddphdr));
-    ddphdr.deh_len = htons(sizeof(ddphdr) + (uint16_t) buflen);
+    ddphdr.deh_len = htons(sizeof(ddphdr) + (u_int16_t) buflen);
     ddphdr.deh_dnet = sat->sat_addr.s_net;
     ddphdr.deh_dnode = sat->sat_addr.s_node;
     ddphdr.deh_dport = sat->sat_port;

diff --git a/macros/iconv.m4 b/macros/iconv.m4
index a2406f4b393be5d520fa96dc05ef971f4a9c04c0..8a0fffdfcb95a877e632513203cb98200683bc30 100644 (file)
--- a/macros/iconv.m4
+++ b/macros/iconv.m4
@@ -18,7 +18,7 @@ dnl   # check for libiconv support
            LDFLAGS="$LDFLAGS -L$withval/lib"
            AC_CHECK_LIB(iconv, iconv_open, [
                                 ICONV_CFLAGS="-I$withval/include"
-                                ICONV_LIBS ="-L$withval/lib -liconv"
+                                ICONV_LIBS="-L$withval/lib -liconv"
             ])
            AC_DEFINE_UNQUOTED(WITH_LIBICONV, "${withval}",[Path to iconv])
            ;;

diff --git a/macros/quota-check.m4 b/macros/quota-check.m4
index aaee1a78c15f47205c434757a7821e1b5b801e83..8caee91dfb41ca2512785b4426c844b7425092dc 100644 (file)
--- a/macros/quota-check.m4
+++ b/macros/quota-check.m4
@@ -1,10 +1,11 @@
-dnl $Id: quota-check.m4,v 1.1 2001-12-01 15:25:54 srittau Exp $
+dnl $Id: quota-check.m4,v 1.1.12.1 2003-11-01 02:38:09 bfernhomberg Exp $
 dnl Autoconf macro to check for quota support
 dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_CHECK_QUOTA], [
        QUOTA_LIBS=
        AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS=-lrpcsvc])
+       AC_CHECK_HEADERS(rpc/rpc.h)
        AC_SUBST(QUOTA_LIBS)
 ])