File netatalk-branch-netatalk-2-0.patch of Package netatalk

Overview Repositories Revisions Requests Users Attributes Meta

File netatalk-branch-netatalk-2-0.patch of Package netatalk (Revision 70dc6a15cfdf3177be593524fcadf805)

Currently displaying revision 70dc6a15cfdf3177be593524fcadf805 , Show latest

Index: Makefile.am
===================================================================
RCS file: /cvsroot/netatalk/netatalk/Makefile.am,v
retrieving revision 1.15.6.1
retrieving revision 1.15.6.1.2.1
diff -u -p -p -u -r1.15.6.1 -r1.15.6.1.2.1
--- Makefile.am	23 Aug 2004 23:02:55 -0000	1.15.6.1
+++ Makefile.am	19 Oct 2005 17:48:50 -0000	1.15.6.1.2.1
@@ -6,3 +6,5 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPY
 	TODO VERSION services.atalk
 
 ACLOCAL_AMFLAGS = -I macros
+AUTOMAKE_OPTIONS = foreign
+
Index: configure.in
===================================================================
RCS file: /cvsroot/netatalk/netatalk/configure.in,v
retrieving revision 1.179.2.3.2.37.2.4
retrieving revision 1.179.2.3.2.37.2.5
diff -u -p -p -u -r1.179.2.3.2.37.2.4 -r1.179.2.3.2.37.2.5
--- configure.in	13 Apr 2005 10:21:09 -0000	1.179.2.3.2.37.2.4
+++ configure.in	27 Sep 2005 10:40:40 -0000	1.179.2.3.2.37.2.5
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.37.2.4 2005/04/13 10:21:09 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.37.2.5 2005/09/27 10:40:40 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -554,6 +554,16 @@ AC_ARG_WITH(uams-path,
 
 NETATALK_AC_CUPS
 
+dnl check if we can use attribute unused (gcc only) from ethereal
+AC_MSG_CHECKING(to see if we can add '__attribute__((unused))' to CFLAGS)
+if test x$GCC != x ; then
+  CFLAGS="-D_U_=\"__attribute__((unused))\" $CFLAGS"
+  AC_MSG_RESULT(yes)
+else
+  CFLAGS="-D_U_=\"\" $CFLAGS"
+  AC_MSG_RESULT(no)
+fi
+
 dnl --------------------------------------------------------------------------
 dnl FHS stuff has to be done last because it overrides other defaults
 dnl --------------------------------------------------------------------------
Index: bin/aecho/aecho.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/aecho/aecho.c,v
retrieving revision 1.5.10.1
retrieving revision 1.5.10.1.4.1
diff -u -p -p -u -r1.5.10.1 -r1.5.10.1.4.1
--- bin/aecho/aecho.c	21 Jul 2003 05:50:53 -0000	1.5.10.1
+++ bin/aecho/aecho.c	27 Sep 2005 10:40:40 -0000	1.5.10.1.4.1
@@ -1,5 +1,5 @@
 /*
- * $Id: aecho.c,v 1.5.10.1 2003/07/21 05:50:53 didg Exp $
+ * $Id: aecho.c,v 1.5.10.1.4.1 2005/09/27 10:40:40 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -60,20 +60,21 @@
 #endif /* ! SOCKLEN_T */
 
 struct sockaddr_at	target;
-int			s, nsent = 0, nrecv = 0;
+int			sock;
+unsigned int		nsent = 0, nrecv = 0;
 time_t			totalms = 0, minms = -1, maxms = -1;
-static unsigned int     pings = 0;
+unsigned int     	pings = 0;
 
 void usage(char *);
 
 void done()
 {
-    if ( nsent > 0 ) {
+    if ( nsent) {
 	printf( "\n----%d.%d AEP Statistics----\n",
 		ntohs( target.sat_addr.s_net ), target.sat_addr.s_node );
 	printf( "%d packets sent, %d packets received, %d%% packet loss\n",
 		nsent, nrecv, (( nsent - nrecv ) * 100 ) / nsent );
-	if ( nrecv > 0 ) {
+	if ( nrecv ) {
 	    printf( "round-trip (ms)  min/avg/max = %ld/%ld/%ld\n",
 		    minms, totalms / nrecv, maxms );
 	}	
@@ -101,7 +102,7 @@ void aep_send()
     memcpy( p, &tv, sizeof( struct timeval ));
     p += sizeof( struct timeval );
 
-    if ( netddp_sendto( s, buf, p - buf, 0, (struct sockaddr *) &target,
+    if ( netddp_sendto( sock, buf, p - buf, 0, (struct sockaddr *) &target,
 	    sizeof( struct sockaddr_at )) < 0 ) {
 	perror( "sendto" );
 	exit( 1 );
@@ -182,7 +183,7 @@ int main( ac, av )
     }
     target.sat_port = port;
 
-    if ((s = netddp_open(saddr.sat_addr.s_net || saddr.sat_addr.s_node ? 
+    if ((sock = netddp_open(saddr.sat_addr.s_net || saddr.sat_addr.s_node ? 
 			 &saddr : NULL, NULL)) < 0) {
        perror("ddp_open");
        exit(1);
@@ -218,7 +219,7 @@ int main( ac, av )
 
     for (;;) {
 	satlen = sizeof( struct sockaddr_at );
-	if (( cc = netddp_recvfrom( s, buf, sizeof( buf ), 0, 
+	if (( cc = netddp_recvfrom( sock, buf, sizeof( buf ), 0, 
 				    (struct sockaddr *) &sat,
 				    &satlen )) < 0 ) {
 	    if ( errno == EINTR ) {
Index: bin/cnid/cnid_index.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/cnid/cnid_index.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.6
diff -u -p -p -u -r1.1.2.4 -r1.1.2.6
--- bin/cnid/cnid_index.c	10 Apr 2005 12:49:18 -0000	1.1.2.4
+++ bin/cnid/cnid_index.c	27 Sep 2005 10:40:40 -0000	1.1.2.6
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_index.c,v 1.1.2.4 2005/04/10 12:49:18 didg Exp $
+ * $Id: cnid_index.c,v 1.1.2.6 2005/09/27 10:40:40 didg Exp $
  *
  * All Rights Reserved.  See COPYING.
  */
@@ -73,8 +73,8 @@ static char *old_dbfiles[] = {"cnid.db",
 
 /* --------------- */
 int didname(dbp, pkey, pdata, skey)
-DB *dbp;
-const DBT *pkey, *pdata;
+DB *dbp _U_;
+const DBT *pkey _U_, *pdata;
 DBT *skey;
 {
 int len;
@@ -91,8 +91,8 @@ int len;
  
 /* --------------- */
 int devino(dbp, pkey, pdata, skey)
-DB *dbp;
-const DBT *pkey, *pdata;
+DB *dbp _U_;
+const DBT *pkey _U_, *pdata;
 DBT *skey;
 {
     memset(skey, 0, sizeof(DBT));
@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
     DB_BTREE_STAT *sp;
     DB *db = db_table[dbi].db;
 
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+    ret = db->stat(db, db_txn, &sp, 0);
+#else
     ret = db->stat(db, &sp, 0);
+#endif
 
     if (ret) {
         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
Index: bin/megatron/asingle.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/megatron/asingle.c,v
retrieving revision 1.8.6.1.4.1
retrieving revision 1.8.6.1.4.2
diff -u -p -p -u -r1.8.6.1.4.1 -r1.8.6.1.4.2
--- bin/megatron/asingle.c	6 Feb 2005 10:16:00 -0000	1.8.6.1.4.1
+++ bin/megatron/asingle.c	27 Sep 2005 10:40:40 -0000	1.8.6.1.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: asingle.c,v 1.8.6.1.4.1 2005/02/06 10:16:00 didg Exp $
+ * $Id: asingle.c,v 1.8.6.1.4.2 2005/09/27 10:40:40 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ u_char		header_buf[ AD_HEADER_LEN ];
 
 int single_open( singlefile, flags, fh, options )
     char		*singlefile;
-    int			flags, options;
+    int			flags, options _U_;
     struct FHeader	*fh;
 {
     int			rc;
@@ -268,7 +268,7 @@ int single_header_read( fh, version )
  * Unless I can't get the current date, in which case use time zero.
  */
     if (( date_entry < 7 ) || ( date_entry > 8 )) {
-	if (( time_seconds = time( NULL )) == -1 ) {
+	if (( time_seconds = time( NULL )) == (u_int32_t)-1 ) {
 	    time_seconds = AD_DATE_START;
 	} else {
 	    time_seconds = AD_DATE_FROM_UNIX(time_seconds);
@@ -344,11 +344,11 @@ u_char		sixteennulls[] = { 0, 0, 0, 0, 0
 
 int single_header_test(void)
 {
-    int			cc;
+    ssize_t		cc;
     u_int32_t		templong;
 
     cc = read( single.filed, (char *)header_buf, sizeof( header_buf ));
-    if ( cc < sizeof( header_buf )) {
+    if ( cc < (ssize_t)sizeof( header_buf )) {
 	perror( "Premature end of file :" );
 	return( -1 );
     }
@@ -398,7 +398,7 @@ int single_header_test(void)
 int single_read( fork, buffer, length )
     int			fork;
     char		*buffer;
-    int			length;
+    u_int32_t		length;
 {
     u_int32_t		entry_id;
     char		*buf_ptr;
Index: bin/megatron/asingle.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/megatron/asingle.h,v
retrieving revision 1.2
retrieving revision 1.2.16.1
diff -u -p -p -u -r1.2 -r1.2.16.1
--- bin/megatron/asingle.h	29 Jun 2001 14:14:46 -0000	1.2
+++ bin/megatron/asingle.h	27 Sep 2005 10:40:40 -0000	1.2.16.1
@@ -1,5 +1,5 @@
 /*
- * $Id: asingle.h,v 1.2 2001/06/29 14:14:46 rufustfirefly Exp $
+ * $Id: asingle.h,v 1.2.16.1 2005/09/27 10:40:40 didg Exp $
  */
 
 #ifndef _ASINGLE_H
@@ -12,6 +12,6 @@ int single_open(char *singlefile, int fl
 int single_close(int readflag);
 int single_header_read(struct FHeader *fh, int version);
 int single_header_test(void);
-int single_read(int fork, char *buffer, int length);
+int single_read(int fork, char *buffer, u_int32_t length);
 
 #endif /* _ASINGLE_H */
Index: bin/megatron/hqx.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/megatron/hqx.c,v
retrieving revision 1.12.4.1.4.1
retrieving revision 1.12.4.1.4.2
diff -u -p -p -u -r1.12.4.1.4.1 -r1.12.4.1.4.2
--- bin/megatron/hqx.c	6 Feb 2005 10:16:00 -0000	1.12.4.1.4.1
+++ bin/megatron/hqx.c	27 Sep 2005 10:40:40 -0000	1.12.4.1.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: hqx.c,v 1.12.4.1.4.1 2005/02/06 10:16:00 didg Exp $
+ * $Id: hqx.c,v 1.12.4.1.4.2 2005/09/27 10:40:40 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -393,7 +393,7 @@ int hqx_header_read( fh )
  */
 
 int hqx_header_write( fh )
-    struct FHeader	*fh;
+    struct FHeader	*fh _U_;
 {
     return( -1 );
 }
Index: bin/megatron/megatron.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/megatron/megatron.c,v
retrieving revision 1.9
retrieving revision 1.9.10.1
diff -u -p -p -u -r1.9 -r1.9.10.1
--- bin/megatron/megatron.c	29 Apr 2002 01:52:49 -0000	1.9
+++ bin/megatron/megatron.c	27 Sep 2005 10:40:40 -0000	1.9.10.1
@@ -1,5 +1,5 @@
 /*
- * $Id: megatron.c,v 1.9 2002/04/29 01:52:49 morgana Exp $
+ * $Id: megatron.c,v 1.9.10.1 2005/09/27 10:40:40 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -191,7 +191,7 @@ int megatron( path, module, newname, fla
     struct FHeader	fh;
     int			bufc;
     int			fork;
-    int			forkred;
+    unsigned int	forkred;
 
 /*
  * If the source file is not stdin, make sure it exists and
Index: bin/uniconv/iso8859_1_adapted.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/uniconv/iso8859_1_adapted.c,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -p -p -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- bin/uniconv/iso8859_1_adapted.c	6 Feb 2005 10:16:00 -0000	1.1.2.1.2.1
+++ bin/uniconv/iso8859_1_adapted.c	27 Sep 2005 10:40:40 -0000	1.1.2.1.2.2
@@ -48,7 +48,7 @@ struct charset_functions charset_iso8859
  * from unicode to iso8859_adapted code page
 */
 
-static size_t iso8859_adapted_push( void *cd, char **inbuf, size_t *inbytesleft,
+static size_t iso8859_adapted_push( void *cd _U_, char **inbuf, size_t *inbytesleft,
                          char **outbuf, size_t *outbytesleft)
 {
     int len = 0;
@@ -102,7 +102,7 @@ static size_t iso8859_adapted_push( void
 }
 
 /* ------------------------ */
-static size_t iso8859_adapted_pull ( void *cd, char **inbuf, size_t *inbytesleft,
+static size_t iso8859_adapted_pull ( void *cd _U_, char **inbuf, size_t *inbytesleft,
                          char **outbuf, size_t *outbytesleft)
 {
     unsigned char  *inptr;
Index: bin/uniconv/uniconv.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/bin/uniconv/uniconv.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -p -p -u -r1.1.2.6 -r1.1.2.6.2.1
--- bin/uniconv/uniconv.c	12 Jul 2004 00:15:18 -0000	1.1.2.6
+++ bin/uniconv/uniconv.c	27 Sep 2005 10:40:40 -0000	1.1.2.6.2.1
@@ -242,7 +242,7 @@ static int check_dirent(char** name, cni
 	return ret;
 }
 
-static int check_adouble(DIR *curdir, char * path)
+static int check_adouble(DIR *curdir, char * path _U_)
 {
 	DIR *adouble;
 	struct dirent* entry;
Index: config/AppleVolumes.default.tmpl
===================================================================
RCS file: /cvsroot/netatalk/netatalk/config/AppleVolumes.default.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -p -p -u -r1.1.2.2 -r1.1.2.2.2.1
--- config/AppleVolumes.default.tmpl	18 Nov 2003 12:30:47 -0000	1.1.2.2
+++ config/AppleVolumes.default.tmpl	2 Jun 2005 12:49:40 -0000	1.1.2.2.2.1
@@ -59,6 +59,8 @@
 # maccharset           -> specifies the charset to be used as the mac client codepage
 #                         e.g. "MAC_ROMAN", "MAC_CYRILLIC"
 #
+# perm                -> default permission value OR with the client requested perm
+#
 # miscellaneous options [syntax: options:option1,option2]:
 # prodos              -> make compatible with appleII clients.
 # crlf                -> enable crlf translation for TEXT files.
Index: etc/afpd/afp_asp.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/afp_asp.c,v
retrieving revision 1.18.6.6
retrieving revision 1.18.6.6.2.1
diff -u -p -p -u -r1.18.6.6 -r1.18.6.6.2.1
--- etc/afpd/afp_asp.c	4 May 2004 15:38:23 -0000	1.18.6.6
+++ etc/afpd/afp_asp.c	27 Sep 2005 10:40:40 -0000	1.18.6.6.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_asp.c,v 1.18.6.6 2004/05/04 15:38:23 didg Exp $
+ * $Id: afp_asp.c,v 1.18.6.6.2.1 2005/09/27 10:40:40 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -196,7 +196,7 @@ static void afp_asp_reload()
 
 /* ---------------------- */
 #ifdef SERVERTEXT
-static void afp_asp_getmesg (int sig)
+static void afp_asp_getmesg (int sig _U_)
 {
     readmessage(child);
     asp_attention(child->handle, AFPATTN_MESG | AFPATTN_TIME(5));
Index: etc/afpd/afp_config.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/afp_config.c,v
retrieving revision 1.22.6.9.2.2
retrieving revision 1.22.6.9.2.3
diff -u -p -p -u -r1.22.6.9.2.2 -r1.22.6.9.2.3
--- etc/afpd/afp_config.c	31 Jan 2005 17:00:38 -0000	1.22.6.9.2.2
+++ etc/afpd/afp_config.c	27 Sep 2005 10:40:40 -0000	1.22.6.9.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_config.c,v 1.22.6.9.2.2 2005/01/31 17:00:38 didg Exp $
+ * $Id: afp_config.c,v 1.22.6.9.2.3 2005/09/27 10:40:40 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -96,7 +96,7 @@ void configfree(AFPConfig *configs, cons
 }
 
 #ifdef USE_SRVLOC
-static void SRVLOC_callback(SLPHandle hslp, SLPError errcode, void *cookie) {
+static void SRVLOC_callback(SLPHandle hslp _U_, SLPError errcode, void *cookie) {
     *(SLPError*)cookie = errcode;
 }
 
@@ -535,7 +535,7 @@ AFPConfig *configinit(struct afp_options
     FILE *fp;
     char buf[LINESIZE + 1], *p, have_option = 0;
     struct afp_options options;
-    AFPConfig *config, *first = NULL; /* uninitialized, OK 310105 */
+    AFPConfig *config=NULL, *first = NULL; 
 
     status_reset();
     /* if config file doesn't exist, load defaults */
Index: etc/afpd/afp_dsi.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/afp_dsi.c,v
retrieving revision 1.27.2.3.2.4.2.1
retrieving revision 1.27.2.3.2.4.2.2
diff -u -p -p -u -r1.27.2.3.2.4.2.1 -r1.27.2.3.2.4.2.2
--- etc/afpd/afp_dsi.c	31 Mar 2005 00:25:55 -0000	1.27.2.3.2.4.2.1
+++ etc/afpd/afp_dsi.c	27 Sep 2005 10:40:40 -0000	1.27.2.3.2.4.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_dsi.c,v 1.27.2.3.2.4.2.1 2005/03/31 00:25:55 didg Exp $
+ * $Id: afp_dsi.c,v 1.27.2.3.2.4.2.2 2005/09/27 10:40:40 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -166,7 +166,7 @@ static void afp_dsi_reload()
 
 /* ---------------------- */
 #ifdef SERVERTEXT
-static void afp_dsi_getmesg (int sig)
+static void afp_dsi_getmesg (int sig _U_)
 {
     readmessage(child.obj);
     dsi_attention(child.obj->handle, AFPATTN_MESG | AFPATTN_TIME(5));
Index: etc/afpd/appl.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/appl.c,v
retrieving revision 1.12.2.1.2.2.2.1
retrieving revision 1.12.2.1.2.2.2.2
diff -u -p -p -u -r1.12.2.1.2.2.2.1 -r1.12.2.1.2.2.2.2
--- etc/afpd/appl.c	6 Feb 2005 10:16:00 -0000	1.12.2.1.2.2.2.1
+++ etc/afpd/appl.c	27 Sep 2005 10:40:41 -0000	1.12.2.1.2.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: appl.c,v 1.12.2.1.2.2.2.1 2005/02/06 10:16:00 didg Exp $
+ * $Id: appl.c,v 1.12.2.1.2.2.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -160,9 +160,9 @@ char	*path;
 
 
 int afp_addappl(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -250,9 +250,9 @@ int		ibuflen, *rbuflen;
 }
 
 int afp_rmvappl(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -324,9 +324,9 @@ int		ibuflen, *rbuflen;
 }
 
 int afp_getappl(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     char		*p, *q;
Index: etc/afpd/auth.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/auth.c,v
retrieving revision 1.44.2.3.2.15.2.3
retrieving revision 1.44.2.3.2.15.2.4
diff -u -p -p -u -r1.44.2.3.2.15.2.3 -r1.44.2.3.2.15.2.4
--- etc/afpd/auth.c	11 Mar 2005 15:36:58 -0000	1.44.2.3.2.15.2.3
+++ etc/afpd/auth.c	27 Sep 2005 10:40:41 -0000	1.44.2.3.2.15.2.4
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.44.2.3.2.15.2.3 2005/03/11 15:36:58 didg Exp $
+ * $Id: auth.c,v 1.44.2.3.2.15.2.4 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -154,18 +154,17 @@ static int send_reply(const AFPObj *obj,
     return AFP_OK;
 }
 
-
 static int afp_errpwdexpired(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf _U_, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     *rbuflen = 0;
     return AFPERR_PWDEXPR;
 }
 
 
-static int set_auth_switch(AFPObj *obj, int expired)
+static int set_auth_switch(int expired)
 {
     int i;
 
@@ -364,7 +363,7 @@ static int login(AFPObj *obj, struct pas
 #endif /* ADMIN_GRP */
         uuid = pwd->pw_uid;
 
-    set_auth_switch(obj, expired);
+    set_auth_switch(expired);
 
     obj->logout = logout;
 
@@ -379,8 +378,8 @@ static int login(AFPObj *obj, struct pas
 /* ---------------------- */
 int afp_zzz (obj, ibuf, ibuflen, rbuf, rbuflen ) /* Function 122 */
 AFPObj       *obj;
-char         *ibuf, *rbuf;
-unsigned int ibuflen, *rbuflen;
+char         *ibuf  _U_, *rbuf;
+unsigned int ibuflen  _U_, *rbuflen;
 {
     u_int32_t	retdata;
 
@@ -530,9 +529,9 @@ unsigned int ibuflen, *rbuflen;
 
 /* ---------------------- */
 int afp_disconnect(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj  _U_;
+char	*ibuf, *rbuf  _U_;
+int	ibuflen  _U_, *rbuflen;
 {
     u_int16_t           type;
 
@@ -827,8 +826,8 @@ int		ibuflen, *rbuflen;
 
 int afp_logout(obj, ibuf, ibuflen, rbuf, rbuflen)
 AFPObj     *obj;
-char       *ibuf, *rbuf;
-int        ibuflen, *rbuflen;
+char       *ibuf _U_, *rbuf  _U_;
+int        ibuflen  _U_, *rbuflen  _U_;
 {
     LOG(log_info, logtype_afpd, "logout %s", obj->username);
     close_all_vol();
@@ -906,7 +905,7 @@ int		ibuflen, *rbuflen;
         (ret == AFPERR_AUTHCONT) ? "continued" :
         (ret ? "failed" : "succeeded"));
     if ( ret == AFP_OK )
-	set_auth_switch(obj, 0);
+	set_auth_switch(0);
 	
     return ret;
 }
@@ -914,9 +913,9 @@ int		ibuflen, *rbuflen;
 
 /* FPGetUserInfo */
 int afp_getuserinfo(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     u_int8_t  thisuser;
     u_int32_t id;
Index: etc/afpd/catsearch.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/catsearch.c,v
retrieving revision 1.10.2.3.2.6.2.4
retrieving revision 1.10.2.3.2.6.2.5
diff -u -p -p -u -r1.10.2.3.2.6.2.4 -r1.10.2.3.2.6.2.5
--- etc/afpd/catsearch.c	2 May 2005 16:34:23 -0000	1.10.2.3.2.6.2.4
+++ etc/afpd/catsearch.c	27 Sep 2005 10:40:41 -0000	1.10.2.3.2.6.2.5
@@ -663,7 +663,7 @@ catsearch_end: /* Exiting catsearch: err
 } /* catsearch() */
 
 /* -------------------------- */
-int catsearch_afp(AFPObj *obj, char *ibuf, int ibuflen,
+int catsearch_afp(AFPObj *obj _U_, char *ibuf, int ibuflen,
                   char *rbuf, int *rbuflen, int ext)
 {
     struct vol *vol;
Index: etc/afpd/desktop.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/desktop.c,v
retrieving revision 1.26.2.4.2.18.2.2
retrieving revision 1.26.2.4.2.18.2.3
diff -u -p -p -u -r1.26.2.4.2.18.2.2 -r1.26.2.4.2.18.2.3
--- etc/afpd/desktop.c	10 Feb 2005 01:23:10 -0000	1.26.2.4.2.18.2.2
+++ etc/afpd/desktop.c	27 Sep 2005 10:40:41 -0000	1.26.2.4.2.18.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.c,v 1.26.2.4.2.18.2.2 2005/02/10 01:23:10 didg Exp $
+ * $Id: desktop.c,v 1.26.2.4.2.18.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * See COPYRIGHT.
  *
@@ -41,9 +41,9 @@
 
 
 int afp_opendt(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     u_int16_t	vid;
@@ -62,9 +62,9 @@ int		ibuflen, *rbuflen;
 }
 
 int afp_closedt(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf _U_, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     *rbuflen = 0;
     return( AFP_OK );
@@ -127,9 +127,9 @@ int mode;
 }
 
 int afp_addicon(obj, ibuf, ibuflen, rbuf, rbuflen)
-AFPObj      *obj;
+AFPObj  *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
 #ifndef NO_DDP
@@ -311,11 +311,11 @@ addicon_err:
     return( AFP_OK );
 }
 
-static u_char	utag[] = { 0, 0, 0, 0 };
-static u_char	ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/
-static u_char	utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/
-static short	usize = 256;
-static u_char	uicon[] = {
+static const u_char	utag[] = { 0, 0, 0, 0 };
+static const u_char	ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/
+static const u_char	utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/
+static const short	usize = 256;
+static const u_char	uicon[] = {
     0x1F, 0xFF, 0xFC, 0x00, 0x10, 0x00, 0x06, 0x00,
     0x10, 0x00, 0x05, 0x00, 0x10, 0x00, 0x04, 0x80,
     0x10, 0x00, 0x04, 0x40, 0x10, 0x00, 0x04, 0x20,
@@ -351,9 +351,9 @@ static u_char	uicon[] = {
 };
 
 int afp_geticoninfo(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     u_char	fcreator[ 4 ], ih[ 12 ];
@@ -425,9 +425,9 @@ int		ibuflen, *rbuflen;
 
 
 int afp_geticon(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     off_t       offset;
@@ -574,7 +574,7 @@ geticon_exit:
 }
 
 /* ---------------------- */
-static char		hexdig[] = "0123456789abcdef";
+static const char		hexdig[] = "0123456789abcdef";
 char *dtfile(const struct vol *vol, u_char creator[], char *ext )
 {
     static char	path[ MAXPATHLEN + 1];
@@ -757,9 +757,9 @@ static int ad_addcomment(struct vol *vol
 
 /* ----------------------------- */
 int afp_addcomment(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj      *obj _U_;
+char	*ibuf, *rbuf _U_;
+int		ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -837,9 +837,9 @@ static int ad_getcomment(struct vol *vol
 
 /* -------------------- */
 int afp_getcomment(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj      *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int		ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -912,9 +912,9 @@ static int ad_rmvcomment(struct vol *vol
 
 /* ----------------------- */
 int afp_rmvcomment(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj      *obj _U_;
+char	*ibuf, *rbuf _U_;
+int		ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
Index: etc/afpd/directory.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/directory.c,v
retrieving revision 1.71.2.4.2.15.2.5
retrieving revision 1.71.2.4.2.15.2.8
diff -u -p -p -u -r1.71.2.4.2.15.2.5 -r1.71.2.4.2.15.2.8
--- etc/afpd/directory.c	10 Feb 2005 01:23:10 -0000	1.71.2.4.2.15.2.5
+++ etc/afpd/directory.c	27 Sep 2005 10:40:41 -0000	1.71.2.4.2.15.2.8
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.71.2.4.2.15.2.5 2005/02/10 01:23:10 didg Exp $
+ * $Id: directory.c,v 1.71.2.4.2.15.2.8 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -1116,7 +1116,7 @@ char	**cpath;
                     static char	temp[ MAXPATHLEN + 1];
 
                     /* not an UTF8 name */
-                    if (mtoUTF8(vol, path, strlen(path), temp, MAXPATHLEN) == -1) {
+                    if (mtoUTF8(vol, path, strlen(path), temp, MAXPATHLEN) == (size_t)-1) {
                         afp_errno = AFPERR_PARAM;
                         return( NULL );
                     }
@@ -1542,9 +1542,9 @@ int path_error(struct path *path, int er
 
 /* ----------------------------- */
 int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     struct dir	*dir;
@@ -1639,7 +1639,7 @@ int setdirparams(const struct vol *vol, 
 
     char                *upath;
     struct dir          *dir;
-    int			bit, aint, isad = 1;
+    int			bit, isad = 1;
     int                 cdate, bdate;
     int                 owner, group;
     u_int16_t		ashort, bshort;
@@ -1650,7 +1650,7 @@ int setdirparams(const struct vol *vol, 
     u_int16_t           bitmap = d_bitmap;
     u_char              finder_buf[32];
     u_int32_t		upriv;
-    mode_t              mpriv;          /* uninitialized, OK 310105 */
+    mode_t              mpriv = 0;        
     u_int16_t           upriv_bit = 0;
 
     bit = 0;
@@ -1704,7 +1704,7 @@ int setdirparams(const struct vol *vol, 
             ma.ma_world = *buf++;
             ma.ma_group = *buf++;
             ma.ma_owner = *buf++;
-            mpriv = mtoumode( &ma );
+            mpriv = mtoumode( &ma ) | vol->v_perm;
             if (dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) {
                 err = set_dir_errors(path, "setdirmode", errno);
                 bitmap = 0;
@@ -1724,20 +1724,21 @@ int setdirparams(const struct vol *vol, 
             break;
 	case DIRPBIT_UNIXPR :
 	    if (vol_unix_priv(vol)) {
-	        /* Skip UID and GID for now, there seems to be no way to set them from an OSX client anyway */
-                buf += sizeof( aint );
-                buf += sizeof( aint );
+                memcpy( &owner, buf, sizeof(owner)); /* FIXME need to change owner too? */
+                buf += sizeof( owner );
+                memcpy( &group, buf, sizeof( group ));
+                buf += sizeof( group );
 
                 change_mdate = 1;
                 change_parent_mdate = 1;
                 memcpy( &upriv, buf, sizeof( upriv ));
                 buf += sizeof( upriv );
-                upriv = ntohl (upriv);
+                upriv = ntohl (upriv) | vol->v_perm;
                 if (dir_rx_set(upriv)) {
                     /* maybe we are trying to set perms back */
                     if ( setdirunixmode(vol, upath, upriv) < 0 ) {
                         bitmap = 0;
-                        err = set_dir_errors(path, "setdirmode", errno);
+                        err = set_dir_errors(path, "setdirunixmode", errno);
                     }
                 }
                 else {
@@ -1855,27 +1856,14 @@ int setdirparams(const struct vol *vol, 
                 goto setdirparam_done;
             }
             break;
-
         case DIRPBIT_GID :
             if (dir->d_did == DIRDID_ROOT)
                 setdeskowner( -1, ntohl(group) ); 
-
-#if 0       /* don't error if we can't set the desktop owner. */
-                err = set_dir_errors(path, "setdeskowner", errno);
-                if (isad && err == AFPERR_PARAM) {
-                    err = AFP_OK; /* ???*/
-                }
-                else {
-                    goto setdirparam_done;
-                }
-#endif /* 0 */
-
             if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) {
                 err = set_dir_errors(path, "setdirowner", errno);
                 goto setdirparam_done;
             }
             break;
-
         case DIRPBIT_ACCESS :
             if (dir->d_did == DIRDID_ROOT) {
                 setdeskmode(mpriv);
@@ -1900,21 +1888,29 @@ int setdirparams(const struct vol *vol, 
 	case DIRPBIT_UNIXPR :
 	    if (vol_unix_priv(vol)) {
                 if (dir->d_did == DIRDID_ROOT) {
-                    setdeskmode( upriv );
                     if (!dir_rx_set(upriv)) {
                         /* we can't remove read and search for owner on volume root */
                         err = AFPERR_ACCESS;
                         goto setdirparam_done;
                     }
+                    setdeskowner( -1, ntohl(group) ); 
+                    setdeskmode( upriv );
+                }
+                if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) {
+                    err = set_dir_errors(path, "setdirowner", errno);
+                    goto setdirparam_done;
                 }
 
                 if ( upriv_bit && setdirunixmode(vol, upath, upriv) < 0 ) {
-                    err = set_dir_errors(path, "setdirmode", errno);
+                    err = set_dir_errors(path, "setdirunixmode", errno);
                     goto setdirparam_done;
                 }
-                break;
             }
-            /* fall through */
+            else {
+                err = AFPERR_BITMAP;
+                goto setdirparam_done;
+            }
+            break;
         default :
             err = AFPERR_BITMAP;
             goto setdirparam_done;
@@ -1963,9 +1959,9 @@ setdirparam_done:
 }
 
 int afp_createdir(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct adouble	ad;
     struct vol		*vol;
@@ -2257,9 +2253,9 @@ delete_done:
 }
 
 int afp_mapid(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct passwd	*pw;
     struct group	*gr;
@@ -2330,9 +2326,9 @@ int		ibuflen, *rbuflen;
 }
 
 int afp_mapname(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct passwd	*pw;
     struct group	*gr;
@@ -2394,9 +2390,9 @@ int		ibuflen, *rbuflen;
   variable DID support 
 */
 int afp_closedir(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf _U_, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
 #if 0
     struct vol   *vol;
@@ -2433,9 +2429,9 @@ int		ibuflen, *rbuflen;
  * there's a pb again with case but move it to cname
 */
 int afp_opendir(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen  _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*parentdir;
Index: etc/afpd/enumerate.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/enumerate.c,v
retrieving revision 1.39.2.2.2.5
retrieving revision 1.39.2.2.2.5.2.1
diff -u -p -p -u -r1.39.2.2.2.5 -r1.39.2.2.2.5.2.1
--- etc/afpd/enumerate.c	20 Jun 2004 15:10:14 -0000	1.39.2.2.2.5
+++ etc/afpd/enumerate.c	27 Sep 2005 10:40:41 -0000	1.39.2.2.2.5.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: enumerate.c,v 1.39.2.2.2.5 2004/06/20 15:10:14 bfernhomberg Exp $
+ * $Id: enumerate.c,v 1.39.2.2.2.5.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -110,7 +110,7 @@ struct savedir {
 };
 #define SDBUFBRK	2048
 
-static int enumerate_loop(struct dirent *de, char *mname, void *data)
+static int enumerate_loop(struct dirent *de, char *mname _U_, void *data)
 {
     struct savedir *sd = data; 
     char *start, *end;
@@ -221,9 +221,9 @@ for_each_dirent(const struct vol *vol, c
 
 /* ----------------------------- */
 static int enumerate(obj, ibuf, ibuflen, rbuf, rbuflen, ext )
-AFPObj       *obj;
+AFPObj       *obj _U_;
 char	     *ibuf, *rbuf;
-unsigned int ibuflen, *rbuflen;
+unsigned int ibuflen _U_, *rbuflen;
 int     ext;
 {
     static struct savedir	sd = { 0, 0, 0, NULL, NULL, 0 };
Index: etc/afpd/file.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/file.c,v
retrieving revision 1.92.2.2.2.31.2.13
retrieving revision 1.92.2.2.2.31.2.15
diff -u -p -p -u -r1.92.2.2.2.31.2.13 -r1.92.2.2.2.31.2.15
--- etc/afpd/file.c	28 Apr 2005 09:24:04 -0000	1.92.2.2.2.31.2.13
+++ etc/afpd/file.c	27 Sep 2005 10:40:41 -0000	1.92.2.2.2.31.2.15
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.92.2.2.2.31.2.13 2005/04/28 09:24:04 didg Exp $
+ * $Id: file.c,v 1.92.2.2.2.31.2.15 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -584,9 +584,9 @@ int getfilparams(struct vol *vol,
 
 /* ----------------------------- */
 int afp_createfile(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct adouble	ad, *adp;
     struct vol		*vol;
@@ -710,9 +710,9 @@ createfile_done:
 }
 
 int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     struct dir	*dir;
@@ -1199,9 +1199,9 @@ u_int32_t   hint;
 /* -----------------------------------
 */
 int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*s_vol, *d_vol;
     struct dir	*dir;
@@ -1405,6 +1405,7 @@ static int copy_fd(int dfd, int sfd)
 /* ----------------------------------
  * if newname is NULL (from directory.c) we don't want to copy ressource fork.
  * because we are doing it elsewhere.
+ * currently if newname is NULL then adp is NULL. 
  */
 int copyfile(s_vol, d_vol, src, dst, newname, adp )
 const struct vol *s_vol, *d_vol;
@@ -1416,6 +1417,7 @@ struct adouble *adp;
     int                 ret_err = 0;
     int                 adflags;
     int                 noadouble = vol_noadouble(d_vol);
+    int                 stat_result;
     struct stat         st;
     
 #ifdef DEBUG
@@ -1442,7 +1444,14 @@ struct adouble *adp;
         adflags &= ~ADFLAGS_HF;
     }
 
-    if (ad_open(dst , adflags | noadouble, O_RDWR|O_CREAT|O_EXCL, 0666, &add) < 0) {
+    stat_result = fstat(ad_dfileno(adp), &st); /* saving stat exit code, thus saving us on one more stat later on */
+
+    if (stat_result < 0) {           
+      /* unlikely but if fstat fails, the default file mode will be 0666. */
+      st.st_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
+    }
+
+    if (ad_open(dst , adflags | noadouble, O_RDWR|O_CREAT|O_EXCL, st.st_mode, &add) < 0) {
         ret_err = errno;
         ad_close( adp, adflags );
         if (EEXIST != ret_err) {
@@ -1451,6 +1460,8 @@ struct adouble *adp;
         }
         return AFPERR_EXIST;
     }
+    /* XXX if the source and the dest don't use the same resource type it's broken
+    */
     if (ad_hfileno(adp) == -1 || 0 == (err = copy_fd(ad_hfileno(&add), ad_hfileno(adp)))){
         /* copy the data fork */
 	err = copy_fd(ad_dfileno(&add), ad_dfileno(adp));
@@ -1467,25 +1478,26 @@ struct adouble *adp;
         ret_err = errno;
         goto done;
     } 
-    else {
+
+    if (!ret_err && newname && (adflags & ADFLAGS_HF)) {
+        /* set the new name in the resource fork */
 	ad_init(&add, d_vol->v_adouble, d_vol->v_ad_options);
-	if (ad_open(dst , adflags | noadouble, O_RDWR, 0666, &add) < 0) {
+	if (ad_open(dst , ADFLAGS_HF | noadouble, O_RDWR, 0666, &add) < 0) {
 	    ret_err = errno;
 	}
+	else {
+            ad_setname(&add, newname);
+            ad_flush( &add, ADFLAGS_HF );
+            if (ad_close( &add, ADFLAGS_HF ) <0) {
+                ret_err = errno;
+            }
+        }
     }
 
-    if (!ret_err && newname) {
-        ad_setname(&add, newname);
-    }
-
-    ad_flush( &add, adflags );
-    if (ad_close( &add, adflags ) <0) {
-       ret_err = errno;
-    }
     if (ret_err) {
         deletefile(d_vol, dst, 0);
     }
-    else if (!stat(src, &st)) {
+    else if (stat_result == 0) {
         /* set dest modification date to src date */
         struct utimbuf	ut;
 
@@ -1635,9 +1647,9 @@ int         checkAttrib;
 /* ------------------------------------ */
 /* return a file id */
 int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct stat         *st;
     struct vol		*vol;
@@ -1773,9 +1785,9 @@ reenumerate_id(const struct vol *vol, ch
 /* ------------------------------
    resolve a file id */
 int afp_resolveid(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj      *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int		ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -1885,9 +1897,9 @@ retry:
 
 /* ------------------------------ */
 int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct stat         st;
     struct vol		*vol;
@@ -2021,9 +2033,9 @@ static struct adouble *find_adouble(stru
 #define APPLETEMP ".AppleTempXXXXXX"
 
 int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_ ;
+int	ibuflen _U_, *rbuflen;
 {
     struct stat         srcst, destst;
     struct vol		*vol;
Index: etc/afpd/filedir.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/filedir.c,v
retrieving revision 1.45.2.2.2.14.2.2
retrieving revision 1.45.2.2.2.14.2.4
diff -u -p -p -u -r1.45.2.2.2.14.2.2 -r1.45.2.2.2.14.2.4
--- etc/afpd/filedir.c	10 Feb 2005 01:23:14 -0000	1.45.2.2.2.14.2.2
+++ etc/afpd/filedir.c	27 Sep 2005 10:40:41 -0000	1.45.2.2.2.14.2.4
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.45.2.2.2.14.2.2 2005/02/10 01:23:14 didg Exp $
+ * $Id: filedir.c,v 1.45.2.2.2.14.2.4 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -130,9 +130,9 @@ more information */
 #endif
 
 int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct stat		*st;
     struct vol		*vol;
@@ -225,9 +225,9 @@ int		ibuflen, *rbuflen;
 }
 
 int afp_setfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct stat	*st;
     struct vol	*vol;
@@ -440,9 +440,9 @@ int         isdir;
 
 /* -------------------------------------------- */
 int afp_rename(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     struct dir	*sdir;
@@ -526,9 +526,9 @@ int		ibuflen, *rbuflen;
 
 /* ------------------------------- */
 int afp_delete(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -643,9 +643,9 @@ char	*name;
 
 /* ------------------------- */
 int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf, *rbuf _U_;
+int	ibuflen  _U_, *rbuflen;
 {
     struct vol	*vol;
     struct dir	*sdir, *ddir;
@@ -748,7 +748,7 @@ int		ibuflen, *rbuflen;
 #endif /* DROPKLUDGE */
             /* if unix priv don't try to match perm with dest folder */
             if (!isdir && !vol_unix_priv(vol)) {
-                int  admode = ad_mode("", 0777);
+                int  admode = ad_mode("", 0777) | vol->v_perm;
 
                 setfilmode(upath, admode, NULL);
                 setfilmode(vol->ad_path( upath, ADFLAGS_HF ), ad_hf_mode(admode), NULL);
Index: etc/afpd/fork.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/fork.c,v
retrieving revision 1.51.2.2.2.10.2.2
retrieving revision 1.51.2.2.2.10.2.5
diff -u -p -p -u -r1.51.2.2.2.10.2.2 -r1.51.2.2.2.10.2.5
--- etc/afpd/fork.c	7 Dec 2004 03:23:49 -0000	1.51.2.2.2.10.2.2
+++ etc/afpd/fork.c	28 Sep 2005 09:38:56 -0000	1.51.2.2.2.10.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.c,v 1.51.2.2.2.10.2.2 2004/12/07 03:23:49 didg Exp $
+ * $Id: fork.c,v 1.51.2.2.2.10.2.5 2005/09/28 09:38:56 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -83,10 +83,10 @@ const u_int16_t     attrbits;
     vol = ofork->of_vol;
     dir = ofork->of_dir;
 
-    if (NULL == (path.u_name = mtoupath(vol, ofork->of_name, dir->d_did, utf8_encoding()))) {
+    if (NULL == (path.u_name = mtoupath(vol, of_name(ofork), dir->d_did, utf8_encoding()))) {
         return( AFPERR_MISC );
     }
-    path.m_name = ofork->of_name;
+    path.m_name = of_name(ofork);
     st = &path.st;
     if ( bitmap & ( (1<<FILPBIT_DFLEN) | (1<<FILPBIT_EXTDFLEN) | 
                     (1<<FILPBIT_FNUM) | (1 << FILPBIT_CDATE) | 
@@ -259,9 +259,9 @@ static int fork_setmode(struct adouble *
 
 /* ----------------------- */
 int afp_openfork(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol		*vol;
     struct dir		*dir;
@@ -536,9 +536,9 @@ openfork_err:
 }
 
 int afp_setforkparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf _U_;
+int	ibuflen, *rbuflen;
 {
     struct ofork	*ofork;
     off_t		size;
@@ -630,7 +630,7 @@ int		ibuflen, *rbuflen;
             goto afp_setfork_err;
 
         if (ad_flush( ofork->of_ad, ADFLAGS_HF ) < 0) {
-            LOG(log_error, logtype_afpd, "afp_setforkparams(%s): ad_flush: %s", ofork->of_name, strerror(errno) );
+            LOG(log_error, logtype_afpd, "afp_setforkparams(%s): ad_flush: %s", of_name(ofork), strerror(errno) );
             return AFPERR_PARAM;
         }
     } else
@@ -638,7 +638,7 @@ int		ibuflen, *rbuflen;
 
 #ifdef AFS
     if ( flushfork( ofork ) < 0 ) {
-        LOG(log_error, logtype_afpd, "afp_setforkparams(%s): flushfork: %s", ofork->of_name, strerror(errno) );
+        LOG(log_error, logtype_afpd, "afp_setforkparams(%s): flushfork: %s", of_name(ofork), strerror(errno) );
     }
 #endif /* AFS */
 
@@ -676,9 +676,9 @@ afp_setfork_err:
 
 /* ---------------------- */
 static int byte_lock(obj, ibuf, ibuflen, rbuf, rbuflen, is64 )
-AFPObj  *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int	ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 int     is64;
 {
     struct ofork	*ofork;
@@ -785,7 +785,7 @@ struct ofork	*of;
 
     if ( ad_hfileno( of->of_ad ) == -1 || !memcmp( ufinderi, ad_entry( of->of_ad, ADEID_FINDERI),8)) {
         /* no resource fork or no finderinfo, use our files extension mapping */
-        if (!( em = getextmap( of->of_name )) || memcmp( "TEXT", em->em_type, sizeof( em->em_type ))) {
+        if (!( em = getextmap( of_name(of) )) || memcmp( "TEXT", em->em_type, sizeof( em->em_type ))) {
             return 0;
         } 
         /* file type is TEXT */
@@ -809,7 +809,7 @@ static __inline__ ssize_t read_file(stru
 
     cc = ad_read(ofork->of_ad, eid, offset, rbuf, *rbuflen);
     if ( cc < 0 ) {
-        LOG(log_error, logtype_afpd, "afp_read(%s): ad_read: %s", ofork->of_name, strerror(errno) );
+        LOG(log_error, logtype_afpd, "afp_read(%s): ad_read: %s", of_name(ofork), strerror(errno) );
         *rbuflen = 0;
         return( AFPERR_PARAM );
     }
@@ -867,10 +867,10 @@ static __inline__ ssize_t read_file(stru
  * with dsi, should we check that reqcount < server quantum? 
 */
 static int read_fork(obj, ibuf, ibuflen, rbuf, rbuflen, is64)
-AFPObj      *obj;
+AFPObj  *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
-int is64;
+int	ibuflen _U_, *rbuflen;
+int     is64;
 {
     struct ofork	*ofork;
     off_t		offset, saveoff, reqcount, savereqcount;
@@ -979,7 +979,7 @@ int is64;
                 if (errno == EINVAL || errno == ENOSYS)
                     goto afp_read_loop;
                 else {
-                    LOG(log_error, logtype_afpd, "afp_read(%s): ad_readfile: %s", ofork->of_name, strerror(errno));
+                    LOG(log_error, logtype_afpd, "afp_read(%s): ad_readfile: %s", of_name(ofork), strerror(errno));
                     goto afp_read_exit;
                 }
             }
@@ -1024,7 +1024,7 @@ afp_read_loop:
         goto afp_read_done;
 
 afp_read_exit:
-        LOG(log_error, logtype_afpd, "afp_read(%s): %s", ofork->of_name, strerror(errno));
+        LOG(log_error, logtype_afpd, "afp_read(%s): %s", of_name(ofork), strerror(errno));
         dsi_readdone(dsi);
         ad_tmplock(ofork->of_ad, eid, ADLOCK_CLR, saveoff, savereqcount,ofork->of_refnum);
         obj->exit(EXITERR_CLNT);
@@ -1059,9 +1059,9 @@ int	ibuflen, *rbuflen;
 
 /* ---------------------- */
 int afp_flush(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct vol *vol;
     u_int16_t vid;
@@ -1079,9 +1079,9 @@ int		ibuflen, *rbuflen;
 }
 
 int afp_flushfork(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     struct ofork	*ofork;
     u_int16_t		ofrefnum;
@@ -1096,7 +1096,7 @@ int		ibuflen, *rbuflen;
     }
 
     if ( flushfork( ofork ) < 0 ) {
-        LOG(log_error, logtype_afpd, "afp_flushfork(%s): %s", ofork->of_name, strerror(errno) );
+        LOG(log_error, logtype_afpd, "afp_flushfork(%s): %s", of_name(ofork), strerror(errno) );
     }
 
     return( AFP_OK );
@@ -1113,7 +1113,7 @@ struct ofork	*ofork;
     if ( ad_dfileno( ofork->of_ad ) != -1 &&
             fsync( ad_dfileno( ofork->of_ad )) < 0 ) {
         LOG(log_error, logtype_afpd, "flushfork(%s): dfile(%d) %s",
-            ofork->of_name, ad_dfileno(ofork->of_ad), strerror(errno) );
+            of_name(ofork), ad_dfileno(ofork->of_ad), strerror(errno) );
         err = -1;
     }
 
@@ -1139,21 +1139,23 @@ struct ofork	*ofork;
 
         if (err < 0)
             LOG(log_error, logtype_afpd, "flushfork(%s): hfile(%d) %s",
-                ofork->of_name, ad_hfileno(ofork->of_ad), strerror(errno) );
+                of_name(ofork), ad_hfileno(ofork->of_ad), strerror(errno) );
     }
 
     return( err );
 }
 
 int afp_closefork(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj      *obj _U_;
+char	*ibuf, *rbuf _U_;
+int		ibuflen _U_, *rbuflen;
 {
     struct ofork	*ofork;
     struct timeval      tv;
     int			adflags, doflush = 0;
     u_int16_t		ofrefnum;
+    int			ret;
+    
 
     *rbuflen = 0;
     ibuf += 2;
@@ -1184,14 +1186,14 @@ int		ibuflen, *rbuflen;
             }
         }
     }
-
+    ret = AFP_OK;
     if ( ad_close( ofork->of_ad, adflags ) < 0 ) {
-        LOG(log_error, logtype_afpd, "afp_closefork(%s): ad_close: %s", ofork->of_name, strerror(errno) );
-        return( AFPERR_PARAM );
+        LOG(log_error, logtype_afpd, "afp_closefork(%s): ad_close: %s", of_name(ofork), strerror(errno) );
+        ret = AFPERR_PARAM;
     }
 
     of_dealloc( ofork );
-    return( AFP_OK );
+    return ret;
 }
 
 
@@ -1223,7 +1225,7 @@ static __inline__ ssize_t write_file(str
         case ENOSPC :
             return( AFPERR_DFULL );
         default :
-            LOG(log_error, logtype_afpd, "afp_write(%s): ad_write: %s", ofork->of_name, strerror(errno) );
+            LOG(log_error, logtype_afpd, "afp_write(%s): ad_write: %s", of_name(ofork), strerror(errno) );
             return( AFPERR_PARAM );
         }
     }
@@ -1238,7 +1240,7 @@ static __inline__ ssize_t write_file(str
 static int write_fork(obj, ibuf, ibuflen, rbuf, rbuflen, is64)
 AFPObj              *obj;
 char                *ibuf, *rbuf;
-int                 ibuflen, *rbuflen;
+int                 ibuflen _U_, *rbuflen;
 int                 is64;
 {
     struct ofork	*ofork;
@@ -1439,9 +1441,9 @@ int                 ibuflen, *rbuflen;
 
 /* ---------------------------- */
 int afp_getforkparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj  *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int	ibuflen _U_, *rbuflen;
 {
     struct ofork	*ofork;
     int			buflen, ret;
@@ -1465,7 +1467,7 @@ int		ibuflen, *rbuflen;
 
     if ( ad_hfileno( ofork->of_ad ) != -1 ) {
         if ( ad_refresh( ofork->of_ad ) < 0 ) {
-            LOG(log_error, logtype_afpd, "getforkparams(%s): ad_refresh: %s", ofork->of_name, strerror(errno) );
+            LOG(log_error, logtype_afpd, "getforkparams(%s): ad_refresh: %s", of_name(ofork), strerror(errno) );
             return( AFPERR_PARAM );
         }
     }
Index: etc/afpd/fork.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/fork.h,v
retrieving revision 1.8.6.2.2.1
retrieving revision 1.8.6.2.2.2
diff -u -p -p -u -r1.8.6.2.2.1 -r1.8.6.2.2.2
--- etc/afpd/fork.h	7 Dec 2004 03:23:51 -0000	1.8.6.2.2.1
+++ etc/afpd/fork.h	28 Sep 2005 09:38:57 -0000	1.8.6.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.h,v 1.8.6.2.2.1 2004/12/07 03:23:51 didg Exp $
+ * $Id: fork.h,v 1.8.6.2.2.2 2005/09/28 09:38:57 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -25,8 +25,6 @@ struct ofork {
     struct adouble	*of_ad;
     struct vol          *of_vol;
     struct dir		*of_dir;
-    char		*of_name;
-    int                 of_namelen;
 
     u_int16_t           of_refnum;
     int                 of_flags;
@@ -53,6 +51,7 @@ struct ofork {
 #define AFPFORK_ACCWR   (1<<5)
 #define AFPFORK_ACCMASK (AFPFORK_ACCRD | AFPFORK_ACCWR)
 
+#define of_name(a) (a)->of_ad->ad_m_name
 /* in ofork.c */
 extern struct ofork *of_alloc    __P((struct vol *, struct dir *,
                                                       char *, u_int16_t *, const int,
Index: etc/afpd/mangle.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/mangle.c,v
retrieving revision 1.16.2.1.2.12.2.3
retrieving revision 1.16.2.1.2.12.2.4
diff -u -p -p -u -r1.16.2.1.2.12.2.3 -r1.16.2.1.2.12.2.4
--- etc/afpd/mangle.c	14 Feb 2005 16:01:54 -0000	1.16.2.1.2.12.2.3
+++ etc/afpd/mangle.c	27 Sep 2005 10:40:41 -0000	1.16.2.1.2.12.2.4
@@ -1,5 +1,5 @@
 /* 
- * $Id: mangle.c,v 1.16.2.1.2.12.2.3 2005/02/14 16:01:54 didg Exp $ 
+ * $Id: mangle.c,v 1.16.2.1.2.12.2.4 2005/09/27 10:40:41 didg Exp $ 
  *
  * Copyright (c) 2002. Joe Marcus Clarke (marcus@marcuscom.com)
  * All Rights Reserved.  See COPYRIGHT.
@@ -206,10 +206,10 @@ demangle_osx(const struct vol *vol, char
 /* -------------------------------------------------------
  * find the start of a utf8 character
  */
-static unsigned char *
-utf8_mangle_validate(unsigned char *path, size_t len)
+static char *
+utf8_mangle_validate(char *path, size_t len)
 {
-    unsigned char *p = path + len;
+    unsigned char *p = (unsigned char *)path + len;
     int           dec = 0;
 
     /* char matches with 10xxxxxx ? */
@@ -231,12 +231,12 @@ utf8_mangle_validate(unsigned char *path
    id         file/folder ID or 0
    
 */
-unsigned char *
-mangle(const struct vol *vol, unsigned char *filename, size_t filenamelen, unsigned char *uname, cnid_t id, int flags) {
-    unsigned char *ext = NULL;
-    unsigned char *m = NULL;
-    static unsigned char mfilename[MAXPATHLEN + 1];
-    unsigned char mangle_suffix[MANGLE_LENGTH + 1];
+char *
+mangle(const struct vol *vol _U_, char *filename, size_t filenamelen, char *uname, cnid_t id, int flags) {
+    char *ext = NULL;
+    char *m = NULL;
+    static char mfilename[MAXPATHLEN + 1];
+    char mangle_suffix[MANGLE_LENGTH + 1];
     size_t ext_len = 0;
     size_t maxlen;
     int k;
Index: etc/afpd/mangle.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/mangle.h,v
retrieving revision 1.4.2.1.2.3.2.1
retrieving revision 1.4.2.1.2.3.2.2
diff -u -p -p -u -r1.4.2.1.2.3.2.1 -r1.4.2.1.2.3.2.2
--- etc/afpd/mangle.h	31 Jan 2005 19:50:37 -0000	1.4.2.1.2.3.2.1
+++ etc/afpd/mangle.h	27 Sep 2005 10:40:41 -0000	1.4.2.1.2.3.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: mangle.h,v 1.4.2.1.2.3.2.1 2005/01/31 19:50:37 didg Exp $
+ * $Id: mangle.h,v 1.4.2.1.2.3.2.2 2005/09/27 10:40:41 didg Exp $
  *
  */
 
@@ -24,7 +24,7 @@
 #define MANGLE_LENGTH  9 /* #ffffffff This really can't be changed. */
 #define MAX_LENGTH MACFILELEN 
 
-extern unsigned char *mangle __P((const struct vol *, unsigned char *, size_t, unsigned char *, cnid_t, int));
+extern char *mangle __P((const struct vol *, char *, size_t, char *, cnid_t, int));
 extern char *demangle __P((const struct vol *, char *, cnid_t did));
 extern char *demangle_osx __P((const struct vol *, char *, cnid_t did, cnid_t *fileid));
 
Index: etc/afpd/messages.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/messages.c,v
retrieving revision 1.16.6.1.2.7
retrieving revision 1.16.6.1.2.7.2.1
diff -u -p -p -u -r1.16.6.1.2.7 -r1.16.6.1.2.7.2.1
--- etc/afpd/messages.c	14 Feb 2004 00:30:50 -0000	1.16.6.1.2.7
+++ etc/afpd/messages.c	27 Sep 2005 10:40:41 -0000	1.16.6.1.2.7.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: messages.c,v 1.16.6.1.2.7 2004/02/14 00:30:50 didg Exp $
+ * $Id: messages.c,v 1.16.6.1.2.7.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -116,7 +116,7 @@ AFPObj *obj;
 int afp_getsrvrmesg(obj, ibuf, ibuflen, rbuf, rbuflen)
 AFPObj *obj;
 char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+int ibuflen _U_, *rbuflen;
 {
     char *message;
     u_int16_t type, bitmap;
Index: etc/afpd/ofork.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/ofork.c,v
retrieving revision 1.20.6.6.2.2
retrieving revision 1.20.6.6.2.5
diff -u -p -p -u -r1.20.6.6.2.2 -r1.20.6.6.2.5
--- etc/afpd/ofork.c	10 Feb 2005 01:23:15 -0000	1.20.6.6.2.2
+++ etc/afpd/ofork.c	28 Sep 2005 09:38:57 -0000	1.20.6.6.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: ofork.c,v 1.20.6.6.2.2 2005/02/10 01:23:15 didg Exp $
+ * $Id: ofork.c,v 1.20.6.6.2.5 2005/09/28 09:38:57 didg Exp $
  *
  * Copyright (c) 1996 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -80,7 +80,7 @@ FILE	*f;
 
     for ( ofrefnum = 0; ofrefnum < nforks; ofrefnum++ ) {
         if ( oforks[ ofrefnum ] != NULL ) {
-            fprintf( f, "%hu <%s>\n", ofrefnum, oforks[ ofrefnum ]->of_name);
+            fprintf( f, "%hu <%s>\n", ofrefnum, of_name(oforks[ ofrefnum ]);
         }
     }
 }
@@ -106,9 +106,10 @@ int of_rename(vol, s_of, olddir, oldpath
 const struct vol *vol;
 struct ofork *s_of;
 struct dir *olddir, *newdir;
-const char *oldpath, *newpath;
+const char *oldpath _U_, *newpath;
 {
     struct ofork *of, *next, *d_ofork;
+    int done = 0;
 
     if (!s_of)
         return AFP_OK;
@@ -120,7 +121,10 @@ const char *oldpath, *newpath;
         if (vol == of->of_vol && olddir == of->of_dir &&
 	         s_of->key.dev == of->key.dev && 
 	         s_of->key.inode == of->key.inode ) {
-            strlcpy( of->of_name, newpath, of->of_namelen);
+	    if (!done) {
+	        strlcpy( of_name(of), newpath, of->of_ad->ad_m_namelen);
+	        done = 1;
+	    }
             if (newdir != olddir) {
                 of->of_d_prev->of_d_next = of->of_d_next;
                 of->of_d_next->of_d_prev = of->of_d_prev;
@@ -162,7 +166,7 @@ struct stat     *st;
     int			i;
 
     if (!oforks) {
-        nforks = (getdtablesize() - 10) / 2;
+        nforks = getdtablesize() - 10;
 	/* protect against insane ulimit -n */
         nforks = min(nforks, 0xffff);
         oforks = (struct ofork **) calloc(nforks, sizeof(struct ofork *));
@@ -215,12 +219,27 @@ struct stat     *st;
         ad = malloc( sizeof( struct adouble ) );
         if (!ad) {
             LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
+            free(of);
+            oforks[ of_refnum ] = NULL;
             return NULL;
         }
 
         /* initialize to zero. This is important to ensure that
            ad_open really does reinitialize the structure. */
         ad_init(ad, vol->v_adouble, vol->v_ad_options);
+
+        ad->ad_m_namelen = 255 +1;
+        /* here's the deal: we allocate enough for the standard mac file length.
+         * in the future, we'll reallocate in fairly large jumps in case
+         * of long unicode names */
+        if (( ad->ad_m_name =(char *)malloc( ad->ad_m_namelen )) == NULL ) {
+            LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
+            free(ad);
+            free(of);
+            oforks[ of_refnum ] = NULL;
+            return NULL;
+        }
+        strlcpy( ad->ad_m_name, path, ad->ad_m_namelen);
     } else {
         /* Increase the refcount on this struct adouble. This is
            decremented again in oforc_dealloc. */
@@ -228,7 +247,6 @@ struct stat     *st;
     }
 
     of->of_ad = ad;
-
     of->of_vol = vol;
     of->of_dir = dir;
 
@@ -242,18 +260,6 @@ struct stat     *st;
         d_ofork->of_d_prev = of;
     }
 
-    /* here's the deal: we allocate enough for the standard mac file length.
-     * in the future, we'll reallocate in fairly large jumps in case
-     * of long unicode names */
-    if (( of->of_name =(char *)malloc(255 + 1)) == NULL ) {
-        LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
-        if (!ad)
-            free(of->of_ad);
-        free(of);
-        oforks[ of_refnum ] = NULL;
-        return NULL;
-    }
-    strlcpy( of->of_name, path, of->of_namelen = 255 + 1);
     *ofrefnum = refnum;
     of->of_refnum = refnum;
     of->key.dev = st->st_dev;
@@ -359,12 +365,12 @@ struct ofork	*of;
     }
 
     oforks[ of->of_refnum % nforks ] = NULL;
-    free( of->of_name );
 
     /* decrease refcount */
     of->of_ad->ad_refcount--;
 
     if ( of->of_ad->ad_refcount <= 0) {
+        free( of->of_ad->ad_m_name );
         free( of->of_ad);
     } else {/* someone's still using it. just free this user's locks */
         ad_unlock(of->of_ad, of->of_refnum);
Index: etc/afpd/status.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/status.c,v
retrieving revision 1.13.6.11.2.1
retrieving revision 1.13.6.11.2.2
diff -u -p -p -u -r1.13.6.11.2.1 -r1.13.6.11.2.2
--- etc/afpd/status.c	31 Jan 2005 19:50:38 -0000	1.13.6.11.2.1
+++ etc/afpd/status.c	27 Sep 2005 10:40:41 -0000	1.13.6.11.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.13.6.11.2.1 2005/01/31 19:50:38 didg Exp $
+ * $Id: status.c,v 1.13.6.11.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -36,10 +36,10 @@
 #include "afp_config.h"
 #include "icon.h"
 
-static   int maxstatuslen = 0;
+static   size_t maxstatuslen = 0;
 
 static void status_flags(char *data, const int notif, const int ipok,
-                         const unsigned char passwdbits, const int dirsrvcs)
+                         const unsigned char passwdbits, const int dirsrvcs _U_)
 {
     u_int16_t           status;
 
@@ -228,7 +228,7 @@ server_signature_done:
     return sigoff;
 }
 
-static int status_netaddress(char *data, int *servoffset,
+static size_t status_netaddress(char *data, int *servoffset,
                              const ASP asp, const DSI *dsi,
                              const struct afp_options *options)
 {
@@ -282,7 +282,7 @@ static int status_netaddress(char *data,
 
     /* handle DNS names */
     if (options->fqdn && dsi) {
-        int len = strlen(options->fqdn);
+        size_t len = strlen(options->fqdn);
         if ( len + 2 + addresses_len < maxstatuslen - offset) {
             *data++ = len +2;
             *data++ = 0x04;
@@ -333,8 +333,8 @@ static int status_netaddress(char *data,
     return (data - begin);
 }
 
-static int status_directorynames(char *data, int *diroffset, 
-				 const DSI *dsi, 
+static size_t status_directorynames(char *data, int *diroffset, 
+				 const DSI *dsi _U_, 
 				 const struct afp_options *options)
 {
     char *begin = data;
@@ -352,7 +352,7 @@ static int status_directorynames(char *d
      */
     if (options->k5service && options->k5realm && options->fqdn) {
 	/* should k5princ be utf8 encoded? */
-	u_int8_t len;
+	size_t len;
 	char *p = strchr( options->fqdn, ':' );
 	if (p) 
 	    *p = '\0';
@@ -360,7 +360,7 @@ static int status_directorynames(char *d
 			+ strlen( options->fqdn )
 			+ strlen( options->k5realm );
 	len+=2; /* '/' and '@' */
-	if ( len+2 > maxstatuslen - offset) {
+	if ( len > 255 || len+2 > maxstatuslen - offset) {
 	    *data++ = 0;
 	    LOG ( log_error, logtype_afpd, "status: could not set directory service list, no more room");
 	}	 
@@ -386,8 +386,8 @@ static int status_directorynames(char *d
     return (data - begin);
 }
 
-static int status_utf8servername(char *data, int *nameoffset,
-				 const DSI *dsi,
+static size_t status_utf8servername(char *data, int *nameoffset,
+				 const DSI *dsi _U_,
 				 const struct afp_options *options)
 {
     char *Obj, *Type, *Zone;
@@ -481,8 +481,9 @@ void status_init(AFPConfig *aspconfig, A
 {
     ASP asp;
     DSI *dsi;
-    u_int8_t *status = NULL;
-    int statuslen, c, sigoff;
+    char *status = NULL;
+    size_t statuslen;
+    int c, sigoff;
 
     if (!(aspconfig || dsiconfig) || !options)
         return;
@@ -570,9 +571,9 @@ void status_init(AFPConfig *aspconfig, A
 
 /* this is the same as asp/dsi_getstatus */
 int afp_getsrvrinfo(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj;
+char	*ibuf _U_, *rbuf;
+int	ibuflen _U_, *rbuflen;
 {
     AFPConfig *config = obj->config;
 
Index: etc/afpd/switch.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/switch.c,v
retrieving revision 1.12
retrieving revision 1.12.8.1
diff -u -p -p -u -r1.12 -r1.12.8.1
--- etc/afpd/switch.c	15 Nov 2002 10:59:11 -0000	1.12
+++ etc/afpd/switch.c	27 Sep 2005 10:40:41 -0000	1.12.8.1
@@ -1,5 +1,5 @@
 /*
- * $Id: switch.c,v 1.12 2002/11/15 10:59:11 srittau Exp $
+ * $Id: switch.c,v 1.12.8.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -48,9 +48,9 @@
 #include "misc.h"
 
 static int afp_null(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj  *obj _U_;
+char	*ibuf, *rbuf _U_;
+int	ibuflen _U_, *rbuflen;
 {
     LOG(log_info, logtype_afpd, "afp_null handle %d", *ibuf );
     *rbuflen = 0;
Index: etc/afpd/uam.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/uam.c,v
retrieving revision 1.24.6.7.2.3
retrieving revision 1.24.6.7.2.4
diff -u -p -p -u -r1.24.6.7.2.3 -r1.24.6.7.2.4
--- etc/afpd/uam.c	1 Feb 2005 11:33:48 -0000	1.24.6.7.2.3
+++ etc/afpd/uam.c	27 Sep 2005 10:40:41 -0000	1.24.6.7.2.4
@@ -1,5 +1,5 @@
 /*
- * $Id: uam.c,v 1.24.6.7.2.3 2005/02/01 11:33:48 didg Exp $
+ * $Id: uam.c,v 1.24.6.7.2.4 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -622,7 +622,7 @@ int uam_sia_validate_user(sia_collect_fu
 #endif /* TRU64 */
 
 /* --- papd-specific functions (just placeholders) --- */
-void append(void *pf, char *data, int len)
+void append(void *pf  _U_, char *data _U_, int len _U_)
 {
     return;
 }
Index: etc/afpd/unix.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/unix.c,v
retrieving revision 1.43.2.1.2.10
retrieving revision 1.43.2.1.2.10.2.3
diff -u -p -p -u -r1.43.2.1.2.10 -r1.43.2.1.2.10.2.3
--- etc/afpd/unix.c	15 Jun 2004 22:53:55 -0000	1.43.2.1.2.10
+++ etc/afpd/unix.c	27 Sep 2005 10:40:41 -0000	1.43.2.1.2.10.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.43.2.1.2.10 2004/06/15 22:53:55 didg Exp $
+ * $Id: unix.c,v 1.43.2.1.2.10.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -170,11 +170,13 @@ mode_t mode;
  * Note: the previous method, using access(), does not work correctly
  * over NFS.
  * FIXME what about ACL?
+ *
+ * dir parameter is used by AFS
  */
 void accessmode( path, ma, dir, st )
 char		*path;
 struct maccess	*ma;
-struct dir	*dir;
+struct dir	*dir _U_;
 struct stat     *st;
 
 {
@@ -402,6 +404,8 @@ mode_t mode;
         return -1;
     }
         
+    mode |= vol->v_perm;
+
     if (setfilmode( path->u_name, mode, &path->st) < 0)
         return -1;
     /* we need to set write perm if read set for resource fork */
@@ -415,14 +419,14 @@ mode_t mode;
 struct stat *st;
 {
 struct stat sb;
-mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH;
+mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO;  /* rwx for owner group and other, by default */
 
     if (!st) {
         if (stat(name, &sb) != 0)
             return -1;
         st = &sb;
     }
-   mode &= mask;	/* keep only rw-rw-rw in mode */
+   
    mode |= st->st_mode & ~mask; /* keep other bits from previous mode */
    if ( chmod( name,  mode & ~default_options.umask ) < 0 && errno != EPERM ) {
        return -1;
@@ -434,11 +438,12 @@ mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP
 int setdirunixmode( vol, name, mode )
 const struct vol *vol;
 const char       *name;
-const mode_t     mode;
+mode_t           mode;
 {
 char *adouble = vol->ad_path( name, ADFLAGS_DIR );
 
     int dropbox = (vol->v_flags & AFPVOL_DROPBOX);
+    mode |= vol->v_perm;
 
     if (dir_rx_set(mode)) {
     	/* extending right? dir first then .AppleDouble */
@@ -469,19 +474,22 @@ char *adouble = vol->ad_path( name, ADFL
 int setdirmode( vol, name, mode )
 const struct vol *vol;
 const char       *name;
-const mode_t mode;
+mode_t           mode;
 {
     char		buf[ MAXPATHLEN + 1];
     struct stat		st;
     char		*m;
     struct dirent	*dirp;
     DIR			*dir;
+    mode_t              hf_mode;
     int                 osx = vol->v_adouble == AD_VERSION2_OSX;
-    int                 hf_mode = ad_hf_mode(mode);
     int                 dropbox = (vol->v_flags & AFPVOL_DROPBOX);
     char                *adouble = vol->ad_path( name, ADFLAGS_DIR );
     char                *adouble_p = ad_dir(adouble);
     
+    mode |= vol->v_perm;
+    hf_mode = ad_hf_mode(mode);
+
     if (dir_rx_set(mode)) {
     	/* extending right? dir first then .AppleDouble */
     	if ( stickydirmode(name, DIRBITS | mode, dropbox) < 0 )
Index: etc/afpd/unix.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/unix.h,v
retrieving revision 1.12.2.1.2.6.2.1
retrieving revision 1.12.2.1.2.6.2.3
diff -u -p -p -u -r1.12.2.1.2.6.2.1 -r1.12.2.1.2.6.2.3
--- etc/afpd/unix.h	31 Jan 2005 17:01:00 -0000	1.12.2.1.2.6.2.1
+++ etc/afpd/unix.h	2 Jun 2005 12:49:41 -0000	1.12.2.1.2.6.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.h,v 1.12.2.1.2.6.2.1 2005/01/31 17:01:00 didg Exp $
+ * $Id: unix.h,v 1.12.2.1.2.6.2.3 2005/06/02 12:49:41 didg Exp $
  */
 
 #ifndef AFPD_UNIX_H
@@ -32,7 +32,7 @@ typedef int	mode_t;
 #define f_frsize f_fsize
 #else /* TRU64 */
 /* temp fix, was: defined(HAVE_SYS_STATVFS) || defined(__svr4__) */
-#if defined(__svr4__)
+#if defined(__svr4__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200040000))
 #include <sys/statvfs.h>
 #define statfs statvfs
 #else /* HAVE_SYS_STATVFS || __svr4__ */
@@ -217,8 +217,8 @@ extern struct afp_options default_option
 
 extern int gmem            __P((const gid_t));
 extern int setdeskmode      __P((const mode_t));
-extern int setdirunixmode   __P((const struct vol *, const char *, const mode_t));
-extern int setdirmode       __P((const struct vol *, const char *, const mode_t));
+extern int setdirunixmode   __P((const struct vol *, const char *, mode_t));
+extern int setdirmode       __P((const struct vol *, const char *, mode_t));
 extern int setdeskowner     __P((const uid_t, const gid_t));
 extern int setdirowner      __P((const struct vol *, const char *, const uid_t, const gid_t));
 extern int setfilmode       __P((char *, mode_t , struct stat *));
Index: etc/afpd/volume.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/volume.c,v
retrieving revision 1.51.2.7.2.33.2.5
retrieving revision 1.51.2.7.2.33.2.10
diff -u -p -p -u -r1.51.2.7.2.33.2.5 -r1.51.2.7.2.33.2.10
--- etc/afpd/volume.c	24 Apr 2005 22:26:31 -0000	1.51.2.7.2.33.2.5
+++ etc/afpd/volume.c	28 Sep 2005 09:53:47 -0000	1.51.2.7.2.33.2.10
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.51.2.7.2.33.2.5 2005/04/24 22:26:31 didg Exp $
+ * $Id: volume.c,v 1.51.2.7.2.33.2.10 2005/09/28 09:53:47 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -115,11 +115,13 @@ m=u -> map both ways
 #define VOLOPT_FORCEUID  19  /* force uid for username x */
 #define VOLOPT_FORCEGID  20  /* force gid for group x */
 #define VOLOPT_UMASK     21
+#define VOLOPT_DFLTPERM  22
 #else 
 #define VOLOPT_UMASK     19
+#define VOLOPT_DFLTPERM  20
 #endif /* FORCE_UIDGID */
 
-#define VOLOPT_MAX       (VOLOPT_UMASK +1)
+#define VOLOPT_MAX       (VOLOPT_DFLTPERM +1)
 
 #define VOLOPT_NUM        (VOLOPT_MAX + 1)
 
@@ -242,7 +244,7 @@ static char *volxlate(AFPObj *obj, char 
         return ret;
 
     /* first part of the path. just forward to the next variable. */
-    len = MIN(p - src, destlen);
+    len = MIN((size_t)(p - src), destlen);
     if (len > 0) {
         destlen -= len;
         dest += len;
@@ -338,7 +340,7 @@ static char *volxlate(AFPObj *obj, char 
         /* stuff up to next $ */
         src = p + 2;
         p = strchr(src, '$');
-        len = p ? MIN(p - src, destlen) : destlen;
+        len = p ? MIN((size_t)(p - src), destlen) : destlen;
         if (len > 0) {
             strncpy(dest, src, len);
             dest += len;
@@ -478,7 +480,9 @@ static void volset(struct vol_option *op
         setoption(options, save, VOLOPT_DBPATH, val);
 
     } else if (optionok(tmp, "umask:", val)) {
-	options[VOLOPT_UMASK].i_value = (int)strtol(val, (char **)NULL, 8);
+	options[VOLOPT_UMASK].i_value = (int)strtol(val +1, NULL, 8);
+    } else if (optionok(tmp, "perm:", val)) {
+        options[VOLOPT_DFLTPERM].i_value = (int)strtol(val+1, NULL, 8);
     } else if (optionok(tmp, "mapchars:",val)) {
         setoption(options, save, VOLOPT_MAPCHARS, val);
 
@@ -535,7 +539,7 @@ static int validupath_adouble(const stru
 }                                           
 
 /* ----------------- */
-static int validupath_osx(const struct vol *vol, const char *name) 
+static int validupath_osx(const struct vol *vol _U_, const char *name) 
 {
     return strncasecmp(name,".Apple", 6) && strncasecmp(name,"._", 2);
 }             
@@ -635,7 +639,9 @@ static int creatvol(AFPObj *obj, struct 
             volume->v_ad_options |= ADVOL_NODEV;
         if ((volume->v_flags & AFPVOL_CACHE))
             volume->v_ad_options |= ADVOL_CACHE;
-        
+        if ((volume->v_flags & AFPVOL_UNIX_PRIV))
+            volume->v_ad_options |= ADVOL_UNIXPRIV;
+
         if (options[VOLOPT_PASSWORD].c_value)
             volume->v_password = strdup(options[VOLOPT_PASSWORD].c_value);
 
@@ -657,6 +663,9 @@ static int creatvol(AFPObj *obj, struct 
 	if (options[VOLOPT_UMASK].i_value)
 	    volume->v_umask = (mode_t)options[VOLOPT_UMASK].i_value;
 
+	if (options[VOLOPT_DFLTPERM].i_value)
+	    volume->v_perm = (mode_t)options[VOLOPT_DFLTPERM].i_value;
+
 	if (options[VOLOPT_ADOUBLE].i_value)
 	    volume->v_adouble = options[VOLOPT_ADOUBLE].i_value;
 	else 
@@ -1398,7 +1407,8 @@ int		*buflen;
     if ( nameoff ) {
         ashort = htons( data - buf );
         memcpy(nameoff, &ashort, sizeof( ashort ));
-	aint = ucs2_to_charset( (utf8_encoding()?CH_UTF8_MAC:vol->v_maccharset), vol->v_name, data+1, 255);
+        /* name is always in mac charset, FIXME mangle if length > 27 char */
+	aint = ucs2_to_charset( vol->v_maccharset, vol->v_name, data+1, 255);
 	if ( aint <= 0 ) {
 	    *buflen = 0;
             return AFPERR_MISC;
@@ -1499,8 +1509,8 @@ void load_volumes(AFPObj *obj)
 /* ------------------------------- */
 int afp_getsrvrparms(obj, ibuf, ibuflen, rbuf, rbuflen )
 AFPObj      *obj;
-char	*ibuf, *rbuf;
-int 	ibuflen, *rbuflen;
+char	*ibuf _U_, *rbuf;
+int 	ibuflen _U_, *rbuflen;
 {
     struct timeval	tv;
     struct stat		st;
@@ -1515,6 +1525,8 @@ int 	ibuflen, *rbuflen;
     data = rbuf + 5;
     for ( vcnt = 0, volume = Volumes; volume; volume = volume->v_next ) {
         if (!(volume->v_flags & AFPVOL_NOSTAT)) {
+            struct maccess ma;
+
             if ( stat( volume->v_path, &st ) < 0 ) {
                 LOG(log_info, logtype_afpd, "afp_getsrvrparms(%s): stat: %s",
                         volume->v_path, strerror(errno) );
@@ -1523,6 +1535,10 @@ int 	ibuflen, *rbuflen;
             if (!S_ISDIR(st.st_mode)) {
                 continue;		/* not a dir */
             }
+            accessmode(volume->v_path, &ma, NULL, &st);
+            if ((ma.ma_user & (AR_UREAD | AR_USEARCH)) != (AR_UREAD | AR_USEARCH)) {
+                continue;   /* no r-x access */
+            }
         }
         if (volume->v_hide) {
             continue;		/* config file changed but the volume was mounted */
@@ -1570,7 +1586,7 @@ int 	ibuflen, *rbuflen;
 int afp_openvol(obj, ibuf, ibuflen, rbuf, rbuflen )
 AFPObj      *obj;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int		ibuflen _U_, *rbuflen;
 {
     struct stat	st;
     char	*volname;
@@ -1841,9 +1857,9 @@ void close_all_vol(void)
 
 /* ------------------------- */
 int afp_closevol(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj      *obj _U_;
+char	*ibuf, *rbuf _U_;
+int		ibuflen _U_, *rbuflen;
 {
     struct vol	*vol, *ovol;
     u_int16_t	vid;
@@ -1996,9 +2012,9 @@ struct vol	*vol;
 
 /* ------------------------- */
 int afp_getvolparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
+AFPObj      *obj _U_;
 char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+int		ibuflen _U_, *rbuflen;
 {
     struct vol	*vol;
     u_int16_t	vid, bitmap;
@@ -2019,9 +2035,9 @@ int		ibuflen, *rbuflen;
 
 /* ------------------------- */
 int afp_setvolparams(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj      *obj;
-char	*ibuf, *rbuf;
-int		ibuflen, *rbuflen;
+AFPObj      *obj _U_;
+char	*ibuf, *rbuf _U_;
+int		ibuflen _U_, *rbuflen;
 {
     struct adouble ad;
     struct vol	*vol;
Index: etc/afpd/volume.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/afpd/volume.h,v
retrieving revision 1.19.2.5.2.7.2.1
retrieving revision 1.19.2.5.2.7.2.2
diff -u -p -p -u -r1.19.2.5.2.7.2.1 -r1.19.2.5.2.7.2.2
--- etc/afpd/volume.h	10 Feb 2005 01:23:16 -0000	1.19.2.5.2.7.2.1
+++ etc/afpd/volume.h	2 Jun 2005 12:49:41 -0000	1.19.2.5.2.7.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.h,v 1.19.2.5.2.7.2.1 2005/02/10 01:23:16 didg Exp $
+ * $Id: volume.h,v 1.19.2.5.2.7.2.2 2005/06/02 12:49:41 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -48,6 +48,7 @@ struct vol {
     struct _cnid_db     *v_cdb;
     char                v_stamp[ADEDLEN_PRIVSYN];
     mode_t		v_umask;
+    mode_t		v_perm;             /* default permission value OR with requested perm*/
 
 #ifdef FORCE_UIDGID
     char		*v_forceuid;
Index: etc/atalkd/atserv.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/atalkd/atserv.h,v
retrieving revision 1.2
retrieving revision 1.2.16.1
diff -u -p -p -u -r1.2 -r1.2.16.1
--- etc/atalkd/atserv.h	25 Jun 2001 20:13:45 -0000	1.2
+++ etc/atalkd/atserv.h	27 Sep 2005 10:40:41 -0000	1.2.16.1
@@ -1,5 +1,5 @@
 /*
- * $Id: atserv.h,v 1.2 2001/06/25 20:13:45 rufustfirefly Exp $
+ * $Id: atserv.h,v 1.2.16.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1992 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -19,5 +19,3 @@ struct atport {
     int			(*ap_packet)();
 };
 
-extern struct atserv	atserv[];
-extern int		atservNATSERV;
Index: etc/atalkd/config.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/atalkd/config.c,v
retrieving revision 1.13.6.5.2.3
retrieving revision 1.13.6.5.2.4
diff -u -p -p -u -r1.13.6.5.2.3 -r1.13.6.5.2.4
--- etc/atalkd/config.c	6 Feb 2005 10:16:02 -0000	1.13.6.5.2.3
+++ etc/atalkd/config.c	27 Sep 2005 10:40:41 -0000	1.13.6.5.2.4
@@ -1,5 +1,5 @@
 /*
- * $Id: config.c,v 1.13.6.5.2.3 2005/02/06 10:16:02 didg Exp $
+ * $Id: config.c,v 1.13.6.5.2.4 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -476,7 +476,7 @@ read_conf_err:
 
 int noallmulti( iface, av )
     struct interface	*iface;
-    char		**av;
+    char		**av _U_;
 {
     /* Linux specific, no effect on other platforms */
     iface->i_flags &= !IFACE_ALLMULTI;
@@ -487,7 +487,7 @@ int noallmulti( iface, av )
 /*ARGSUSED*/
 int router( iface, av )
     struct interface	*iface;
-    char		**av;
+    char		**av _U_;
 {
     /* make sure "-router" and "-dontroute" aren't both on the same line. */
     if (iface->i_flags & IFACE_DONTROUTE) {
@@ -511,7 +511,7 @@ int router( iface, av )
 /*ARGSUSED*/
 int dontroute( iface, av )
     struct interface	*iface;
-    char		**av;
+    char		**av _U_;
 {
     /* make sure "-router" and "-dontroute" aren't both on the same line. */
     if (iface->i_flags & IFACE_RSEED) {
@@ -526,7 +526,7 @@ int dontroute( iface, av )
 /*ARGSUSED*/
 int seed( iface, av )
     struct interface	*iface;
-    char		**av;
+    char		**av _U_;
 {
     /*
      * Check to be sure "-seed" is before "-zone". we keep the old
Index: etc/atalkd/main.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/atalkd/main.c,v
retrieving revision 1.17.8.6.2.1
retrieving revision 1.17.8.6.2.2
diff -u -p -p -u -r1.17.8.6.2.1 -r1.17.8.6.2.2
--- etc/atalkd/main.c	31 Jan 2005 17:01:04 -0000	1.17.8.6.2.1
+++ etc/atalkd/main.c	27 Sep 2005 10:40:41 -0000	1.17.8.6.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.17.8.6.2.1 2005/01/31 17:01:04 didg Exp $
+ * $Id: main.c,v 1.17.8.6.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -108,13 +108,13 @@ extern int	zip_packet();
 
 int		rtfd;
 
-struct atserv	atserv[] = {
+static struct atserv	atserv[] = {
     { "rtmp",		1,	rtmp_packet },		/* 0 */
     { "nbp",		2,	nbp_packet },		/* 1 */
     { "echo",		4,	aep_packet },		/* 2 */
     { "zip",		6,	zip_packet },		/* 3 */
 };
-int		atservNATSERV = elements( atserv );
+static int		atservNATSERV = elements( atserv );
 
 struct interface	*interfaces = NULL, *ciface = NULL;
 
@@ -168,7 +168,7 @@ static void atalkd_exit(const int i)
 }
 
 
-static void as_timer(int sig)
+static void as_timer(int sig _U_)
 {
     struct sockaddr_at	sat;
     struct ziphdr	zh;
Index: etc/cnid_dbd/cnid_metad.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/cnid_metad.c,v
retrieving revision 1.1.4.15
retrieving revision 1.1.4.15.2.1
diff -u -p -p -u -r1.1.4.15 -r1.1.4.15.2.1
--- etc/cnid_dbd/cnid_metad.c	6 Sep 2004 07:19:21 -0000	1.1.4.15
+++ etc/cnid_dbd/cnid_metad.c	27 Sep 2005 10:40:41 -0000	1.1.4.15.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_metad.c,v 1.1.4.15 2004/09/06 07:19:21 didg Exp $
+ * $Id: cnid_metad.c,v 1.1.4.15.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -114,7 +114,7 @@ struct server {
 
 static struct server srv[MAXSRV +1];
 
-static struct server *test_usockfn(char *dir, char *fn)
+static struct server *test_usockfn(char *dir, char *fn _U_)
 {
 int i;
     for (i = 1; i <= MAXSRV; i++) {
Index: etc/cnid_dbd/db_param.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/db_param.c,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.2
diff -u -p -p -u -r1.1.4.4.2.1 -r1.1.4.4.2.2
--- etc/cnid_dbd/db_param.c	21 Dec 2004 13:36:12 -0000	1.1.4.4.2.1
+++ etc/cnid_dbd/db_param.c	27 Sep 2005 10:40:41 -0000	1.1.4.4.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: db_param.c,v 1.1.4.4.2.1 2004/12/21 13:36:12 didg Exp $
+ * $Id: db_param.c,v 1.1.4.4.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -43,14 +43,14 @@
 static struct db_param params;
 static int parse_err;
 
-static int usock_maxlen()
+static size_t usock_maxlen()
 {
     struct sockaddr_un addr;
 
     return sizeof(addr.sun_path) - 1;
 }
 
-static int make_pathname(char *path, char *dir, char *fn, int maxlen)
+static int make_pathname(char *path, char *dir, char *fn, size_t maxlen)
 {
     size_t len;
 
Index: etc/cnid_dbd/dbd_getstamp.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/dbd_getstamp.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -p -p -u -r1.1.2.3 -r1.1.2.3.2.1
--- etc/cnid_dbd/dbd_getstamp.c	7 Feb 2004 19:46:08 -0000	1.1.2.3
+++ etc/cnid_dbd/dbd_getstamp.c	27 Sep 2005 10:40:41 -0000	1.1.2.3.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_getstamp.c,v 1.1.2.3 2004/02/07 19:46:08 didg Exp $
+ * $Id: dbd_getstamp.c,v 1.1.2.3.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -21,7 +21,7 @@
 
 /* Return the unique stamp associated with this database */
 
-int dbd_getstamp(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
+int dbd_getstamp(struct cnid_dbd_rqst *rqst _U_, struct cnid_dbd_rply *rply)
 {
     DBT key, data;
     int rc;
Index: etc/cnid_dbd/dbd_lookup.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/dbd_lookup.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.7.2.1
diff -u -p -p -u -r1.1.4.7 -r1.1.4.7.2.1
--- etc/cnid_dbd/dbd_lookup.c	7 Feb 2004 19:46:08 -0000	1.1.4.7
+++ etc/cnid_dbd/dbd_lookup.c	27 Sep 2005 10:40:41 -0000	1.1.4.7.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_lookup.c,v 1.1.4.7 2004/02/07 19:46:08 didg Exp $
+ * $Id: dbd_lookup.c,v 1.1.4.7.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -29,7 +29,7 @@
 
 int dbd_lookup(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
 {
-    char *buf;
+    unsigned char *buf;
     DBT key, devdata, diddata;
     char dev[CNID_DEV_LEN];
     char ino[CNID_INO_LEN];
Index: etc/cnid_dbd/dbd_update.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/dbd_update.c,v
retrieving revision 1.1.4.12
retrieving revision 1.1.4.12.2.1
diff -u -p -p -u -r1.1.4.12 -r1.1.4.12.2.1
--- etc/cnid_dbd/dbd_update.c	21 Mar 2004 23:04:07 -0000	1.1.4.12
+++ etc/cnid_dbd/dbd_update.c	27 Sep 2005 10:40:41 -0000	1.1.4.12.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_update.c,v 1.1.4.12 2004/03/21 23:04:07 lenneis Exp $
+ * $Id: dbd_update.c,v 1.1.4.12.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -36,7 +36,7 @@ int dbd_update(struct cnid_dbd_rqst *rqs
 {
     DBT key,pkey, data;
     int rc;
-    char *buf;                            
+    unsigned char *buf;                            
     int notfound = 0;
     char getbuf[CNID_HEADER_LEN + MAXPATHLEN +1];
 #ifdef DEBUG
Index: etc/cnid_dbd/dbif.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/dbif.c,v
retrieving revision 1.1.4.15.2.1
retrieving revision 1.1.4.15.2.3
diff -u -p -p -u -r1.1.4.15.2.1 -r1.1.4.15.2.3
--- etc/cnid_dbd/dbif.c	21 Dec 2004 13:36:12 -0000	1.1.4.15.2.1
+++ etc/cnid_dbd/dbif.c	27 Sep 2005 10:40:41 -0000	1.1.4.15.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: dbif.c,v 1.1.4.15.2.1 2004/12/21 13:36:12 didg Exp $
+ * $Id: dbif.c,v 1.1.4.15.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -233,7 +233,7 @@ int dbif_env_init(struct db_param *dbp)
 }
 
 /* --------------- */
-int dbif_open(struct db_param *dbp, int do_truncate)
+int dbif_open(struct db_param *dbp _U_, int do_truncate)
 {
     int ret;
     int i;
@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t 
     DB_BTREE_STAT *sp;
     DB *db = db_table[dbi].db;
 
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+    ret = db->stat(db, db_txn, &sp, 0);
+#else
     ret = db->stat(db, &sp, 0);
+#endif
 
     if (ret) {
         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
Index: etc/cnid_dbd/pack.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/pack.c,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.9.2.1
diff -u -p -p -u -r1.1.4.9 -r1.1.4.9.2.1
--- etc/cnid_dbd/pack.c	7 Feb 2004 19:46:08 -0000	1.1.4.9
+++ etc/cnid_dbd/pack.c	27 Sep 2005 10:40:41 -0000	1.1.4.9.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.c,v 1.1.4.9 2004/02/07 19:46:08 didg Exp $
+ * $Id: pack.c,v 1.1.4.9.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -57,8 +57,8 @@ static void pack_devino(unsigned char *b
 
 /* --------------- */
 int didname(dbp, pkey, pdata, skey)
-DB *dbp;
-const DBT *pkey, *pdata;
+DB *dbp _U_;
+const DBT *pkey _U_, *pdata;
 DBT *skey;
 {
 int len;
@@ -75,8 +75,8 @@ int len;
  
 /* --------------- */
 int devino(dbp, pkey, pdata, skey)
-DB *dbp;
-const DBT *pkey, *pdata;
+DB *dbp _U_;
+const DBT *pkey _U_, *pdata;
 DBT *skey;
 {
     memset(skey, 0, sizeof(DBT));
@@ -89,10 +89,10 @@ DBT *skey;
    differ from make_cnid_data in that we never return NULL, rqst->name cannot
    ever cause start[] to overflow because name length is checked in libatalk. */
 
-char *pack_cnid_data(struct cnid_dbd_rqst *rqst)
+unsigned char *pack_cnid_data(struct cnid_dbd_rqst *rqst)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start +CNID_LEN;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start +CNID_LEN;
     u_int32_t i;
 
     pack_devino(buf, rqst->dev, rqst->ino);
Index: etc/cnid_dbd/pack.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/pack.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.3.2.1
diff -u -p -p -u -r1.1.4.3 -r1.1.4.3.2.1
--- etc/cnid_dbd/pack.h	21 Jan 2004 21:28:42 -0000	1.1.4.3
+++ etc/cnid_dbd/pack.h	27 Sep 2005 10:40:41 -0000	1.1.4.3.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.h,v 1.1.4.3 2004/01/21 21:28:42 lenneis Exp $
+ * $Id: pack.h,v 1.1.4.3.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -38,7 +38,7 @@
 #define CNID_DBD_HEADER_LEN          (CNID_DBD_DEVINO_LEN + CNID_DBD_DID_LEN)
 #endif
 
-extern char      *pack_cnid_data  __P((struct cnid_dbd_rqst *));
+extern unsigned char *pack_cnid_data  __P((struct cnid_dbd_rqst *));
 
 #ifdef DEBUG
 extern char      *stringify_devino  __P((dev_t dev, ino_t ino));
Index: etc/cnid_dbd/usockfd.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/usockfd.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.4.2.1
diff -u -p -p -u -r1.1.4.4 -r1.1.4.4.2.1
--- etc/cnid_dbd/usockfd.c	6 Sep 2004 07:19:21 -0000	1.1.4.4
+++ etc/cnid_dbd/usockfd.c	27 Sep 2005 10:40:41 -0000	1.1.4.4.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: usockfd.c,v 1.1.4.4 2004/09/06 07:19:21 didg Exp $
+ * $Id: usockfd.c,v 1.1.4.4.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -141,7 +141,7 @@ int tsockfd_create(char *host, u_int16_t
 int usockfd_check(int sockfd, unsigned long ndelay)
 {
     int fd;
-    int size;
+    socklen_t size;
     fd_set readfds;
     struct timeval tv;
     int ret;
Index: etc/papd/headers.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/papd/headers.c,v
retrieving revision 1.9.10.1.2.1
retrieving revision 1.9.10.1.2.2
diff -u -p -p -u -r1.9.10.1.2.1 -r1.9.10.1.2.2
--- etc/papd/headers.c	6 Feb 2005 10:16:02 -0000	1.9.10.1.2.1
+++ etc/papd/headers.c	27 Sep 2005 10:40:41 -0000	1.9.10.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: headers.c,v 1.9.10.1.2.1 2005/02/06 10:16:02 didg Exp $
+ * $Id: headers.c,v 1.9.10.1.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -25,7 +25,7 @@ int ch_for( struct papfile *, struct pap
 
 
 int ch_for( in, out )
-	struct papfile	*in, *out;
+	struct papfile	*in, *out _U_;
 {
     char                *start, *stop, *p, *q, c;
     int                 linelength, crlflength;
@@ -74,7 +74,7 @@ int ch_for( in, out )
 }
 
 int ch_title( in, out )
-    struct papfile	*in, *out;
+    struct papfile	*in, *out _U_;
 {
     char		*start, *stop, *p, *q, c;
     int			linelength, crlflength;
@@ -138,7 +138,7 @@ static int guess_creator ( char *creator
 
 
 int ch_creator( in, out )
-    struct papfile	*in, *out;
+    struct papfile	*in, *out _U_;
 {
     char		*start, *stop, *p, *q, c;
     int			linelength, crlflength;
@@ -188,7 +188,7 @@ int ch_creator( in, out )
 }
 
 int ch_endcomm( in, out )
-    struct papfile	*in, *out;
+    struct papfile	*in, *out _U_;
 {
     char                *start;
     int                 linelength, crlflength;
@@ -215,7 +215,7 @@ int ch_endcomm( in, out )
 }
 
 int ch_starttranslate(in,out)
-    struct papfile      *in, *out;
+    struct papfile      *in, *out _U_;
 {
     char                *start;
     int                 linelength, crlflength;
@@ -240,7 +240,7 @@ int ch_starttranslate(in,out)
 }
 
 int ch_endtranslate(in,out)
-    struct papfile      *in, *out;
+    struct papfile      *in, *out _U_;
 {
     char                *start;
     int                 linelength, crlflength;
@@ -265,7 +265,7 @@ int ch_endtranslate(in,out)
 }
 
 int ch_translateone(in,out)
-    struct papfile      *in, *out;
+    struct papfile      *in, *out _U_;
 {
     char                *start;
     int                 linelength, crlflength;
Index: etc/papd/magics.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/papd/magics.c,v
retrieving revision 1.11.6.2.2.1
retrieving revision 1.11.6.2.2.2
diff -u -p -p -u -r1.11.6.2.2.1 -r1.11.6.2.2.2
--- etc/papd/magics.c	6 Feb 2005 10:16:02 -0000	1.11.6.2.2.1
+++ etc/papd/magics.c	27 Sep 2005 10:40:41 -0000	1.11.6.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: magics.c,v 1.11.6.2.2.1 2005/02/06 10:16:02 didg Exp $
+ * $Id: magics.c,v 1.11.6.2.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -89,7 +89,7 @@ int ps( infile, outfile, sat )
 
 int cm_psquery( in, out, sat )
     struct papfile	*in, *out;
-    struct sockaddr_at	*sat;
+    struct sockaddr_at	*sat _U_;
 {
     struct papd_comment	*comment;
     char		*start;
@@ -122,7 +122,7 @@ int cm_psquery( in, out, sat )
 
 int cm_psadobe( in, out, sat )
     struct papfile	*in, *out;
-    struct sockaddr_at	*sat;
+    struct sockaddr_at	*sat _U_;
 {
     char		*start;
     int			linelength, crlflength;
@@ -163,7 +163,7 @@ char	*Query = "Query";
 
 int cm_psswitch( in, out, sat )
     struct papfile	*in, *out;
-    struct sockaddr_at	*sat;
+    struct sockaddr_at	*sat _U_;
 {
     char		*start, *stop, *p;
     int			linelength, crlflength;
Index: etc/papd/print_cups.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/papd/print_cups.c,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -p -p -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- etc/papd/print_cups.c	11 Jan 2005 23:00:40 -0000	1.1.2.1.2.1
+++ etc/papd/print_cups.c	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: print_cups.c,v 1.1.2.1.2.1 2005/01/11 23:00:40 didg Exp $
+ * $Id: print_cups.c,v 1.1.2.1.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright 2004 Bjoern Fernhomberg.
  *
@@ -79,7 +79,7 @@ char * cups_get_language ()
  */
 
 static const char *                            /* O - Password or NULL */
-cups_passwd_cb(const char *prompt)      /* I - Prompt */
+cups_passwd_cb(const char *prompt _U_)      /* I - Prompt */
 {
  /*
   * Always return NULL to indicate that no password is available...
Index: etc/papd/uam.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/papd/uam.c,v
retrieving revision 1.9.6.4
retrieving revision 1.9.6.4.2.1
diff -u -p -p -u -r1.9.6.4 -r1.9.6.4.2.1
--- etc/papd/uam.c	14 Feb 2004 00:30:51 -0000	1.9.6.4
+++ etc/papd/uam.c	27 Sep 2005 10:40:41 -0000	1.9.6.4.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: uam.c,v 1.9.6.4 2004/02/14 00:30:51 didg Exp $
+ * $Id: uam.c,v 1.9.6.4.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -183,15 +183,15 @@ void uam_unregister(const int type, cons
 }
 
 /* Crap to support uams which call this afpd function */
-int uam_afpserver_option(void *private, const int what, void *option,
-                         int *len)
+int uam_afpserver_option(void *private _U_, const int what _U_, void *option _U_,
+                         int *len _U_)
 {
 	return(0);
 }
 
 /* --- helper functions for plugin uams --- */
 
-struct passwd *uam_getname(void *dummy, char *name, const int len)
+struct passwd *uam_getname(void *dummy _U_, char *name, const int len)
 {
   struct passwd *pwent;
   char *user;
Index: etc/uams/uams_dhx_pam.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/uams/uams_dhx_pam.c,v
retrieving revision 1.24.6.5
retrieving revision 1.24.6.5.2.1
diff -u -p -p -u -r1.24.6.5 -r1.24.6.5.2.1
--- etc/uams/uams_dhx_pam.c	24 Jun 2004 01:20:12 -0000	1.24.6.5
+++ etc/uams/uams_dhx_pam.c	27 Sep 2005 10:40:41 -0000	1.24.6.5.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx_pam.c,v 1.24.6.5 2004/06/24 01:20:12 bfernhomberg Exp $
+ * $Id: uams_dhx_pam.c,v 1.24.6.5.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -83,7 +83,7 @@ static char *PAM_password;
 static int PAM_conv (int num_msg,
                      const struct pam_message **msg,
                      struct pam_response **resp,
-                     void *appdata_ptr) {
+                     void *appdata_ptr _U_) {
   int count = 0;
   struct pam_response *reply;
   
@@ -185,7 +185,7 @@ static struct pam_conv PAM_conversation 
 };
 
 
-static int dhx_setup(void *obj, char *ibuf, int ibuflen, 
+static int dhx_setup(void *obj, char *ibuf, int ibuflen _U_, 
 		     char *rbuf, int *rbuflen)
 {
     u_int16_t sessid;
@@ -316,7 +316,7 @@ pam_fail:
 }
 
 /* -------------------------------- */
-static int login(void *obj, char *username, int ulen,  struct passwd **uam_pwd,
+static int login(void *obj, char *username, int ulen,  struct passwd **uam_pwd _U_,
 		     char *ibuf, int ibuflen,
 		     char *rbuf, int *rbuflen)
 {
@@ -404,7 +404,7 @@ static int pam_login_ext(void *obj, char
 /* -------------------------------- */
 
 static int pam_logincont(void *obj, struct passwd **uam_pwd,
-			 char *ibuf, int ibuflen, 
+			 char *ibuf, int ibuflen _U_, 
 			 char *rbuf, int *rbuflen)
 {
     char *hostname;
@@ -561,7 +561,7 @@ static void pam_logout() {
 /* change pw for dhx needs a couple passes to get everything all
  * right. basically, it's like the login/logincont sequence */
 static int pam_changepw(void *obj, char *username,
-			struct passwd *pwd, char *ibuf, int ibuflen,
+			struct passwd *pwd _U_, char *ibuf, int ibuflen,
 			char *rbuf, int *rbuflen)
 {
     BIGNUM *bn1, *bn2, *bn3;
Index: etc/uams/uams_dhx_passwd.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/uams/uams_dhx_passwd.c,v
retrieving revision 1.18.6.6
retrieving revision 1.18.6.6.2.1
diff -u -p -p -u -r1.18.6.6 -r1.18.6.6.2.1
--- etc/uams/uams_dhx_passwd.c	18 Mar 2004 02:56:32 -0000	1.18.6.6
+++ etc/uams/uams_dhx_passwd.c	27 Sep 2005 10:40:41 -0000	1.18.6.6.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx_passwd.c,v 1.18.6.6 2004/03/18 02:56:32 bfernhomberg Exp $
+ * $Id: uams_dhx_passwd.c,v 1.18.6.6.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -74,8 +74,8 @@ static char *clientname;
 #endif /* TRU64 */
 
 /* dhx passwd */
-static int pwd_login(void *obj, char *username, int ulen, struct passwd **uam_pwd,
-			char *ibuf, int ibuflen,
+static int pwd_login(void *obj, char *username, int ulen, struct passwd **uam_pwd _U_,
+			char *ibuf, int ibuflen _U_,
 			char *rbuf, int *rbuflen)
 {
     unsigned char iv[] = "CJalbert";
@@ -277,7 +277,7 @@ static int passwd_login_ext(void *obj, c
 }
 			
 static int passwd_logincont(void *obj, struct passwd **uam_pwd,
-			    char *ibuf, int ibuflen, 
+			    char *ibuf, int ibuflen _U_, 
 			    char *rbuf, int *rbuflen)
 {
 #ifdef SHADOWPW
Index: etc/uams/uams_guest.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/uams/uams_guest.c,v
retrieving revision 1.12.6.2
retrieving revision 1.12.6.2.2.1
diff -u -p -p -u -r1.12.6.2 -r1.12.6.2.2.1
--- etc/uams/uams_guest.c	14 Feb 2004 02:47:15 -0000	1.12.6.2
+++ etc/uams/uams_guest.c	27 Sep 2005 10:40:41 -0000	1.12.6.2.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_guest.c,v 1.12.6.2 2004/02/14 02:47:15 didg Exp $
+ * $Id: uams_guest.c,v 1.12.6.2.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * (c) 2001 (see COPYING)
  */
@@ -43,8 +43,8 @@ extern void append(void *, const char *,
 
 /* login and login_ext are almost the same */
 static int noauth_login(void *obj, struct passwd **uam_pwd,
-			char *ibuf, int ibuflen, 
-			char *rbuf, int *rbuflen)
+			char *ibuf _U_, int ibuflen _U_, 
+			char *rbuf _U_, int *rbuflen)
 {
     struct passwd *pwent;
     char *guest, *username;
@@ -78,7 +78,7 @@ static int noauth_login(void *obj, struc
     return( AFP_OK );
 }
 
-static int noauth_login_ext(void *obj, char *uname, struct passwd **uam_pwd,
+static int noauth_login_ext(void *obj, char *uname _U_, struct passwd **uam_pwd,
                      char *ibuf, int ibuflen,
                      char *rbuf, int *rbuflen)
 {
Index: etc/uams/uams_pam.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/uams/uams_pam.c,v
retrieving revision 1.15.2.1.2.5
retrieving revision 1.15.2.1.2.5.2.1
diff -u -p -p -u -r1.15.2.1.2.5 -r1.15.2.1.2.5.2.1
--- etc/uams/uams_pam.c	14 Feb 2004 02:47:15 -0000	1.15.2.1.2.5
+++ etc/uams/uams_pam.c	27 Sep 2005 10:40:41 -0000	1.15.2.1.2.5.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_pam.c,v 1.15.2.1.2.5 2004/02/14 02:47:15 didg Exp $
+ * $Id: uams_pam.c,v 1.15.2.1.2.5.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -69,7 +69,7 @@ extern void append(void *, const char *,
 static int PAM_conv (int num_msg,
                      const struct pam_message **msg,
                      struct pam_response **resp,
-                     void *appdata_ptr) 
+                     void *appdata_ptr _U_) 
 {
   struct pam_response *reply;
   int count;
@@ -139,8 +139,8 @@ static struct pam_conv PAM_conversation 
 };
 
 static int login(void *obj, char *username, int ulen,  struct passwd **uam_pwd,
-		     char *ibuf, int ibuflen,
-		     char *rbuf, int *rbuflen)
+		     char *ibuf, int ibuflen _U_,
+		     char *rbuf _U_, int *rbuflen _U_)
 {
     struct passwd *pwd;
     int err, PAM_error;
@@ -282,9 +282,9 @@ static void pam_logout() {
 }
 
 /* change passwd */
-static int pam_changepw(void *obj, char *username,
-			struct passwd *pwd, char *ibuf, int ibuflen,
-			char *rbuf, int *rbuflen)
+static int pam_changepw(void *obj _U_, char *username,
+			struct passwd *pwd _U_, char *ibuf, int ibuflen _U_,
+			char *rbuf _U_, int *rbuflen _U_)
 {
     char pw[PASSWDLEN + 1];
     pam_handle_t *lpamh;
Index: etc/uams/uams_passwd.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/uams/uams_passwd.c,v
retrieving revision 1.19.2.1.2.9
retrieving revision 1.19.2.1.2.9.2.1
diff -u -p -p -u -r1.19.2.1.2.9 -r1.19.2.1.2.9.2.1
--- etc/uams/uams_passwd.c	15 Jun 2004 00:52:09 -0000	1.19.2.1.2.9
+++ etc/uams/uams_passwd.c	27 Sep 2005 10:40:41 -0000	1.19.2.1.2.9.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_passwd.c,v 1.19.2.1.2.9 2004/06/15 00:52:09 bfernhomberg Exp $
+ * $Id: uams_passwd.c,v 1.19.2.1.2.9.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -75,7 +75,7 @@ extern void append(void *, const char *,
 
 static int pwd_login(void *obj, char *username, int ulen, struct passwd **uam_pwd,
                         char *ibuf, int ibuflen,
-                        char *rbuf, int *rbuflen)
+                        char *rbuf _U_, int *rbuflen _U_)
 {
     char  *p;
     struct passwd *pwd;
Index: etc/uams/uams_randnum.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/uams/uams_randnum.c,v
retrieving revision 1.12.6.4
retrieving revision 1.12.6.4.2.1
diff -u -p -p -u -r1.12.6.4 -r1.12.6.4.2.1
--- etc/uams/uams_randnum.c	8 Oct 2004 00:54:40 -0000	1.12.6.4
+++ etc/uams/uams_randnum.c	27 Sep 2005 10:40:41 -0000	1.12.6.4.2.1
@@ -1,5 +1,5 @@
 /* 
- * $Id: uams_randnum.c,v 1.12.6.4 2004/10/08 00:54:40 bfernhomberg Exp $
+ * $Id: uams_randnum.c,v 1.12.6.4.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -72,8 +72,8 @@ static u_int8_t         randbuf[8];
 
 /* handle ~/.passwd. courtesy of shirsch@ibm.net. */
 static  __inline__ int home_passwd(const struct passwd *pwd, 
-				   const char *path, const int pathlen, 
-				   char *passwd, const int len,
+				   const char *path, const int pathlen _U_, 
+				   unsigned char *passwd, const int len,
 				   const int set)
 {
   struct stat st;
@@ -145,7 +145,7 @@ home_passwd_fail:
 #define unhex(x)  (isdigit(x) ? (x) - '0' : toupper(x) + 10 - 'A')
 static int afppasswd(const struct passwd *pwd, 
 		     const char *path, const int pathlen, 
-		     char *passwd, int len, 
+		     unsigned char *passwd, int len, 
 		     const int set)
 {
   u_int8_t key[DES_KEY_SZ*2];
@@ -264,7 +264,7 @@ afppasswd_done:
  * depending upon whether or not the password is in ~/.passwd
  * or in a global location */
 static int randpass(const struct passwd *pwd, const char *file,
-		    char *passwd, const int len, const int set) 
+		    unsigned char *passwd, const int len, const int set) 
 {
   int i;
   uid_t uid = geteuid();
@@ -303,8 +303,8 @@ static int randpass(const struct passwd 
 
 /* randnum sends an 8-byte number and uses the user's password to
  * check against the encrypted reply. */
-static int rand_login(void *obj, char *username, int ulen, struct passwd **uam_pwd,
-                        char *ibuf, int ibuflen,
+static int rand_login(void *obj, char *username, int ulen, struct passwd **uam_pwd _U_,
+                        char *ibuf _U_, int ibuflen _U_,
                         char *rbuf, int *rbuflen)
 {
 
@@ -350,8 +350,8 @@ static int rand_login(void *obj, char *u
 /* check encrypted reply. we actually setup the encryption stuff
  * here as the first part of randnum and rand2num are identical. */
 static int randnum_logincont(void *obj, struct passwd **uam_pwd,
-			     char *ibuf, int ibuflen, 
-			     char *rbuf, int *rbuflen)
+			     char *ibuf, int ibuflen _U_, 
+			     char *rbuf _U_, int *rbuflen)
 {
   u_int16_t sessid;
 
@@ -389,7 +389,7 @@ static int randnum_logincont(void *obj, 
  *    and sends it back as part of the reply.
  */
 static int rand2num_logincont(void *obj, struct passwd **uam_pwd,
-			      char *ibuf, int ibuflen, 
+			      char *ibuf, int ibuflen _U_, 
 			      char *rbuf, int *rbuflen)
 {
   u_int16_t sessid;
@@ -437,9 +437,9 @@ static int rand2num_logincont(void *obj,
  * NOTE: an FPLogin must already have completed successfully for this
  *       to work. 
  */
-static int randnum_changepw(void *obj, const char *username, 
+static int randnum_changepw(void *obj, const char *username _U_, 
 			    struct passwd *pwd, char *ibuf,
-			    int ibuflen, char *rbuf, int *rbuflen)
+			    int ibuflen _U_, char *rbuf _U_, int *rbuflen _U_)
 {
     char *passwdfile;
     int err, len;
Index: include/atalk/adouble.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/include/atalk/adouble.h,v
retrieving revision 1.21.6.20.2.3
retrieving revision 1.21.6.20.2.5
diff -u -p -p -u -r1.21.6.20.2.3 -r1.21.6.20.2.5
--- include/atalk/adouble.h	12 Feb 2005 11:22:05 -0000	1.21.6.20.2.3
+++ include/atalk/adouble.h	28 Sep 2005 09:38:57 -0000	1.21.6.20.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.21.6.20.2.3 2005/02/12 11:22:05 didg Exp $
+ * $Id: adouble.h,v 1.21.6.20.2.5 2005/09/28 09:38:57 didg Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -252,6 +252,9 @@ struct adouble {
     off_t               ad_rlen;     /* ressource fork len with AFP 3.0
                                         the header parameter size is too small.
                                      */
+    char                *ad_m_name;   /* mac name for open fork */
+    int                 ad_m_namelen;
+
     char                *(*ad_path)(const char *, int);
                            
 #ifdef USE_MMAPPED_HEADERS
@@ -272,6 +275,8 @@ struct adouble {
 /* adouble v2 cnid cache */
 #define ADVOL_NODEV      (1 << 0)   
 #define ADVOL_CACHE      (1 << 1)
+/* adouble unix priv */
+#define ADVOL_UNIXPRIV   (1 << 2)   
 
 /* lock flags */
 #define ADLOCK_CLR      (0)
@@ -411,7 +416,8 @@ extern int ad_metadata    __P((const cha
 #define ad_metadata(name, flags, adp)  ad_open(name, ADFLAGS_HF|(flags), O_RDONLY, 0666, adp)
 #endif
 
-/* extend header to RW if R or W (W if R for locking),
+/* build a resource fork mode from the data fork mode:
+ * remove X mode and extend header to RW if R or W (W if R for locking),
  */ 
 #ifndef ATACC
 #ifndef __inline__
@@ -419,9 +425,7 @@ extern int ad_metadata    __P((const cha
 #endif
 static __inline__ mode_t ad_hf_mode (mode_t mode)
 {
-#if 0
-    mode |= S_IRUSR;
-#endif    
+    mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH);
     /* fnctl lock need write access */
     if ((mode & S_IRUSR))
         mode |= S_IWUSR;
Index: include/atalk/cnid.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/include/atalk/cnid.h,v
retrieving revision 1.9.6.6.2.1
retrieving revision 1.9.6.6.2.2
diff -u -p -p -u -r1.9.6.6.2.1 -r1.9.6.6.2.2
--- include/atalk/cnid.h	30 Jan 2005 20:56:21 -0000	1.9.6.6.2.1
+++ include/atalk/cnid.h	27 Sep 2005 10:40:41 -0000	1.9.6.6.2.2
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.h,v 1.9.6.6.2.1 2005/01/30 20:56:21 didg Exp $
+ * $Id: cnid.h,v 1.9.6.6.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 2003 the Netatalk Team
  * Copyright (c) 2003 Rafal Lewczuk <rlewczuk@pronet.pl>
@@ -51,18 +51,17 @@ struct _cnid_db {
 	void *_private;              /* back-end speficic data */
 
 	cnid_t (*cnid_add)(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, 
-			char *name, const int len, cnid_t hint);
+			char *name, const size_t, cnid_t hint);
 	int (*cnid_delete)(struct _cnid_db *cdb, cnid_t id);
-	cnid_t (*cnid_get)(struct _cnid_db *cdb, const cnid_t did, char *name,
-			const int len);
+	cnid_t (*cnid_get)(struct _cnid_db *cdb, const cnid_t did, char *name, const  size_t);
 	cnid_t (*cnid_lookup)(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			char *name, const int len);
+			char *name, const size_t);
 	cnid_t (*cnid_nextid)(struct _cnid_db *cdb);
-	char *(*cnid_resolve)(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len);
+	char *(*cnid_resolve)(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len);
 	int (*cnid_update)(struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, char *name, const int len);	
+			const cnid_t did, char *name, const size_t len);	
 	void (*cnid_close)(struct _cnid_db *cdb);
-	int  (*cnid_getstamp)(struct _cnid_db *cdb, void *buffer, const int len);
+	int  (*cnid_getstamp)(struct _cnid_db *cdb, void *buffer, const size_t len);
 };
 typedef struct _cnid_db cnid_db;
 
@@ -88,62 +87,28 @@ void cnid_register(struct _cnid_module *
 struct _cnid_db *cnid_open(const char *volpath, mode_t mask, char *type, int flags);
 
 cnid_t cnid_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, 
-			char *name, const int len, cnid_t hint);
+			char *name, const size_t len, cnid_t hint);
 
 int    cnid_delete(struct _cnid_db *cdb, cnid_t id);
 
-cnid_t cnid_get   (struct _cnid_db *cdb, const cnid_t did, char *name,const int len);
+cnid_t cnid_get   (struct _cnid_db *cdb, const cnid_t did, char *name,const size_t len);
 
-int    cnid_getstamp(struct _cnid_db *cdb, void *buffer, const int len);
+int    cnid_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len);
 
 cnid_t cnid_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			char *name, const int len);
+			char *name, const size_t len);
 
-char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len);
+char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len);
 
 int cnid_update   (struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, char *name, const int len);	
+			const cnid_t did, char *name, const size_t len);
+
+cnid_t cnid_rebuild_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
+                        char *name, const size_t len, cnid_t hint);
+
 
 /* This function closes a CNID database and frees all resources assigned to it. */ 
 void cnid_close(struct _cnid_db *db);
 
 #endif
 
-/*
- * $Log: cnid.h,v $
- * Revision 1.9.6.6.2.1  2005/01/30 20:56:21  didg
- *
- * Olaf Hering at suse.de warning fixes.
- *
- * Revision 1.9.6.6  2004/02/22 18:36:37  didg
- *
- * small clean up
- *
- * Revision 1.9.6.5  2004/01/14 23:15:19  lenneis
- * Check if we can get a DB stamp sucessfully in afs_openvol and fail
- * the open if not.
- *
- * Revision 1.9.6.4  2004/01/10 07:19:31  bfernhomberg
- * add cnid_init prototype
- *
- * Revision 1.9.6.3  2004/01/03 22:42:55  didg
- *
- * better errors handling in afpd for dbd cnid.
- *
- * Revision 1.9.6.2  2004/01/03 22:21:09  didg
- *
- * add nodev volume option (always use 0 for device number).
- *
- * Revision 1.9.6.1  2003/09/09 16:42:20  didg
- *
- * big merge for db frontend and unicode.
- *
- * Revision 1.9.4.2  2003/06/11 15:29:11  rlewczuk
- * Removed obsolete parameter from cnid_add. Spotted by Didier.
- *
- * Revision 1.9.4.1  2003/05/29 07:53:19  rlewczuk
- * Selectable CNIDs. Some refactoring. Propably needs more of refactoring, mainly
- * a well designed API (current API is just an old cnid_* API enclosed in VMT).
- *
- */
-
Index: include/atalk/dsi.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/include/atalk/dsi.h,v
retrieving revision 1.4.6.4.2.2
retrieving revision 1.4.6.4.2.3
diff -u -p -p -u -r1.4.6.4.2.2 -r1.4.6.4.2.3
--- include/atalk/dsi.h	1 Feb 2005 12:06:17 -0000	1.4.6.4.2.2
+++ include/atalk/dsi.h	27 Sep 2005 10:40:41 -0000	1.4.6.4.2.3
@@ -64,8 +64,9 @@ typedef struct DSI {
   
   u_int32_t attn_quantum, datasize, server_quantum;
   u_int16_t serverID, clientID;
-  u_int8_t *status, commands[DSI_CMDSIZ], data[DSI_DATASIZ];
-  int statuslen;
+  char      *status;
+  u_int8_t  commands[DSI_CMDSIZ], data[DSI_DATASIZ];
+  size_t statuslen;
   size_t datalen, cmdlen;
   size_t read_count, write_count;
   int asleep; /* client won't reply AFP 0x7a ? */
@@ -142,7 +143,7 @@ extern DSI *dsi_init __P((const dsi_prot
 			  const char * /*host*/, const char * /*address*/,
 			  const int /*port*/, const int /*proxy*/,
 			  const u_int32_t /* server quantum */));
-extern void dsi_setstatus __P((DSI *, u_int8_t *, const int));
+extern void dsi_setstatus __P((DSI *, char *, const size_t));
 
 /* in dsi_getsess.c */
 extern DSI *dsi_getsession __P((DSI *, server_child *, const int));
Index: libatalk/adouble/ad_open.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/adouble/ad_open.c,v
retrieving revision 1.30.6.18.2.4
retrieving revision 1.30.6.18.2.5
diff -u -p -p -u -r1.30.6.18.2.4 -r1.30.6.18.2.5
--- libatalk/adouble/ad_open.c	12 Feb 2005 11:22:05 -0000	1.30.6.18.2.4
+++ libatalk/adouble/ad_open.c	26 May 2005 11:49:56 -0000	1.30.6.18.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_open.c,v 1.30.6.18.2.4 2005/02/12 11:22:05 didg Exp $
+ * $Id: ad_open.c,v 1.30.6.18.2.5 2005/05/26 11:49:56 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -484,6 +484,7 @@ mode_t ad_hf_mode (mode_t mode)
 #if 0
     mode |= S_IRUSR;
 #endif    
+    mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH);
     /* fnctl lock need write access */
     if ((mode & S_IRUSR))
         mode |= S_IWUSR;
@@ -943,7 +944,7 @@ int ad_open( path, adflags, oflags, mode
     struct stat         st;
     char		*slash, *ad_p;
     int			hoflags, admode;
-    int                 st_invalid;
+    int                 st_invalid = -1;
     int                 open_df = 0;
     
     if (ad->ad_inited != AD_INITED) {
@@ -959,12 +960,17 @@ int ad_open( path, adflags, oflags, mode
         if (ad_dfileno(ad) == -1) {
 	  hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
 	  admode = mode;
-	  st_invalid = ad_mode_st(path, &admode, &st);
+	  if ((oflags & O_CREAT)) {
+	      st_invalid = ad_mode_st(path, &admode, &st);
+	      if ((ad->ad_options & ADVOL_UNIXPRIV)) {
+	          admode = mode;
+	      }
+	  }
           ad->ad_df.adf_fd =open( path, hoflags, admode );
 	  if (ad->ad_df.adf_fd < 0 ) {
              if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) {
                 hoflags = oflags;
-                ad->ad_df.adf_fd =open( path, hoflags, admode );
+                ad->ad_df.adf_fd = open( path, hoflags, admode );
              }
 	  }
 	  if ( ad->ad_df.adf_fd < 0)
@@ -972,7 +978,7 @@ int ad_open( path, adflags, oflags, mode
 
 	  AD_SET(ad->ad_df.adf_off);
 	  ad->ad_df.adf_flags = hoflags;
-	  if ((oflags & O_CREAT) && !st_invalid) {
+	  if (!st_invalid) {
 	      /* just created, set owner if admin (root) */
 	      ad_chown(path, &st);
 	  }
@@ -1039,6 +1045,9 @@ int ad_open( path, adflags, oflags, mode
 	    admode = mode;
 	    errno = 0;
 	    st_invalid = ad_mode_st(ad_p, &admode, &st);
+	    if ((ad->ad_options & ADVOL_UNIXPRIV)) {
+	        admode = mode;
+	    }
 	    admode = ad_hf_mode(admode); 
 	    if ( errno == ENOENT && !(adflags & ADFLAGS_NOADOUBLE) && ad->ad_flags != AD_VERSION2_OSX) {
 		/*
@@ -1056,6 +1065,9 @@ int ad_open( path, adflags, oflags, mode
 		*slash = '/';
 		admode = mode;
 		st_invalid = ad_mode_st(ad_p, &admode, &st);
+		if ((ad->ad_options & ADVOL_UNIXPRIV)) {
+	            admode = mode;
+	        }
 		admode = ad_hf_mode(admode); 
 	    }
 	    /* retry with O_CREAT */
Index: libatalk/cnid/cnid.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cnid.c,v
retrieving revision 1.1.4.11.2.2
retrieving revision 1.1.4.11.2.3
diff -u -p -p -u -r1.1.4.11.2.2 -r1.1.4.11.2.3
--- libatalk/cnid/cnid.c	31 Jan 2005 17:01:16 -0000	1.1.4.11.2.2
+++ libatalk/cnid/cnid.c	27 Sep 2005 10:40:41 -0000	1.1.4.11.2.3
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.c,v 1.1.4.11.2.2 2005/01/31 17:01:16 didg Exp $
+ * $Id: cnid.c,v 1.1.4.11.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 2003 the Netatalk Team
  * Copyright (c) 2003 Rafal Lewczuk <rlewczuk@pronet.pl>
@@ -196,7 +196,7 @@ u_int32_t flags;
 
 /* --------------- */
 cnid_t cnid_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, 
-			char *name, const int len, cnid_t hint)
+			char *name, const size_t len, cnid_t hint)
 {
 cnid_t ret;
 
@@ -219,7 +219,7 @@ int ret;
 
 
 /* --------------- */
-cnid_t cnid_get(struct _cnid_db *cdb, const cnid_t did, char *name,const int len)
+cnid_t cnid_get(struct _cnid_db *cdb, const cnid_t did, char *name,const size_t len)
 {
 cnid_t ret;
 
@@ -230,7 +230,7 @@ cnid_t ret;
 }
 
 /* --------------- */
-int cnid_getstamp(struct _cnid_db *cdb,  void *buffer, const int len)
+int cnid_getstamp(struct _cnid_db *cdb,  void *buffer, const size_t len)
 {
 cnid_t ret;
 time_t t;
@@ -252,7 +252,7 @@ time_t t;
 
 /* --------------- */
 cnid_t cnid_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			char *name, const int len)
+			char *name, const size_t len)
 {
 cnid_t ret;
 
@@ -263,7 +263,7 @@ cnid_t ret;
 }
 
 /* --------------- */
-char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len)
+char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len)
 {
 char *ret;
 
@@ -275,7 +275,7 @@ char *ret;
 
 /* --------------- */
 int cnid_update   (struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, char *name, const int len)
+			const cnid_t did, char *name, const size_t len)
 {
 int ret;
 
Index: libatalk/cnid/cdb/cnid_cdb.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb.h,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -p -p -u -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- libatalk/cnid/cdb/cnid_cdb.h	30 Jan 2005 20:56:22 -0000	1.1.4.2.2.1
+++ libatalk/cnid/cdb/cnid_cdb.h	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.2
@@ -23,18 +23,18 @@ extern void cnid_cdb_close __P((struct _
 
 /* cnid_add.c */
 extern cnid_t cnid_cdb_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			    char *, const int, cnid_t));
-extern int cnid_cdb_getstamp __P((struct _cnid_db *, void *, const int ));
+			    char *, const size_t, cnid_t));
+extern int cnid_cdb_getstamp __P((struct _cnid_db *, void *, const size_t ));
 
 /* cnid_get.c */
-extern cnid_t cnid_cdb_get __P((struct _cnid_db *, const cnid_t, char *, const int)); 
-extern char *cnid_cdb_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t )); 
+extern cnid_t cnid_cdb_get __P((struct _cnid_db *, const cnid_t, char *, const size_t)); 
+extern char *cnid_cdb_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t )); 
 extern cnid_t cnid_cdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       char *, const int));
+			       char *, const size_t));
 
 /* cnid_update.c */
 extern int cnid_cdb_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, char *, int));
+			    const cnid_t, char *, size_t));
 
 /* cnid_delete.c */
 extern int cnid_cdb_delete __P((struct _cnid_db *, const cnid_t));
Index: libatalk/cnid/cdb/cnid_cdb_add.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_add.c,v
retrieving revision 1.1.4.6.2.1
retrieving revision 1.1.4.6.2.2
diff -u -p -p -u -r1.1.4.6.2.1 -r1.1.4.6.2.2
--- libatalk/cnid/cdb/cnid_cdb_add.c	30 Jan 2005 20:56:22 -0000	1.1.4.6.2.1
+++ libatalk/cnid/cdb/cnid_cdb_add.c	27 Sep 2005 10:40:41 -0000	1.1.4.6.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_add.c,v 1.1.4.6.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_cdb_add.c,v 1.1.4.6.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -40,11 +40,11 @@ static void make_devino_data(unsigned ch
     buf[CNID_DEV_LEN + CNID_INO_LEN - 8] = ino;    
 }
 
-char *make_cnid_data(const struct stat *st,const cnid_t did,
-                     const char *name, const int len)
+unsigned char *make_cnid_data(const struct stat *st,const cnid_t did,
+                     const char *name, const size_t len)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start  +CNID_LEN;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start  +CNID_LEN;
     u_int32_t i;
 
     if (len > MAXPATHLEN)
@@ -70,7 +70,7 @@ char *make_cnid_data(const struct stat *
 #endif
 
 extern int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len);
+                const cnid_t did, char *name, const size_t len);
 
 /* --------------- */
 int db_stamp(void *buffer, size_t size)
@@ -169,7 +169,7 @@ cleanup:
 
 /* ------------------------ */
 cnid_t cnid_cdb_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, char *name, const int len,
+                const cnid_t did, char *name, const size_t len,
                 cnid_t hint)
 {
     CNID_private *db;
@@ -246,7 +246,7 @@ cnid_t cnid_cdb_add(struct _cnid_db *cdb
 
 /* cnid_cbd_getstamp */
 /*-----------------------*/
-int cnid_cdb_getstamp(struct _cnid_db *cdb, void *buffer, const int len)
+int cnid_cdb_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len)
 {
     DBT key, data;
     int rc;
Index: libatalk/cnid/cdb/cnid_cdb_get.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_get.c,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -p -p -u -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- libatalk/cnid/cdb/cnid_cdb_get.c	30 Jan 2005 20:56:22 -0000	1.1.4.2.2.1
+++ libatalk/cnid/cdb/cnid_cdb_get.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_get.c,v 1.1.4.2.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_cdb_get.c,v 1.1.4.2.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 
 /* Return CNID for a given did/name. */
 cnid_t cnid_cdb_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-                const int len)
+                const size_t len)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
     CNID_private *db;
Index: libatalk/cnid/cdb/cnid_cdb_lookup.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_lookup.c,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.2
diff -u -p -p -u -r1.1.4.5.2.1 -r1.1.4.5.2.2
--- libatalk/cnid/cdb/cnid_cdb_lookup.c	30 Jan 2005 20:56:22 -0000	1.1.4.5.2.1
+++ libatalk/cnid/cdb/cnid_cdb_lookup.c	27 Sep 2005 10:40:41 -0000	1.1.4.5.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_lookup.c,v 1.1.4.5.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_cdb_lookup.c,v 1.1.4.5.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,9 +15,9 @@
 /* This returns the CNID corresponding to a particular file.  It will
  * also fix up the various databases if there's a problem. */
 cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                   char *name, const int len)
+                   char *name, const size_t len)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, devdata, diddata;
     char dev[CNID_DEV_LEN];
Index: libatalk/cnid/cdb/cnid_cdb_open.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_open.c,v
retrieving revision 1.1.4.10
retrieving revision 1.1.4.10.2.1
diff -u -p -p -u -r1.1.4.10 -r1.1.4.10.2.1
--- libatalk/cnid/cdb/cnid_cdb_open.c	22 Mar 2004 04:38:51 -0000	1.1.4.10
+++ libatalk/cnid/cdb/cnid_cdb_open.c	27 Sep 2005 10:40:41 -0000	1.1.4.10.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_cdb_open.c,v 1.1.4.10 2004/03/22 04:38:51 bfernhomberg Exp $
+ * $Id: cnid_cdb_open.c,v 1.1.4.10.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -86,8 +86,8 @@ static int my_yield(void)
 
 /* --------------- */
 static int didname(dbp, pkey, pdata, skey)
-DB *dbp;
-const DBT *pkey, *pdata;
+DB *dbp _U_;
+const DBT *pkey _U_, *pdata;
 DBT *skey;
 {
 int len;
@@ -101,8 +101,8 @@ int len;
  
 /* --------------- */
 static int devino(dbp, pkey, pdata, skey)
-DB *dbp;
-const DBT *pkey, *pdata;
+DB *dbp _U_;
+const DBT *pkey _U_, *pdata;
 DBT *skey;
 {
     memset(skey, 0, sizeof(DBT));
Index: libatalk/cnid/cdb/cnid_cdb_private.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_private.h,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.7.2.1
diff -u -p -p -u -r1.1.4.7 -r1.1.4.7.2.1
--- libatalk/cnid/cdb/cnid_cdb_private.h	22 Mar 2004 04:38:51 -0000	1.1.4.7
+++ libatalk/cnid/cdb/cnid_cdb_private.h	27 Sep 2005 10:40:41 -0000	1.1.4.7.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_private.h,v 1.1.4.7 2004/03/22 04:38:51 bfernhomberg Exp $
+ * $Id: cnid_cdb_private.h,v 1.1.4.7.2.1 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifndef LIBATALK_CDB_PRIVATE_H
@@ -195,12 +195,12 @@ static void make_devino_data(unsigned ch
     buf[CNID_DEV_LEN + CNID_INO_LEN - 8] = ino;    
 }
 
-static __inline__ char *make_cnid_data(const struct stat *st,
+static __inline__ unsigned char *make_cnid_data(const struct stat *st,
                                        const cnid_t did,
-                                       const char *name, const int len)
+                                       const char *name, const size_t len)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start  +CNID_LEN;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start  +CNID_LEN;
     u_int32_t i;
 
     if (len > MAXPATHLEN)
@@ -224,8 +224,8 @@ static __inline__ char *make_cnid_data(c
     return start;
 }
 #else
-extern char *make_cnid_data __P((const struct stat *,const cnid_t ,
-                                       const char *, const int ));
+extern unsigned char *make_cnid_data __P((const struct stat *,const cnid_t ,
+                                       const char *, const size_t ));
 #endif
 
 #endif /* atalk/cnid/cnid_private.h */
Index: libatalk/cnid/cdb/cnid_cdb_resolve.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_resolve.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.2.2.1
diff -u -p -p -u -r1.1.4.2 -r1.1.4.2.2.1
--- libatalk/cnid/cdb/cnid_cdb_resolve.c	21 Oct 2003 16:23:54 -0000	1.1.4.2
+++ libatalk/cnid/cdb/cnid_cdb_resolve.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_resolve.c,v 1.1.4.2 2003/10/21 16:23:54 didg Exp $
+ * $Id: cnid_cdb_resolve.c,v 1.1.4.2.2.1 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -10,7 +10,7 @@
 #include "cnid_cdb_private.h"
 
 /* Return the did/name pair corresponding to a CNID. */
-char *cnid_cdb_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len) {
+char *cnid_cdb_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len) {
     CNID_private *db;
     DBT key, data;
     int rc;
Index: libatalk/cnid/cdb/cnid_cdb_update.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_update.c,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.2
diff -u -p -p -u -r1.1.4.4.2.1 -r1.1.4.4.2.2
--- libatalk/cnid/cdb/cnid_cdb_update.c	30 Jan 2005 20:56:22 -0000	1.1.4.4.2.1
+++ libatalk/cnid/cdb/cnid_cdb_update.c	27 Sep 2005 10:40:41 -0000	1.1.4.4.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_update.c,v 1.1.4.4.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_cdb_update.c,v 1.1.4.4.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,10 +15,10 @@
  * handle the did/name data, there are a bunch of functions to get
  * and set the various fields. */
 int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len
+                const cnid_t did, char *name, const size_t len
                 /*, const char *info, const int infolen*/)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, pkey, data;
     int rc;
Index: libatalk/cnid/db3/cnid_db3.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3.h,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -p -p -u -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- libatalk/cnid/db3/cnid_db3.h	30 Jan 2005 20:56:22 -0000	1.1.4.1.2.1
+++ libatalk/cnid/db3/cnid_db3.h	27 Sep 2005 10:40:41 -0000	1.1.4.1.2.2
@@ -60,17 +60,17 @@ extern void cnid_db3_close __P((struct _
 
 /* cnid_add.c */
 extern cnid_t cnid_db3_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			    char *, const int, cnid_t));
+			    char *, const size_t, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_db3_get __P((struct _cnid_db *, const cnid_t, char *, const int)); 
-extern char *cnid_db3_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t )); 
+extern cnid_t cnid_db3_get __P((struct _cnid_db *, const cnid_t, char *, const size_t)); 
+extern char *cnid_db3_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t )); 
 extern cnid_t cnid_db3_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       char *, const int));
+			       char *, const size_t));
 
 /* cnid_update.c */
 extern int cnid_db3_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, char *, int));
+			    const cnid_t, char *, size_t));
 
 /* cnid_delete.c */
 extern int cnid_db3_delete __P((struct _cnid_db *, const cnid_t));
Index: libatalk/cnid/db3/cnid_db3_add.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3_add.c,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -p -p -u -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- libatalk/cnid/db3/cnid_db3_add.c	30 Jan 2005 20:56:22 -0000	1.1.4.2.2.1
+++ libatalk/cnid/db3/cnid_db3_add.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_add.c,v 1.1.4.2.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_db3_add.c,v 1.1.4.2.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -118,7 +118,6 @@ static cnid_t get_cnid(CNID_private *db)
     DBT rootinfo_key, rootinfo_data;
     DB_TXN *tid;
     int rc;
-    int flag;
     cnid_t hint,id;
 
     memset(&rootinfo_key, 0, sizeof(rootinfo_key));
@@ -203,7 +202,7 @@ cleanup_abort:
 
 /* ------------------------ */
 cnid_t cnid_db3_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, char *name, const int len,
+                const cnid_t did, char *name, const size_t len,
                 cnid_t hint)
 {
     CNID_private *db;
Index: libatalk/cnid/db3/cnid_db3_get.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3_get.c,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -p -p -u -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- libatalk/cnid/db3/cnid_db3_get.c	30 Jan 2005 20:56:22 -0000	1.1.4.2.2.1
+++ libatalk/cnid/db3/cnid_db3_get.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_get.c,v 1.1.4.2.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_db3_get.c,v 1.1.4.2.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,8 +27,7 @@
 #include "cnid_db3_private.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-                const int len)
+cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
     CNID_private *db;
Index: libatalk/cnid/db3/cnid_db3_lookup.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3_lookup.c,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -p -p -u -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- libatalk/cnid/db3/cnid_db3_lookup.c	30 Jan 2005 20:56:22 -0000	1.1.4.2.2.1
+++ libatalk/cnid/db3/cnid_db3_lookup.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_lookup.c,v 1.1.4.2.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_db3_lookup.c,v 1.1.4.2.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,9 +32,9 @@
 
 /* This returns the CNID corresponding to a particular file.  It will
  * also fix up the various databases if there's a problem. */
-cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
+cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, devdata, diddata;
     int devino = 1, didname = 1;
Index: libatalk/cnid/db3/cnid_db3_private.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3_private.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.3.2.1
diff -u -p -p -u -r1.1.4.3 -r1.1.4.3.2.1
--- libatalk/cnid/db3/cnid_db3_private.h	30 Oct 2003 09:38:47 -0000	1.1.4.3
+++ libatalk/cnid/db3/cnid_db3_private.h	27 Sep 2005 10:40:41 -0000	1.1.4.3.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_private.h,v 1.1.4.3 2003/10/30 09:38:47 bfernhomberg Exp $
+ * $Id: cnid_db3_private.h,v 1.1.4.3.2.1 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifndef LIBATALK_CNID_PRIVATE_H
@@ -106,12 +106,12 @@ typedef struct CNID_private {
 #endif /* __inline__ */
 
 /* construct db_cnid data. NOTE: this is not re-entrant.  */
-static __inline__ char *make_cnid_data(const struct stat *st,
+static __inline__ unsigned char *make_cnid_data(const struct stat *st,
                                        const cnid_t did,
-                                       const char *name, const int len)
+                                       const char *name, const size_t len)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start;
     u_int32_t i;
 
     if (len > MAXPATHLEN)
Index: libatalk/cnid/db3/cnid_db3_resolve.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3_resolve.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.2.2.1
diff -u -p -p -u -r1.1.4.2 -r1.1.4.2.2.1
--- libatalk/cnid/db3/cnid_db3_resolve.c	21 Oct 2003 16:23:54 -0000	1.1.4.2
+++ libatalk/cnid/db3/cnid_db3_resolve.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_resolve.c,v 1.1.4.2 2003/10/21 16:23:54 didg Exp $
+ * $Id: cnid_db3_resolve.c,v 1.1.4.2.2.1 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
 #include "cnid_db3_private.h"
 
 /* Return the did/name pair corresponding to a CNID. */
-char *cnid_db3_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len) {
+char *cnid_db3_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len) {
     CNID_private *db;
     DBT key, data;
     int rc;
Index: libatalk/cnid/db3/cnid_db3_update.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/db3/cnid_db3_update.c,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.2
diff -u -p -p -u -r1.1.4.2.2.1 -r1.1.4.2.2.2
--- libatalk/cnid/db3/cnid_db3_update.c	30 Jan 2005 20:56:22 -0000	1.1.4.2.2.1
+++ libatalk/cnid/db3/cnid_db3_update.c	27 Sep 2005 10:40:41 -0000	1.1.4.2.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_update.c,v 1.1.4.2.2.1 2005/01/30 20:56:22 didg Exp $
+ * $Id: cnid_db3_update.c,v 1.1.4.2.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
  * handle the did/name data, there are a bunch of functions to get
  * and set the various fields. */
 int cnid_db3_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len
+                const cnid_t did, char *name, const size_t len
                 /*, const char *info, const int infolen*/)
 {
     CNID_private *db;
Index: libatalk/cnid/dbd/cnid_dbd.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/dbd/cnid_dbd.c,v
retrieving revision 1.1.4.18.2.2
retrieving revision 1.1.4.18.2.3
diff -u -p -p -u -r1.1.4.18.2.2 -r1.1.4.18.2.3
--- libatalk/cnid/dbd/cnid_dbd.c	6 Feb 2005 10:16:03 -0000	1.1.4.18.2.2
+++ libatalk/cnid/dbd/cnid_dbd.c	27 Sep 2005 10:40:41 -0000	1.1.4.18.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_dbd.c,v 1.1.4.18.2.2 2005/02/06 10:16:03 didg Exp $
+ * $Id: cnid_dbd.c,v 1.1.4.18.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -375,7 +375,7 @@ static struct _cnid_db *cnid_dbd_new(con
 }
 
 /* ---------------------- */
-struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask)
+struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask _U_)
 {
     CNID_private *db = NULL;
     struct _cnid_db *cdb = NULL;
@@ -446,8 +446,8 @@ void cnid_dbd_close(struct _cnid_db *cdb
 
 /* ---------------------- */
 cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, char *name, const int len,
-                cnid_t hint)
+                const cnid_t did, char *name, const size_t len,
+                cnid_t hint _U_)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -479,6 +479,7 @@ cnid_t cnid_dbd_add(struct _cnid_db *cdb
     rqst.name = name;
     rqst.namelen = len;
 
+    rply.namelen = 0;
     if (transmit(db, &rqst, &rply) < 0) {
         errno = CNID_ERR_DB;
         return CNID_INVALID;
@@ -504,8 +505,7 @@ cnid_t cnid_dbd_add(struct _cnid_db *cdb
 }
 
 /* ---------------------- */
-cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-                const int len)
+cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -531,6 +531,7 @@ cnid_t cnid_dbd_get(struct _cnid_db *cdb
     rqst.name = name;
     rqst.namelen = len;
 
+    rply.namelen = 0;
     if (transmit(db, &rqst, &rply) < 0) {
         errno = CNID_ERR_DB;
         return CNID_INVALID;
@@ -555,7 +556,7 @@ cnid_t cnid_dbd_get(struct _cnid_db *cdb
 }
 
 /* ---------------------- */
-char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len)
+char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -630,7 +631,7 @@ static int dbd_getstamp(CNID_private *db
 }
 
 /* ---------------------- */
-int cnid_dbd_getstamp(struct _cnid_db *cdb, void *buffer, const int len)
+int cnid_dbd_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len)
 {
     CNID_private *db;
     int ret;
@@ -650,7 +651,7 @@ int cnid_dbd_getstamp(struct _cnid_db *c
 
 /* ---------------------- */
 cnid_t cnid_dbd_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                   char *name, const int len)
+                   char *name, const size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -682,6 +683,7 @@ cnid_t cnid_dbd_lookup(struct _cnid_db *
     rqst.name = name;
     rqst.namelen = len;
 
+    rply.namelen = 0;
     if (transmit(db, &rqst, &rply) < 0) {
         errno = CNID_ERR_DB;
         return CNID_INVALID;
@@ -707,7 +709,7 @@ cnid_t cnid_dbd_lookup(struct _cnid_db *
 
 /* ---------------------- */
 int cnid_dbd_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len)
+                const cnid_t did, char *name, const size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -738,6 +740,7 @@ int cnid_dbd_update(struct _cnid_db *cdb
     rqst.name = name;
     rqst.namelen = len;
 
+    rply.namelen = 0;
     if (transmit(db, &rqst, &rply) < 0) {
         errno = CNID_ERR_DB;
         return -1;
@@ -773,6 +776,7 @@ int cnid_dbd_delete(struct _cnid_db *cdb
     rqst.op = CNID_DBD_OP_DELETE;
     rqst.cnid = id;
 
+    rply.namelen = 0;
     if (transmit(db, &rqst, &rply) < 0) {
         errno = CNID_ERR_DB;
         return -1;
@@ -790,6 +794,7 @@ int cnid_dbd_delete(struct _cnid_db *cdb
     }
 }
 
+
 struct _cnid_module cnid_dbd_module = {
     "dbd",
     {NULL, NULL},
Index: libatalk/cnid/dbd/cnid_dbd.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/dbd/cnid_dbd.h,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.2
diff -u -p -p -u -r1.1.4.3.2.1 -r1.1.4.3.2.2
--- libatalk/cnid/dbd/cnid_dbd.h	30 Jan 2005 20:56:23 -0000	1.1.4.3.2.1
+++ libatalk/cnid/dbd/cnid_dbd.h	27 Sep 2005 10:40:41 -0000	1.1.4.3.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_dbd.h,v 1.1.4.3.2.1 2005/01/30 20:56:23 didg Exp $
+ * $Id: cnid_dbd.h,v 1.1.4.3.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -21,14 +21,14 @@ extern struct _cnid_module cnid_dbd_modu
 extern struct _cnid_db *cnid_dbd_open __P((const char *, mode_t));
 extern void cnid_dbd_close __P((struct _cnid_db *));
 extern cnid_t cnid_dbd_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			    char *, const int, cnid_t));
-extern cnid_t cnid_dbd_get __P((struct _cnid_db *, const cnid_t, char *, const int)); 
-extern char *cnid_dbd_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t )); 
-extern int cnid_dbd_getstamp __P((struct _cnid_db *, void *, const int )); 
+			    char *, const size_t, cnid_t));
+extern cnid_t cnid_dbd_get __P((struct _cnid_db *, const cnid_t, char *, const size_t)); 
+extern char *cnid_dbd_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t )); 
+extern int cnid_dbd_getstamp __P((struct _cnid_db *, void *, const size_t )); 
 extern cnid_t cnid_dbd_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       char *, const int));
+			       char *, const size_t));
 extern int cnid_dbd_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, char *, int));
+			    const cnid_t, char *, size_t));
 extern int cnid_dbd_delete __P((struct _cnid_db *, const cnid_t));
 
 #endif /* include/atalk/cnid_dbd.h */
Index: libatalk/cnid/last/cnid_last.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/last/cnid_last.c,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -u -p -p -u -r1.1.4.1.2.2 -r1.1.4.1.2.3
--- libatalk/cnid/last/cnid_last.c	6 Feb 2005 10:16:03 -0000	1.1.4.1.2.2
+++ libatalk/cnid/last/cnid_last.c	27 Sep 2005 10:40:41 -0000	1.1.4.1.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_last.c,v 1.1.4.1.2.2 2005/02/06 10:16:03 didg Exp $
+ * $Id: cnid_last.c,v 1.1.4.1.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -23,7 +23,7 @@
 
 /* ------------------------ */
 cnid_t cnid_last_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, char *name, const int len, cnid_t hint)
+                     const cnid_t did _U_, char *name _U_, const size_t len _U_, cnid_t hint _U_)
 {
 
     /* FIXME: it relies on fact, that this is never called twice for the same file/dir. */
@@ -80,7 +80,7 @@ void cnid_last_close(struct _cnid_db *cd
 
 
 
-int cnid_last_delete(struct _cnid_db *cdb, const cnid_t id)
+int cnid_last_delete(struct _cnid_db *cdb _U_, const cnid_t id _U_)
 {
     return CNID_INVALID;
 }
@@ -88,7 +88,7 @@ int cnid_last_delete(struct _cnid_db *cd
 
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_last_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
+cnid_t cnid_last_get(struct _cnid_db *cdb _U_, const cnid_t did _U_, char *name _U_, const size_t len _U_)
 {
     /* FIXME: it relies on fact, that this is never called twice for the same file/dir. */
     /* Propably we should look through DID tree. */
@@ -98,7 +98,8 @@ cnid_t cnid_last_get(struct _cnid_db *cd
 
 
 /* */
-cnid_t cnid_last_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
+cnid_t cnid_last_lookup(struct _cnid_db *cdb _U_, const struct stat *st _U_, const cnid_t did _U_, 
+    char *name _U_, const size_t len _U_)
 {
     /* FIXME: this function doesn't work in [last] scheme ! */
     /* Should be never called or CNID should be somewhat refactored again. */
@@ -143,7 +144,7 @@ static struct _cnid_db *cnid_last_new(co
     return cdb;
 }
 
-struct _cnid_db *cnid_last_open(const char *dir, mode_t mask)
+struct _cnid_db *cnid_last_open(const char *dir, mode_t mask _U_)
 {
     struct _cnid_db *cdb;
 
@@ -167,16 +168,15 @@ struct _cnid_module cnid_last_module = {
 };
 
 /* Return the did/name pair corresponding to a CNID. */
-char *cnid_last_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer, u_int32_t len)
+char *cnid_last_resolve(struct _cnid_db *cdb _U_, cnid_t * id _U_, void *buffer _U_, size_t len _U_)
 {
     /* FIXME: frankly, it does not work. As get, add and other functions. */
     return NULL;
 }
 
 
-int cnid_last_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, char *name, const int len
-                     /*, const char *info, const int infolen */ )
+int cnid_last_update(struct _cnid_db *cdb _U_, const cnid_t id _U_, const struct stat *st _U_,
+                     const cnid_t did  _U_, char *name  _U_, const size_t len _U_)
 {
     return 0;
 }
Index: libatalk/cnid/last/cnid_last.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/last/cnid_last.h,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -p -p -u -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- libatalk/cnid/last/cnid_last.h	30 Jan 2005 20:56:23 -0000	1.1.4.1.2.1
+++ libatalk/cnid/last/cnid_last.h	27 Sep 2005 10:40:41 -0000	1.1.4.1.2.2
@@ -23,12 +23,12 @@ extern struct _cnid_module cnid_last_mod
 extern struct _cnid_db *cnid_last_open __P((const char *, mode_t));
 extern void cnid_last_close __P((struct _cnid_db *));
 extern cnid_t cnid_last_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-                                 char *, const int, cnid_t));
-extern cnid_t cnid_last_get __P((struct _cnid_db *, const cnid_t, char *, const int));
-extern char *cnid_last_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t));
-extern cnid_t cnid_last_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
+                                 char *, const size_t, cnid_t));
+extern cnid_t cnid_last_get __P((struct _cnid_db *, const cnid_t, char *, const size_t));
+extern char *cnid_last_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t));
+extern cnid_t cnid_last_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const size_t));
 extern int cnid_last_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, char *, int));
+                                 const cnid_t, char *, size_t));
 extern int cnid_last_delete __P((struct _cnid_db *, const cnid_t));
 
 #endif /* include/atalk/cnid_last.h */
Index: libatalk/cnid/tdb/cnid_tdb.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/tdb/cnid_tdb.h,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -p -p -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- libatalk/cnid/tdb/cnid_tdb.h	30 Jan 2005 20:56:23 -0000	1.1.2.1.2.1
+++ libatalk/cnid/tdb/cnid_tdb.h	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.2
@@ -70,16 +70,16 @@ extern void cnid_tdb_close __P((struct _
 
 /* cnid_add.c */
 extern cnid_t cnid_tdb_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-                                 char *, const int, cnid_t));
+                                 char *, const size_t, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_tdb_get __P((struct _cnid_db *, const cnid_t, char *, const int));
-extern char *cnid_tdb_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t));
-extern cnid_t cnid_tdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
+extern cnid_t cnid_tdb_get __P((struct _cnid_db *, const cnid_t, char *, const size_t));
+extern char *cnid_tdb_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t));
+extern cnid_t cnid_tdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const size_t));
 
 /* cnid_update.c */
 extern int cnid_tdb_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, char *, int));
+                                 const cnid_t, char *, size_t));
 
 /* cnid_delete.c */
 extern int cnid_tdb_delete __P((struct _cnid_db *, const cnid_t));
@@ -90,7 +90,7 @@ extern cnid_t cnid_tdb_nextid __P((struc
 /* construct db_cnid data. NOTE: this is not re-entrant.  */
 static __inline__ char *make_tdb_data(const struct stat *st,
                                        const cnid_t did,
-                                       const char *name, const int len)
+                                       const char *name, const size_t len)
 {
     static char start[TDB_HEADER_LEN + MAXPATHLEN + 1];
     char *buf = start;
Index: libatalk/cnid/tdb/cnid_tdb_add.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/tdb/cnid_tdb_add.c,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -p -p -u -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- libatalk/cnid/tdb/cnid_tdb_add.c	31 Jan 2005 17:01:16 -0000	1.1.2.1.2.2
+++ libatalk/cnid/tdb/cnid_tdb_add.c	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_add.c,v 1.1.2.1.2.2 2005/01/31 17:01:16 didg Exp $
+ * $Id: cnid_tdb_add.c,v 1.1.2.1.2.3 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -103,7 +103,7 @@ cleanup:
 
 /* ------------------------ */
 cnid_t cnid_tdb_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, char *name, const int len, cnid_t hint)
+                     const cnid_t did, char *name, const size_t len, cnid_t hint)
 {
     const struct stat *lstp;
     cnid_t id;
Index: libatalk/cnid/tdb/cnid_tdb_get.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/tdb/cnid_tdb_get.c,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -p -p -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- libatalk/cnid/tdb/cnid_tdb_get.c	30 Jan 2005 20:56:23 -0000	1.1.2.1.2.1
+++ libatalk/cnid/tdb/cnid_tdb_get.c	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_get.c,v 1.1.2.1.2.1 2005/01/30 20:56:23 didg Exp $
+ * $Id: cnid_tdb_get.c,v 1.1.2.1.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 #include "cnid_tdb.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
+cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
 {
     char start[TDB_DID_LEN + MAXPATHLEN + 1], *buf;
     struct _cnid_tdb_private *db;
Index: libatalk/cnid/tdb/cnid_tdb_lookup.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/tdb/cnid_tdb_lookup.c,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -p -p -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- libatalk/cnid/tdb/cnid_tdb_lookup.c	30 Jan 2005 20:56:23 -0000	1.1.2.1.2.1
+++ libatalk/cnid/tdb/cnid_tdb_lookup.c	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_lookup.c,v 1.1.2.1.2.1 2005/01/30 20:56:23 didg Exp $
+ * $Id: cnid_tdb_lookup.c,v 1.1.2.1.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 #include "cnid_tdb.h"
 #include <atalk/logger.h>
 
-cnid_t cnid_tdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
+cnid_t cnid_tdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len)
 {
     char *buf;
     struct _cnid_tdb_private *db;
Index: libatalk/cnid/tdb/cnid_tdb_update.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/tdb/cnid_tdb_update.c,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -p -p -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- libatalk/cnid/tdb/cnid_tdb_update.c	30 Jan 2005 20:56:23 -0000	1.1.2.1.2.1
+++ libatalk/cnid/tdb/cnid_tdb_update.c	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_update.c,v 1.1.2.1.2.1 2005/01/30 20:56:23 didg Exp $
+ * $Id: cnid_tdb_update.c,v 1.1.2.1.2.2 2005/09/27 10:40:41 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -12,7 +12,7 @@
 #include <atalk/logger.h>
 
 int cnid_tdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, char *name, const int len
+                     const cnid_t did, char *name, const size_t len
                      /*, const char *info, const int infolen */ )
 {
     struct _cnid_tdb_private *db;
Index: libatalk/dsi/dsi_getstat.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/dsi/dsi_getstat.c,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -p -p -u -r1.3 -r1.3.16.1
--- libatalk/dsi/dsi_getstat.c	29 Jun 2001 14:14:46 -0000	1.3
+++ libatalk/dsi/dsi_getstat.c	12 Sep 2005 16:10:19 -0000	1.3.16.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_getstat.c,v 1.3 2001/06/29 14:14:46 rufustfirefly Exp $
+ * $Id: dsi_getstat.c,v 1.3.16.1 2005/09/12 16:10:19 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -21,6 +21,7 @@ void dsi_getstatus(DSI *dsi)
 {
   dsi->header.dsi_flags = DSIFL_REPLY;
   /*dsi->header.dsi_command = DSIFUNC_STAT;*/
+  dsi->header.dsi_code = dsi->header.dsi_reserved = 0;
   
   memcpy(dsi->commands, dsi->status, dsi->statuslen);
   dsi->cmdlen = dsi->statuslen; 
Index: libatalk/dsi/dsi_init.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/dsi/dsi_init.c,v
retrieving revision 1.3.14.1
retrieving revision 1.3.14.1.2.1
diff -u -p -p -u -r1.3.14.1 -r1.3.14.1.2.1
--- libatalk/dsi/dsi_init.c	27 Apr 2004 22:45:37 -0000	1.3.14.1
+++ libatalk/dsi/dsi_init.c	27 Sep 2005 10:40:41 -0000	1.3.14.1.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_init.c,v 1.3.14.1 2004/04/27 22:45:37 didg Exp $
+ * $Id: dsi_init.c,v 1.3.14.1.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -55,7 +55,7 @@ DSI *dsi_init(const dsi_proto protocol, 
     return dsi;
 }
 
-void dsi_setstatus(DSI *dsi, u_int8_t *status, const int slen)
+void dsi_setstatus(DSI *dsi, char *status, const size_t slen)
 {
     dsi->status = status;
     dsi->statuslen = slen;
Index: libatalk/dsi/dsi_opensess.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/dsi/dsi_opensess.c,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -p -p -u -r1.3 -r1.3.16.1
--- libatalk/dsi/dsi_opensess.c	29 Jun 2001 14:14:46 -0000	1.3
+++ libatalk/dsi/dsi_opensess.c	12 Sep 2005 16:10:20 -0000	1.3.16.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_opensess.c,v 1.3 2001/06/29 14:14:46 rufustfirefly Exp $
+ * $Id: dsi_opensess.c,v 1.3.16.1 2005/09/12 16:10:20 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -37,6 +37,7 @@ void dsi_opensession(DSI *dsi)
   /* let the client know the server quantum. we don't use the
    * max server quantum due to a bug in appleshare client 3.8.6. */
   dsi->header.dsi_flags = DSIFL_REPLY;
+  dsi->header.dsi_code = 0;
   /* dsi->header.dsi_command = DSIFUNC_OPEN;*/
   dsi->cmdlen = 2 + sizeof(i); /* length of data. dsi_send uses it. */
   dsi->commands[0] = DSIOPT_SERVQUANT;
Index: libatalk/dsi/dsi_stream.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/dsi/dsi_stream.c,v
retrieving revision 1.11.6.5.2.1
retrieving revision 1.11.6.5.2.2
diff -u -p -p -u -r1.11.6.5.2.1 -r1.11.6.5.2.2
--- libatalk/dsi/dsi_stream.c	31 Jan 2005 19:50:53 -0000	1.11.6.5.2.1
+++ libatalk/dsi/dsi_stream.c	27 Sep 2005 10:40:41 -0000	1.11.6.5.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_stream.c,v 1.11.6.5.2.1 2005/01/31 19:50:53 didg Exp $
+ * $Id: dsi_stream.c,v 1.11.6.5.2.2 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1998 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -112,7 +112,7 @@ void dsi_buffer(DSI *dsi)
  * write raw data. return actual bytes read. checks against EINTR
  * aren't necessary if all of the signals have SA_RESTART
  * specified. */
-size_t dsi_stream_write(DSI *dsi, void *data, const size_t length, int mode)
+size_t dsi_stream_write(DSI *dsi, void *data, const size_t length, int mode _U_)
 {
   size_t written;
   ssize_t len;
Index: libatalk/dsi/dsi_write.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/dsi/dsi_write.c,v
retrieving revision 1.3.14.2
retrieving revision 1.3.14.2.2.1
diff -u -p -p -u -r1.3.14.2 -r1.3.14.2.2.1
--- libatalk/dsi/dsi_write.c	4 May 2004 14:26:14 -0000	1.3.14.2
+++ libatalk/dsi/dsi_write.c	27 Sep 2005 10:40:41 -0000	1.3.14.2.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_write.c,v 1.3.14.2 2004/05/04 14:26:14 didg Exp $
+ * $Id: dsi_write.c,v 1.3.14.2.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -34,7 +34,7 @@
 /* initialize relevant things for dsi_write. this returns the amount
  * of data in the data buffer. the interface has been reworked to allow
  * for arbitrary buffers. */
-size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen)
+size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_)
 {
 #ifdef TIMER_ON_READ
   const struct itimerval none = {{0, 0}, {0, 0}};
Index: libatalk/unicode/iconv.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/unicode/iconv.c,v
retrieving revision 1.1.2.1.2.11.2.1
retrieving revision 1.1.2.1.2.11.2.2
diff -u -p -p -u -r1.1.2.1.2.11.2.1 -r1.1.2.1.2.11.2.2
--- libatalk/unicode/iconv.c	6 Feb 2005 10:16:03 -0000	1.1.2.1.2.11.2.1
+++ libatalk/unicode/iconv.c	27 Sep 2005 10:40:41 -0000	1.1.2.1.2.11.2.2
@@ -349,7 +349,7 @@ int atalk_iconv_close (atalk_iconv_t cd)
  the following functions implement the builtin character sets in Netatalk
 *************************************************************************/
 
-static size_t ascii_pull(void *cd, char **inbuf, size_t *inbytesleft,
+static size_t ascii_pull(void *cd _U_, char **inbuf, size_t *inbytesleft,
 			 char **outbuf, size_t *outbytesleft)
 {
 	ucs2_t curchar;
@@ -377,7 +377,7 @@ static size_t ascii_pull(void *cd, char 
 	return 0;
 }
 
-static size_t ascii_push(void *cd, char **inbuf, size_t *inbytesleft,
+static size_t ascii_push(void *cd _U_, char **inbuf, size_t *inbytesleft,
 			 char **outbuf, size_t *outbytesleft)
 {
 	int ir_count=0;
@@ -412,7 +412,7 @@ static size_t ascii_push(void *cd, char 
 }
 
 
-static size_t iconv_copy(void *cd, char **inbuf, size_t *inbytesleft,
+static size_t iconv_copy(void *cd _U_, char **inbuf, size_t *inbytesleft,
 			 char **outbuf, size_t *outbytesleft)
 {
 	int n;
Index: libatalk/unicode/utf8.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/unicode/utf8.c,v
retrieving revision 1.1.2.3.2.3
retrieving revision 1.1.2.3.2.4
diff -u -p -p -u -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- libatalk/unicode/utf8.c	6 Feb 2005 10:16:03 -0000	1.1.2.3.2.3
+++ libatalk/unicode/utf8.c	27 Sep 2005 10:40:41 -0000	1.1.2.3.2.4
@@ -61,7 +61,7 @@ struct charset_functions charset_utf8_ma
 };
 
 /* ------------------------ */
-static size_t utf8_pull(void *cd, char **inbuf, size_t *inbytesleft,
+static size_t utf8_pull(void *cd _U_, char **inbuf, size_t *inbytesleft,
 			 char **outbuf, size_t *outbytesleft)
 {
 	ucs2_t uc = 0;
@@ -113,7 +113,7 @@ badseq:
 }
 
 /* ------------------------ */
-static size_t utf8_push(void *cd, char **inbuf, size_t *inbytesleft,
+static size_t utf8_push(void *cd _U_, char **inbuf, size_t *inbytesleft,
 			 char **outbuf, size_t *outbytesleft)
 {
 	ucs2_t uc=0;
Index: libatalk/unicode/util_unistr.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/unicode/util_unistr.c,v
retrieving revision 1.1.2.1.2.7
retrieving revision 1.1.2.1.2.7.2.1
diff -u -p -p -u -r1.1.2.1.2.7 -r1.1.2.1.2.7.2.1
--- libatalk/unicode/util_unistr.c	12 May 2004 21:21:49 -0000	1.1.2.1.2.7
+++ libatalk/unicode/util_unistr.c	22 Jul 2005 21:50:04 -0000	1.1.2.1.2.7.2.1
@@ -17,6 +17,17 @@
 #include "precompose.h"
 #include "byteorder.h"
 
+#define HANGUL_SBASE 0xAC00
+#define HANGUL_LBASE 0x1100
+#define HANGUL_VBASE 0x1161
+#define HANGUL_TBASE 0x11A7
+#define HANGUL_LCOUNT 19
+#define HANGUL_VCOUNT 21
+#define HANGUL_TCOUNT 28
+#define HANGUL_NCOUNT (HANGUL_VCOUNT * HANGUL_TCOUNT)   /* 588 */
+#define HANGUL_SCOUNT (HANGUL_LCOUNT * HANGUL_NCOUNT)   /* 11172 */
+
+#define MAXCOMBLEN 3
 
 ucs2_t toupper_w(ucs2_t val)
 {
@@ -380,14 +391,23 @@ size_t precompose_w (ucs2_t *name, size_
 	size_t i;
 	ucs2_t base, comb;
 	ucs2_t *in, *out;
+	ucs2_t hangul_lindex, hangul_vindex;
 	ucs2_t result;
 	size_t o_len = *outlen;
 
     	if (!inplen || (inplen & 1) || inplen > o_len)
         	return (size_t)-1;
+	
+	/*   Actually,                                                 */
+	/*   Decomposition and Canonical Ordering are necessary here.  */
+	/*                                                             */
+	/*         Ex. in = CanonicalOrdering(decompose_w(name))       */
+	/*                                                             */
+	/*   A new mapping table is needed for CanonicalOrdering.      */
+	
     	i = 0;
     	in  = name;
-    	out = (ucs2_t *)comp;
+	out = comp;
     
     	base = *in;
     	while (*outlen > 2) {
@@ -401,19 +421,36 @@ size_t precompose_w (ucs2_t *name, size_
            		return o_len - *outlen;
         	}
         	comb = *in;
-        	if (comb >= 0x300 && (result = do_precomposition(base, comb))) {
-           		*out = result;
-           		out++;
-           		*outlen -= 2;
-           		i += 2;
-           		in++;
-           		if (i == inplen) {
-				*out = 0;
-              			return o_len - *outlen;
+		result = 0;
+		
+		/* Non-Combination Character */
+		if (comb < 0x300) ;
+		
+		/* Unicode Standard Annex #15 A10.3 Hangul Composition */
+		/* Step 1 <L,V> */
+		else if ((HANGUL_VBASE <= comb) && (comb <= HANGUL_VBASE + HANGUL_VCOUNT)) {
+			if ((HANGUL_LBASE <= base) && (base < HANGUL_LBASE + HANGUL_LCOUNT)) {
+				result = 1;
+				hangul_lindex = base - HANGUL_LBASE;
+				hangul_vindex = comb - HANGUL_VBASE;
+				base = HANGUL_SBASE + (hangul_lindex * HANGUL_VCOUNT + hangul_vindex) * HANGUL_TCOUNT;
 			}
-           		base = *in;
         	}
-        	else {
+		
+		/* Step 2 <LV,T> */
+		else if ((HANGUL_TBASE < comb) && (comb < HANGUL_TBASE + HANGUL_TCOUNT)) {
+			if ((HANGUL_SBASE <= base) && (base < HANGUL_SBASE +HANGUL_SCOUNT) && (((base - HANGUL_SBASE) % HANGUL_TCOUNT) == 0)) {
+				result = 1;
+				base += comb - HANGUL_TBASE;
+			}
+		}
+		
+		/* Combining Sequence */
+		else if ((result = do_precomposition(base, comb))) {
+			base = result;
+		}
+		
+		if (!result) {
            		*out = base;
            		out++;
            		*outlen -= 2;
@@ -427,10 +464,16 @@ size_t precompose_w (ucs2_t *name, size_
 
 /* --------------- */
 
+/* Singleton Decomposition is unsupported.               */
+/* A new mapping table is needed for implementation.     */
+
 size_t decompose_w (ucs2_t *name, size_t inplen, ucs2_t *comp, size_t *outlen)
 {
 	size_t i;
+	size_t comblen;
 	ucs2_t base;
+	ucs2_t comb[MAXCOMBLEN];
+	ucs2_t hangul_sindex, tjamo;
 	ucs2_t *in, *out;
 	unsigned int result;
 	size_t o_len = *outlen;
@@ -439,42 +482,68 @@ size_t decompose_w (ucs2_t *name, size_t
         	return (size_t)-1;
 	i = 0;
 	in  = name;
-	out = (ucs2_t *)comp;
+	out = comp;
     
     	while (i < inplen) {
-        	if (*outlen < 2) {
-			errno = E2BIG;
-            		return (size_t)-1;
-        	}
         	base = *in;
-		if ( (base > 0x1fff && base < 0x3000) || (base > 0xfe2f && base < 0xfe50)) {
-			/* exclude these ranges from decomposition according to AFP 3.1 spec */
-			/* page 97 */
-			*out = base;
-			out++;
-			*outlen -= 2;
+		comblen = 0;
+		
+		/* check ASCII first. this is frequent. */
+		if (base <= 0x007f) ;
+		
+		/* Unicode Standard Annex #15 A10.2 Hangul Decomposition */
+		else if ((HANGUL_SBASE <= base) && (base < HANGUL_SBASE + HANGUL_SCOUNT)) {
+			hangul_sindex = base - HANGUL_SBASE;
+			base = HANGUL_LBASE + hangul_sindex / HANGUL_NCOUNT;
+			comb[MAXCOMBLEN-2] = HANGUL_VBASE + (hangul_sindex % HANGUL_NCOUNT) / HANGUL_TCOUNT;
+			
+			/* <L,V> */
+			if ((tjamo = HANGUL_TBASE + hangul_sindex % HANGUL_TCOUNT) == HANGUL_TBASE) {
+				comb[MAXCOMBLEN-1] = comb[MAXCOMBLEN-2];
+				comblen = 1;
+			}
+			
+			/* <L,V,T> */
+			else {
+				comb[MAXCOMBLEN-1] = tjamo;
+				comblen = 2;
+			}
 		}
-        	else if ((result = do_decomposition(base))) {
-			if ( *outlen < 4 ) {
+		
+		/* Combining Sequence */
+		/* exclude U2000-U2FFF and UFE30-UFE4F ranges      */
+		/* from decomposition according to AFP 3.1 spec    */
+		else if ((base < 0x2000) || ((0x2fff < base) && (base < 0xfe30)) || (0xfe4f < base)) {
+			do {
+				if ((comblen >= MAXCOMBLEN) || !(result = do_decomposition(base))) break;
+				comblen++;
+				base = result  >> 16;
+				comb[MAXCOMBLEN-comblen] = result & 0xffff;
+			} while (((0x007f < base) && (base < 0x2000)) || ((0x2fff < base) && (base < 0xfe30)) || (0xfe4f < base)) ;
+		}
+		
+		if (*outlen < (comblen + 1) << 1) {
 				errno = E2BIG;
 				return (size_t)-1;
 			}
-           		*out = result  >> 16;
+		
+		*out = base;
            		out++;
            		*outlen -= 2;
-           		*out = result & 0xffff;
-           		out++;
-           		*outlen -= 2;
-        	}
-        	else {
-           		*out = base;
+		
+		while ( comblen > 0 ) {
+			*out = comb[MAXCOMBLEN-comblen];
            		out++;
            		*outlen -= 2;
+			comblen--;
         	}
+		
         	i += 2;
         	in++;
      	}
 
+	/* Is Canonical Ordering necessary here? */
+	
 	*out = 0;
 	return o_len-*outlen;
 }
Index: libatalk/unicode/charsets/generic_mb.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/unicode/charsets/generic_mb.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -p -p -u -r1.1.2.3 -r1.1.2.3.2.1
--- libatalk/unicode/charsets/generic_mb.c	14 Nov 2003 23:41:05 -0000	1.1.2.3
+++ libatalk/unicode/charsets/generic_mb.c	27 Sep 2005 10:40:41 -0000	1.1.2.3.2.1
@@ -42,8 +42,8 @@
 
 /* ------------------------ */
 
-size_t mb_generic_push( int (*char_func)(unsigned char *, ucs2_t), void *cd, char **inbuf, size_t *inbytesleft,
-                         char **outbuf, size_t *outbytesleft)
+size_t mb_generic_push( int (*char_func)(unsigned char *, ucs2_t), void *cd _U_, char **inbuf, 
+			size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
 {
         int len = 0;
 	unsigned char *tmpptr = (unsigned char *) *outbuf;
@@ -76,8 +76,8 @@ size_t mb_generic_push( int (*char_func)
 
 /* ------------------------ */
 
-size_t mb_generic_pull ( int (*char_func)(ucs2_t *, const unsigned char *), void *cd, char **inbuf, size_t *inbytesleft,
-                         char **outbuf, size_t *outbytesleft)
+size_t mb_generic_pull ( int (*char_func)(ucs2_t *, const unsigned char *), void *cd _U_, 
+			char **inbuf, size_t *inbytesleft,char **outbuf, size_t *outbytesleft)
 {
 	ucs2_t 		temp;
 	unsigned char	*inptr;
Index: libatalk/unicode/charsets/mac_hebrew.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/unicode/charsets/mac_hebrew.c,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -p -p -u -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- libatalk/unicode/charsets/mac_hebrew.c	6 Feb 2005 10:16:03 -0000	1.1.2.2.2.1
+++ libatalk/unicode/charsets/mac_hebrew.c	27 Sep 2005 10:40:41 -0000	1.1.2.2.2.2
@@ -80,7 +80,7 @@ char_ucs2_to_mac_hebrew ( unsigned char 
     return 0;
 }
 
-static size_t mac_hebrew_push( void *cd, char **inbuf, size_t *inbytesleft,
+static size_t mac_hebrew_push( void *cd _U_, char **inbuf, size_t *inbytesleft,
                          char **outbuf, size_t *outbytesleft)
 {
     unsigned char c = 0;
@@ -152,7 +152,7 @@ char_mac_hebrew_to_ucs2 (ucs2_t *pwc, co
 	return 0;
 }
 
-static size_t mac_hebrew_pull ( void *cd, char **inbuf, size_t *inbytesleft,
+static size_t mac_hebrew_pull ( void *cd _U_, char **inbuf, size_t *inbytesleft,
                          char **outbuf, size_t *outbytesleft)
 {
     ucs2_t         temp;
Index: libatalk/util/server_ipc.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/libatalk/util/server_ipc.c,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.2.2.1
diff -u -p -p -u -r1.1.4.1.2.2 -r1.1.4.1.2.2.2.1
--- libatalk/util/server_ipc.c	1 Jul 2004 01:27:34 -0000	1.1.4.1.2.2
+++ libatalk/util/server_ipc.c	27 Sep 2005 10:40:41 -0000	1.1.4.1.2.2.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: server_ipc.c,v 1.1.4.1.2.2 2004/07/01 01:27:34 didg Exp $
+ * $Id: server_ipc.c,v 1.1.4.1.2.2.2.1 2005/09/27 10:40:41 didg Exp $
  *
  * All rights reserved. See COPYRIGHT.
  *
@@ -42,7 +42,7 @@ void *server_ipc_create(void)
 }
 
 /* ----------------- */
-int server_ipc_child(void *obj)
+int server_ipc_child(void *obj _U_)
 {
     /* close input */
     close(pipe_fd[0]);
@@ -50,7 +50,7 @@ int server_ipc_child(void *obj)
 }
 
 /* ----------------- */
-int server_ipc_parent(void *obj)
+int server_ipc_parent(void *obj _U_)
 {
     return pipe_fd[0];
 }
Index: macros/afs-check.m4
===================================================================
RCS file: /cvsroot/netatalk/netatalk/macros/afs-check.m4,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.1.2.1
diff -u -p -p -u -r1.2.6.1 -r1.2.6.1.2.1
--- macros/afs-check.m4	29 Oct 2003 23:53:24 -0000	1.2.6.1
+++ macros/afs-check.m4	11 Aug 2005 20:14:51 -0000	1.2.6.1.2.1
@@ -1,4 +1,4 @@
-dnl $Id: afs-check.m4,v 1.2.6.1 2003/10/29 23:53:24 bfernhomberg Exp $
+dnl $Id: afs-check.m4,v 1.2.6.1.2.1 2005/08/11 20:14:51 didg Exp $
 dnl Autoconf macro to check whether AFS support should be enabled
 
 AC_DEFUN([NETATALK_AFS_CHECK], [
@@ -13,7 +13,7 @@ AC_DEFUN([NETATALK_AFS_CHECK], [
 				AC_CHECK_LIB(afsauthent, pioctl, netatalk_cv_afs=yes,
 					AC_MSG_ERROR([AFS installation not found])
 				)
-				AFS_LIBS=-lafsauthent
+				AFS_LIBS=-lresolv -lafsrpc -lafsauthent 
 				AC_DEFINE(AFS, 1, [Define if AFS should be used])
 			fi
 		]
Index: macros/db3-check.m4
===================================================================
RCS file: /cvsroot/netatalk/netatalk/macros/db3-check.m4,v
retrieving revision 1.11.6.9
retrieving revision 1.11.6.9.2.1
diff -u -p -p -u -r1.11.6.9 -r1.11.6.9.2.1
--- macros/db3-check.m4	11 Aug 2004 03:01:11 -0000	1.11.6.9
+++ macros/db3-check.m4	14 Sep 2005 13:29:06 -0000	1.11.6.9.2.1
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.11.6.9 2004/08/11 03:01:11 bfernhomberg Exp $
+dnl $Id: db3-check.m4,v 1.11.6.9.2.1 2005/09/14 13:29:06 didg Exp $
 dnl Autoconf macros to check for the Berkeley DB library
 
 
@@ -119,6 +119,10 @@ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_d
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-2])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.3])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb43])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-43])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-3])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_1,[-ldb-4.1])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db41,[-ldb41])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_41,[-ldb-41])
@@ -134,7 +138,7 @@ AC_DEFUN([AC_PATH_BDB], 
 	trybdbdir=""
 	dobdbsearch=yes
 	bdb_search_dirs="/usr/local/include /usr/include"
-	search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
+	search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.1 /db41 /db4 /"
 
 dnl required BDB version
 	DB_MAJOR_REQ=4
Index: macros/quota-check.m4
===================================================================
RCS file: /cvsroot/netatalk/netatalk/macros/quota-check.m4,v
retrieving revision 1.1.12.3
retrieving revision 1.1.12.3.2.1
diff -u -p -p -u -r1.1.12.3 -r1.1.12.3.2.1
--- macros/quota-check.m4	15 Jan 2004 08:12:57 -0000	1.1.12.3
+++ macros/quota-check.m4	21 Jul 2005 00:12:25 -0000	1.1.12.3.2.1
@@ -1,8 +1,12 @@
-dnl $Id: quota-check.m4,v 1.1.12.3 2004/01/15 08:12:57 bfernhomberg Exp $
+dnl $Id: quota-check.m4,v 1.1.12.3.2.1 2005/07/21 00:12:25 didg Exp $
 dnl Autoconf macro to check for quota support
 dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_CHECK_QUOTA], [
+	AC_ARG_ENABLE(quota,
+	[  --enable-quota           Turn on quota support (default=auto)])
+
+	if test x$enable_quota != xno; then
 	QUOTA_LIBS=""
 	netatalk_cv_quotasupport="yes"
 	AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
@@ -11,6 +15,10 @@ AC_DEFUN([AC_CHECK_QUOTA], [
 		netatalk_cv_quotasupport="no"
 		AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
 	])
+	else
+		netatalk_cv_quotasupport="no"
+		AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
+	fi
 
 	AC_SUBST(QUOTA_LIBS)
 ])

Places

File netatalk-branch-netatalk-2-0.patch of Package netatalk (Revision 70dc6a15cfdf3177be593524fcadf805)

Places