Symlink patch from Anton Starikov

[netatalk.git] / etc / afpd / extattrs.c

diff --git a/etc/afpd/extattrs.c b/etc/afpd/extattrs.c
index 1e415c9341bfdefdfb864b60d2a8a8bb430b973d..13e27a03bb836b7a7eee6e42e729af2cb81b30ce 100644 (file)
--- a/etc/afpd/extattrs.c
+++ b/etc/afpd/extattrs.c
@@ -1,5 +1,5 @@
 /*
-  $Id: extattrs.c,v 1.25 2009-11-13 13:47:54 didg Exp $
+  $Id: extattrs.c,v 1.28 2009-11-27 12:37:24 didg Exp $
   Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
 
   This program is free software; you can redistribute it and/or modify
@@ -150,7 +150,7 @@ int afp_listextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf,
         if (S_ISDIR(st->st_mode))
             adflags = ADFLAGS_DIR;
 
-        if ( ad_metadata( uname, adflags, adp) < 0 ) {
+        if ( ad_metadata( uname, vol_noadouble(vol) | adflags, adp) < 0 ) {
             switch (errno) {
             case ENOENT:
                 adp = NULL;
@@ -188,9 +188,9 @@ int afp_listextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf,
             }
 
             /* Now check for Ressource fork and add virtual EA "com.apple.ResourceFork" if size > 0 */
-            LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): Ressourcefork size: %u", uname, adp->ad_eid[ADEID_RFORK].ade_len);
+            LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): Ressourcefork size: %llu", uname, adp->ad_rlen);
 
-            if (adp->ad_eid[ADEID_RFORK].ade_len > 0) {
+            if (adp->ad_rlen > 0) {
                 LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): sending com.apple.RessourceFork.", uname);
                 strcpy(attrnamebuf + attrbuflen, ea_resourcefork);
                 attrbuflen += strlen(ea_resourcefork) + 1;
@@ -249,12 +249,12 @@ static char *to_stringz(char *ibuf, uint16_t len)
 {
 static char attrmname[256];
 
-    if (len > 256)
+    if (len > 255)
         /* dont fool with us */
-        len = 256;
+        len = 255;
 
     /* we must copy the name as its not 0-terminated and I DONT WANT TO WRITE to ibuf */
-    strlcpy(attrmname, ibuf, len);
+    strlcpy(attrmname, ibuf, len + 1);
     return attrmname;
 }