--- makecode.c	2002-12-01 01:44:12.000000000 +0100
+++ etc/afpd/nls/makecode.c	2003-01-25 11:41:09.000000000 +0100
@@ -58,6 +58,25 @@
       0x00, 0x00, 0x00, 0x00, 0x00 */
 };
 
+static const unsigned char mac_to_isolatin1_test_map[] = {
+       0xC4, 0xC5, 0xC7, 0xC9, 0xD1, 0xD6, 0xDC, 0xE1,  /* 80 - 87 */
+       0xE0, 0xE2, 0xE4, 0xE3, 0xE5, 0xE7, 0xE9, 0xE8,  /* 88 - 8F */
+       0xEA, 0xEB, 0xED, 0xEC, 0xEE, 0xEF, 0xF1, 0xF3,  /* 90 - 97 */
+       0xF2, 0xF4, 0xF6, 0xF5, 0xFA, 0xF9, 0xFB, 0xFC,  /* 98 - 9F */
+       0x84, 0xB0, 0xA2, 0xA3, 0xA7, 0xB7, 0xB6, 0xDF,  /* A0 - A7 */
+       0xAE, 0xA9, 0x85, 0xB4, 0xA8, 0xAD, 0xC6, 0xD8,  /* A8 - AF */
+       0x86, 0xB1, 0xB2, 0xB3, 0xA5, 0xB5, 0x87, 0x88,  /* B0 - B7 */
+       0xBC, 0xB9, 0xBE, 0xAA, 0xBA, 0xBD, 0xE6, 0xF8,  /* B8 - BF */
+       0xBF, 0xA1, 0xAC, 0x89, 0x8A, 0x8B, 0x8C, 0xAB,  /* C0 - C7 */
+       0xBB, 0x8D, 0xA0, 0xC0, 0xC3, 0xD5, 0x8E, 0x8F,  /* C8 - CF */
+       0xD0, 0x90, 0x91, 0x92, 0x93, 0x94, 0xF7, 0xD7,  /* D0 - D7 */
+       0xFF, 0xDD, 0x80, 0xA4, 0x82, 0x83, 0xDE, 0x95,  /* D8 - DF */
+       0x96, 0x97, 0x98, 0x99, 0x9A, 0xC2, 0xCA, 0xC1,  /* E0 - E7 */
+       0xCB, 0xC8, 0xCD, 0xCE, 0xCF, 0xCC, 0xD3, 0xD4,  /* E8 - EF */
+       0xF0, 0xD2, 0xDA, 0xDB, 0xD9, 0x9B, 0x5E, 0x7E,  /* F0 - F7 */
+       0xAF, 0x9C, 0x9D, 0x9E, 0xB8, 0xFD, 0xFE, 0x9F,  /* F8 - FF */
+};
+
 /* Map of CP10000 (Mac Roman) to MSDOS CP 437 */
 static const unsigned char mac_to_cp437_map[] = {
     0x8e, 0x8f, 0x80, 0x90, 0xa5, 0x99, 0x9a, 0xa0,
@@ -133,6 +152,7 @@
                                      {"maccode.iso8859-1", mac_to_isolatin1_map, sizeof(mac_to_isolatin1_map), "iso8859-1"},
                                      {"maccode.iso8859-1.adapted", mac_to_isolatin1_adapted_map, sizeof(mac_to_isolatin1_adapted_map), "iso8859-1-adapted"},
                                      {"maccode.koi8-r",mac_to_koi8_r_map,sizeof(mac_to_koi8_r_map),"koi8-r"},
+				     {"maccode.iso8859-1.test", mac_to_isolatin1_test_map, sizeof(mac_to_isolatin1_test_map), "iso8859-1-test"},
                                      {NULL, NULL, 0, NULL}
                                  };
 
--- etc/afpd/nls/Makefile.am.orig	2002-12-01 02:33:39.000000000 +0100
+++ etc/afpd/nls/Makefile.am	2003-02-02 00:20:32.000000000 +0100
@@ -13,8 +13,10 @@
 	maccode.850			\
 	maccode.iso8859-1		\
 	maccode.iso8859-1.adapted	\
+	maccode.iso8859-1.test		\
 	maccode.koi8-r
 
+
 CFLAGS = -I$(top_srcdir)/sys -I$(top_srcdir)/etc/afpd @CFLAGS@
 
 $(MACCODES): makecode
--- ad_open.c	2003-01-24 07:58:25.000000000 +0100
+++ libatalk/adouble/ad_open.c	2003-01-24 20:55:45.000000000 +0100
@@ -199,7 +199,7 @@
 #define SHIFTDATA (AD_DATASZ2 - AD_DATASZ1)
 
   /* bail if we can't get a lock */
-  if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0) < 0) 
+  if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0, 0) < 0) 
     goto bail_err;
   
   if ((fd = open(path, O_RDWR)) < 0) 
@@ -270,7 +270,7 @@
   ad_rebuild_header(ad);
   munmap(buf, st.st_size + SHIFTDATA);
   close(fd);
-  ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
+  ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0);
 
   return 0;
   
@@ -279,7 +279,7 @@
 bail_open:
   close(fd);
 bail_lock:
-  ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0);
+  ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0);
 bail_err:
   return -1;
 }