/*
- $Id: extattrs.c,v 1.22 2009-11-09 05:45:06 didg Exp $
Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
This program is free software; you can redistribute it and/or modify
#include <atalk/afp.h>
#include <atalk/logger.h>
#include <atalk/ea.h>
+#include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
-#include "globals.h"
#include "volume.h"
#include "desktop.h"
#include "directory.h"
memcpy( &vid, ibuf, sizeof(vid));
ibuf += sizeof(vid);
if (NULL == ( vol = getvolbyvid( vid )) ) {
- LOG(log_error, logtype_afpd, "afp_listextattr: getvolbyvid error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_listextattr: getvolbyvid error: %s", strerror(errno));
return AFPERR_ACCESS;
}
memcpy( &did, ibuf, sizeof(did));
ibuf += sizeof(did);
if (NULL == ( dir = dirlookup( vol, did )) ) {
- LOG(log_error, logtype_afpd, "afp_listextattr: dirlookup error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_listextattr: dirlookup error: %s", strerror(errno));
return afp_errno;
}
-#ifdef HAVE_SOLARIS_EAS
if (bitmap & kXAttrNoFollow)
oflag = O_NOFOLLOW;
-#endif
/* Skip Bitmap, ReqCount, StartIndex and maxreply*/
ibuf += 12;
/* get name */
if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
- LOG(log_error, logtype_afpd, "afp_listextattr: cname error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_listextattr: cname error: %s", strerror(errno));
return AFPERR_NOOBJ;
}
return( AFPERR_NOOBJ );
}
- adp = of_ad(vol, s_path, &ad);
- uname = s_path->u_name; /*
+ uname = s_path->u_name;
+ /*
We have to check the FinderInfo for the file, because if they aren't all 0
we must return the synthetic attribute "com.apple.FinderInfo".
Note: the client will never (never seen in traces) request that attribute
if (S_ISDIR(st->st_mode))
adflags = ADFLAGS_DIR;
- if ( ad_metadata( uname, adflags, adp) < 0 ) {
+ adp = &ad;
+ ad_init(adp, vol);
+ if (ad_metadata(uname, adflags, adp) != 0 ) {
switch (errno) {
+ case ENOENT:
+ break;
case EACCES:
LOG(log_error, logtype_afpd, "afp_listextattr(%s): %s: check resource fork permission?",
uname, strerror(errno));
LOG(log_error, logtype_afpd, "afp_listextattr(%s): error getting metadata: %s", uname, strerror(errno));
return AFPERR_MISC;
}
- }
-
- FinderInfo = ad_entry(adp, ADEID_FINDERI);
-
-#ifdef DEBUG
- LOG(log_maxdebug, logtype_afpd, "afp_listextattr(%s): FinderInfo:", uname);
- hexdump( FinderInfo, 32);
-#endif
+ } else {
+ FinderInfo = ad_entry(adp, ADEID_FINDERI);
+ /* Check if FinderInfo equals default and empty FinderInfo*/
+ if (memcmp(FinderInfo, emptyFinderInfo, 32) != 0) {
+ /* FinderInfo contains some non 0 bytes -> include "com.apple.FinderInfo" */
+ strcpy(attrnamebuf, ea_finderinfo);
+ attrbuflen += strlen(ea_finderinfo) + 1;
+ LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): sending com.apple.FinderInfo", uname);
+ }
- if ((adflags & ADFLAGS_DIR)) {
- /* set default view */
- uint16 = htons(FINDERINFO_CLOSEDVIEW);
- memcpy(emptyFinderInfo + FINDERINFO_FRVIEWOFF, &uint16, 2);
- }
+ /* 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: %llu", uname, adp->ad_rlen);
- /* Check if FinderInfo equals default and empty FinderInfo*/
- if ((memcmp(FinderInfo, emptyFinderInfo, 32)) != 0) {
- /* FinderInfo contains some non 0 bytes -> include "com.apple.FinderInfo" */
- strcpy(attrnamebuf, ea_finderinfo);
- attrbuflen += strlen(ea_finderinfo) + 1;
- LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): sending com.apple.FinderInfo", uname);
- }
-
- /* 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);
- if (adp->ad_eid[ADEID_RFORK].ade_len > 0) {
- LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): sending com.apple.RessourceFork.", uname);
- strcpy(attrnamebuf + attrbuflen, ea_resourcefork);
- attrbuflen += strlen(ea_resourcefork) + 1;
+ 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;
+ }
}
-
+
ret = vol->vfs->vfs_ea_list(vol, attrnamebuf, &attrbuflen, uname, oflag);
switch (ret) {
default:
buf_valid = 1;
}
- }
+ } /* if ((maxreply == 0) || (buf_valid == 0)) */
/* Start building reply packet */
bitmap = htons(bitmap);
exit:
if (ret != AFP_OK)
buf_valid = 0;
+
if (adp)
- ad_close_metadata( adp);
+ ad_close(adp, ADFLAGS_HF);
return ret;
}
{
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;
}
memcpy( &vid, ibuf, sizeof(vid));
ibuf += sizeof(vid);
if (NULL == ( vol = getvolbyvid( vid )) ) {
- LOG(log_error, logtype_afpd, "afp_getextattr: getvolbyvid error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_getextattr: getvolbyvid error: %s", strerror(errno));
return AFPERR_ACCESS;
}
memcpy( &did, ibuf, sizeof(did));
ibuf += sizeof(did);
if (NULL == ( dir = dirlookup( vol, did )) ) {
- LOG(log_error, logtype_afpd, "afp_getextattr: dirlookup error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_getextattr: dirlookup error: %s", strerror(errno));
return afp_errno;
}
bitmap = ntohs( bitmap );
ibuf += sizeof(bitmap);
-#ifdef HAVE_SOLARIS_EAS
if (bitmap & kXAttrNoFollow)
oflag = O_NOFOLLOW;
-#endif
/* Skip Offset and ReqCount */
ibuf += 16;
/* get name */
if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
- LOG(log_error, logtype_afpd, "afp_getextattr: cname error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_getextattr: cname error: %s", strerror(errno));
return AFPERR_NOOBJ;
}
int afp_setextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
{
- int oflag = O_CREAT | O_WRONLY, ret;
+ int oflag = 0, ret;
uint16_t vid, bitmap, attrnamelen;
uint32_t did, attrsize;
char attruname[256];
memcpy( &vid, ibuf, sizeof(vid));
ibuf += sizeof(vid);
if (NULL == ( vol = getvolbyvid( vid )) ) {
- LOG(log_error, logtype_afpd, "afp_setextattr: getvolbyvid error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_setextattr: getvolbyvid error: %s", strerror(errno));
return AFPERR_ACCESS;
}
memcpy( &did, ibuf, sizeof(did));
ibuf += sizeof(did);
if (NULL == ( dir = dirlookup( vol, did )) ) {
- LOG(log_error, logtype_afpd, "afp_setextattr: dirlookup error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_setextattr: dirlookup error: %s", strerror(errno));
return afp_errno;
}
bitmap = ntohs( bitmap );
ibuf += sizeof(bitmap);
-#ifdef HAVE_SOLARIS_EAS
if (bitmap & kXAttrNoFollow)
- oflag |= AT_SYMLINK_NOFOLLOW;
-#endif
+ oflag |= O_NOFOLLOW;
if (bitmap & kXAttrCreate)
- oflag |= O_EXCL;
+ oflag |= O_CREAT;
else if (bitmap & kXAttrReplace)
oflag |= O_TRUNC;
/* get name */
if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
- LOG(log_error, logtype_afpd, "afp_setextattr: cname error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_setextattr: cname error: %s", strerror(errno));
return AFPERR_NOOBJ;
}
int afp_remextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
{
- int oflag = O_RDONLY, ret;
+ int oflag = 0, ret;
uint16_t vid, bitmap, attrnamelen;
uint32_t did;
char attruname[256];
memcpy( &vid, ibuf, sizeof(vid));
ibuf += sizeof(vid);
if (NULL == ( vol = getvolbyvid( vid )) ) {
- LOG(log_error, logtype_afpd, "afp_remextattr: getvolbyvid error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_remextattr: getvolbyvid error: %s", strerror(errno));
return AFPERR_ACCESS;
}
memcpy( &did, ibuf, sizeof(did));
ibuf += sizeof(did);
if (NULL == ( dir = dirlookup( vol, did )) ) {
- LOG(log_error, logtype_afpd, "afp_remextattr: dirlookup error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_remextattr: dirlookup error: %s", strerror(errno));
return afp_errno;
}
bitmap = ntohs( bitmap );
ibuf += sizeof(bitmap);
-#ifdef HAVE_SOLARIS_EAS
if (bitmap & kXAttrNoFollow)
- oflag |= AT_SYMLINK_NOFOLLOW;
-#endif
+ oflag |= O_NOFOLLOW;
/* get name */
if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) {
- LOG(log_error, logtype_afpd, "afp_setextattr: cname error: %s", strerror(errno));
+ LOG(log_debug, logtype_afpd, "afp_setextattr: cname error: %s", strerror(errno));
return AFPERR_NOOBJ;
}
projects / netatalk.git / blobdiff