--- libmal-0.40/configure	2004-01-29 22:00:34.000000000 -0500
+++ libmal-0.40-new/configure	2006-09-07 21:59:06.000000000 -0400
@@ -8401,7 +8401,7 @@
 
 for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
-   if test -r "$pilot_libs/libpisock.so" ; then
+   if test -r "$pilot_libs/libpisock.dylib" ; then
       pilotlibs=yes
       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
       break
--- libmal-0.40/malsync/mal/common/AGBase64.c	2000-05-14 17:17:36.000000000 -0400
+++ libmal-0.40-new/malsync/mal/common/AGBase64.c	2006-09-07 21:59:38.000000000 -0400
@@ -103,7 +103,7 @@
     int ixtext;
     int lentext;
     char ch, *ptr, *tptr;
-    char inbuf [3];
+    char inbuf [4];
     int ixinbuf;
     int ignorechar;
     int endtext = 0;
--- libmal-0.40/malsync/mal/common/AGNet.h	2003-08-09 14:52:30.000000000 -0400
+++ libmal-0.40-new/malsync/mal/common/AGNet.h	2006-09-07 21:59:06.000000000 -0400
@@ -61,7 +61,7 @@
 #               include <sys/filio.h>
 #               include <arpa/inet.h>
 #           else
-#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE)
+#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE) || defined(__APPLE__)
 #                   include <sys/ioctl.h>
 #                   include <arpa/inet.h>
 #               else
--- libmal-0.40/src/Makefile.in	2004-01-29 22:00:33.000000000 -0500
+++ libmal-0.40-new/src/Makefile.in	2006-09-07 21:59:06.000000000 -0400
@@ -198,7 +198,7 @@
 
 libmal_la_SOURCES = libmal.c libmal.h $(MAL_SRC) $(MAL_HDRS)
 
-libmal_la_LDFLAGS = $(PILOT_LIBS) -module -version-info 1:0:0
+libmal_la_LDFLAGS = $(PILOT_LIBS) -ldl -version-info 1:0:0
 
 c_header_DATA = libmal.h $(MAL_HDRS)
 c_headerdir = $(includedir)/libmal
--- libmal-0.40/src/libmal.c	2004-01-29 15:58:55.000000000 -0500
+++ libmal-0.40-new/src/libmal.c	2006-09-08 18:28:15.000000000 -0400
@@ -291,8 +291,7 @@
 
         rc = dlp_ReadRecordByIndex(sd, database_id, 0, 
                                    (void *)dev_db_info_buffer, 
-                                   &id, &dev_db_info_buffer_size, 
-                                   &attr, &cat);
+                                   &id, &attr, &cat);
     
 
         if (rc >= 0) {
@@ -614,7 +613,7 @@
     AGBufferReader * r = NULL;
 
     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
-                               &id, &bufferSize, &attr, &cat);
+                               &id, &attr, &cat);
     
     if (rc < 0) {
         if (verbose)
@@ -652,7 +651,7 @@
     AGBufferReader * r = NULL;
 
     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
-                               &id, &bufferSize, &attr, &cat);
+                               &id, &attr, &cat);
     
     if (rc < 0) {
         if (verbose)
@@ -712,7 +711,7 @@
         }
 
         result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
-                                   &id, &bufferSize, &attr, &cat);
+                                   &id, &attr, &cat);
         
         if (result < 0)
             id = 0;
@@ -1027,11 +1026,11 @@
     result = (modonly) ?
         dlp_ReadNextModifiedRec (pInfo->sd, pInfo->pilot_rHandle, pInfo->pilot_buffer,
                                  &pInfo->id, &idx,
-                                 &size, &att, &cat)
+                                 &att, &cat)
         :
         dlp_ReadRecordByIndex(pInfo->sd, pInfo->pilot_rHandle, idx,
                               pInfo->pilot_buffer, &pInfo->id,
-                              &size, &att, &cat);
+                              &att, &cat);
     
     if (result < 0) {
         closeDatabase(pInfo);
@@ -1388,7 +1387,6 @@
                                    0, 
                                    (void *)version_buffer, 
                                    &id, 
-                                   &version_buffer_size,
                                    &attr, 
                                    &cat);