/*
* Prepare ad->ad_data buffer from struct adouble for writing on disk
*/
-int ad_rebuild_adouble_header(struct adouble *ad)
+int ad_rebuild_adouble_header_v2(struct adouble *ad)
{
uint32_t eid;
uint32_t temp;
uint16_t nent;
char *buf, *nentp;
- int len;
- LOG(log_debug, logtype_default, "ad_rebuild_adouble_header");
+ LOG(log_debug, logtype_ad, "ad_rebuild_adouble_header_v2");
buf = ad->ad_data;
nentp = buf;
buf += sizeof( nent );
for ( eid = 0, nent = 0; eid < ADEID_MAX; eid++ ) {
- if ( ad->ad_eid[ eid ].ade_off == 0 ) {
+ if (ad->ad_eid[ eid ].ade_off == 0)
continue;
- }
temp = htonl( EID_DISK(eid) );
memcpy(buf, &temp, sizeof( temp ));
buf += sizeof( temp );
nent = htons( nent );
memcpy(nentp, &nent, sizeof( nent ));
- switch (ad->ad_vers) {
- case AD_VERSION2:
- len = ad_getentryoff(ad, ADEID_RFORK);
- break;
- case AD_VERSION_EA:
- len = AD_DATASZ_EA;
- break;
- default:
- LOG(log_error, logtype_afpd, "Unexpected adouble version");
- len = 0;
- break;
+ return ad_getentryoff(ad, ADEID_RFORK);
+}
+
+int ad_rebuild_adouble_header_ea(struct adouble *ad)
+{
+ uint32_t eid;
+ uint32_t temp;
+ uint16_t nent;
+ char *buf, *nentp;
+
+ LOG(log_debug, logtype_ad, "ad_rebuild_adouble_header_ea");
+
+ buf = ad->ad_data;
+
+ temp = htonl( ad->ad_magic );
+ memcpy(buf, &temp, sizeof( temp ));
+ buf += sizeof( temp );
+
+ temp = htonl( ad->ad_version );
+ memcpy(buf, &temp, sizeof( temp ));
+ buf += sizeof( temp );
+
+ buf += sizeof( ad->ad_filler );
+
+ nentp = buf;
+ buf += sizeof( nent );
+ for ( eid = 0, nent = 0; eid < ADEID_MAX; eid++ ) {
+ if ((ad->ad_eid[ eid ].ade_off == 0) || (eid == ADEID_RFORK))
+ continue;
+ temp = htonl( EID_DISK(eid) );
+ memcpy(buf, &temp, sizeof( temp ));
+ buf += sizeof( temp );
+
+ temp = htonl( ad->ad_eid[ eid ].ade_off );
+ memcpy(buf, &temp, sizeof( temp ));
+ buf += sizeof( temp );
+
+ temp = htonl( ad->ad_eid[ eid ].ade_len );
+ memcpy(buf, &temp, sizeof( temp ));
+ buf += sizeof( temp );
+ nent++;
}
+ nent = htons( nent );
+ memcpy(nentp, &nent, sizeof( nent ));
- return len;
+ return AD_DATASZ_EA;
}
/*!
* Prepare adbuf buffer from struct adouble for writing on disk
*/
-static int ad_rebuild_adouble_header_osx(struct adouble *ad, char *adbuf)
+int ad_rebuild_adouble_header_osx(struct adouble *ad, char *adbuf)
{
uint32_t temp;
uint16_t nent;
char *buf;
- int len;
- LOG(log_debug, logtype_default, "ad_rebuild_adouble_header_osx");
+ LOG(log_debug, logtype_ad, "ad_rebuild_adouble_header_osx");
buf = &adbuf[0];
memcpy(buf, &temp, sizeof( temp ));
buf += sizeof( temp );
+ memcpy(buf, AD_FILLER_NETATALK, strlen(AD_FILLER_NETATALK));
buf += sizeof( ad->ad_filler );
nent = htons(ADEID_NUM_OSX);
continue;
len = ads->ad_eid[ eid ].ade_len;
- if (!len || len != add->ad_eid[ eid ].ade_len)
+ if (len == 0)
continue;
switch (eid) {
case ADEID_COMMENT:
- case ADEID_PRIVDEV:
- case ADEID_PRIVINO:
- case ADEID_PRIVSYN:
- case ADEID_PRIVID:
+ case ADEID_RFORK:
continue;
default:
ad_setentrylen( add, eid, len );
}
}
add->ad_rlen = ads->ad_rlen;
+
+ if (((ads->ad_vers == AD_VERSION2) && (add->ad_vers == AD_VERSION_EA))
+ || ((ads->ad_vers == AD_VERSION_EA) && (add->ad_vers == AD_VERSION2))) {
+ cnid_t id;
+ memcpy(&id, ad_entry(add, ADEID_PRIVID), sizeof(cnid_t));
+ id = htonl(id);
+ memcpy(ad_entry(add, ADEID_PRIVID), &id, sizeof(cnid_t));
+ }
return 0;
}
int len;
int cwd = -1;
- LOG(log_debug, logtype_default, "ad_flush_hf(%s)", adflags2logstr(ad->ad_adflags));
+ LOG(log_debug, logtype_ad, "ad_flush_hf(%s)", adflags2logstr(ad->ad_adflags));
struct ad_fd *adf;
adf = &ad->ad_data_fork;
break;
default:
- LOG(log_error, logtype_afpd, "ad_flush: unexpected adouble version");
+ LOG(log_error, logtype_ad, "ad_flush: unexpected adouble version");
return -1;
}
if (ad->ad_adflags & ADFLAGS_DIR) {
EC_NEG1_LOG( cwd = open(".", O_RDONLY) );
EC_NEG1_LOG( fchdir(ad_data_fileno(ad)) );
- EC_ZERO_LOG( sys_lsetxattr(".", AD_EA_META, ad->ad_data, AD_DATASZ_EA, 0) );
+
+ ret = sys_lsetxattr(".", AD_EA_META, ad->ad_data, AD_DATASZ_EA, 0);
+
+ if (ret != 0) {
+ if (errno != EPERM)
+ EC_FAIL;
+
+ if (!(ad->ad_options & ADVOL_FORCE_STICKY_XATTR))
+ EC_FAIL;
+
+ /*
+ * This may be a directory with a sticky bit
+ * set, which means even though we may have
+ * write access to the directory, only the
+ * owner is allowed to write xattrs
+ */
+
+ become_root();
+ ret = sys_lsetxattr(".", AD_EA_META, ad->ad_data, AD_DATASZ_EA, 0);
+ unbecome_root();
+
+ if (ret != 0) {
+ LOG(log_error, logtype_ad, "ad_flush_hf: %s", strerror(errno));
+ EC_FAIL;
+ }
+ }
+
EC_NEG1_LOG( fchdir(cwd) );
EC_NEG1_LOG( close(cwd) );
cwd = -1;
}
break;
default:
- LOG(log_error, logtype_afpd, "ad_flush: unexpected adouble version");
+ LOG(log_error, logtype_ad, "ad_flush: unexpected adouble version");
return -1;
}
}
if (ad->ad_vers != AD_VERSION_EA)
return 0;
- LOG(log_debug, logtype_default, "ad_flush_rf(%s)", adflags2logstr(ad->ad_adflags));
+ LOG(log_debug, logtype_ad, "ad_flush_rf(%s)", adflags2logstr(ad->ad_adflags));
if ((ad->ad_rfp->adf_flags & O_RDWR)) {
if (ad_getentryoff(ad, ADEID_RFORK)) {
{
EC_INIT;
- LOG(log_debug, logtype_default, "ad_flush(%s)", adflags2logstr(ad->ad_adflags));
+ LOG(log_debug, logtype_ad, "ad_flush(%s)", adflags2logstr(ad->ad_adflags));
if (AD_META_OPEN(ad)) {
EC_ZERO( ad_flush_hf(ad) );
{
int ret = 0;
- if (ad_data_fileno(ad) == -2) {
+ if (ad_data_fileno(ad) == AD_SYMLINK) {
free(ad->ad_data_fork.adf_syml);
ad->ad_data_fork.adf_syml = NULL;
} else {
if (ad == NULL)
return err;
- LOG(log_debug, logtype_default,
- "ad_close(%s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+
+ LOG(log_debug, logtype_ad,
+ "ad_close(%s): BEGIN: {d: %d, m: %d, r: %d} "
+ "[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
adflags2logstr(adflags),
+ ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount,
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
if ((ad->ad_vers == AD_VERSION2) && (adflags & ADFLAGS_RF))
adflags |= ADFLAGS_HF;
- if ((adflags & ADFLAGS_DF)
- && (ad_data_fileno(ad) >= 0 || ad_data_fileno(ad) == -2) /* -2 means symlink */
- && --ad->ad_data_fork.adf_refcount == 0) {
- if (ad_data_closefd(ad) < 0)
- err = -1;
- adf_lock_free(&ad->ad_data_fork);
+ if ((adflags & ADFLAGS_DF) && (ad_data_fileno(ad) >= 0 || ad_data_fileno(ad) == AD_SYMLINK)) {
+ if (ad->ad_data_refcount)
+ if (--ad->ad_data_refcount == 0)
+ adf_lock_free(&ad->ad_data_fork);
+ if (--ad->ad_data_fork.adf_refcount == 0) {
+ if (ad_data_closefd(ad) < 0)
+ err = -1;
+ }
}
- if ((adflags & ADFLAGS_HF)
- && (ad_meta_fileno(ad) != -1) && !(--ad->ad_mdp->adf_refcount)) {
- if (close( ad_meta_fileno(ad)) < 0)
- err = -1;
- ad_meta_fileno(ad) = -1;
- if (ad->ad_vers == AD_VERSION2)
- adf_lock_free(ad->ad_mdp);
+ if ((adflags & ADFLAGS_HF) && (ad_meta_fileno(ad) != -1)) {
+ if (ad->ad_meta_refcount)
+ ad->ad_meta_refcount--;
+ if (!(--ad->ad_mdp->adf_refcount)) {
+ if (close( ad_meta_fileno(ad)) < 0)
+ err = -1;
+ ad_meta_fileno(ad) = -1;
+ }
}
- if ((adflags & ADFLAGS_RF) && (ad->ad_vers == AD_VERSION_EA)) {
- if ((ad_reso_fileno(ad) != -1)
- && !(--ad->ad_rfp->adf_refcount)) {
- if (close(ad->ad_rfp->adf_fd) < 0)
- err = -1;
- ad->ad_rlen = 0;
- ad_reso_fileno(ad) = -1;
- adf_lock_free(ad->ad_rfp);
+ if (adflags & ADFLAGS_RF) {
+ /* HF is automatically opened when opening an RF, close it. */
+ if ((ad->ad_vers == AD_VERSION2) && (ad_meta_fileno(ad) != -1)) {
+ if (ad->ad_meta_refcount)
+ ad->ad_meta_refcount--;
+ if (!(--ad->ad_mdp->adf_refcount)) {
+ if (close( ad_meta_fileno(ad)) < 0)
+ err = -1;
+ ad_meta_fileno(ad) = -1;
+ }
+ }
+
+ if (ad->ad_reso_refcount)
+ if (--ad->ad_reso_refcount == 0)
+ adf_lock_free(ad->ad_rfp);
+ if (ad->ad_vers == AD_VERSION_EA) {
+ if ((ad_reso_fileno(ad) != -1)
+ && !(--ad->ad_rfp->adf_refcount)) {
+ if (close(ad->ad_rfp->adf_fd) < 0)
+ err = -1;
+ ad->ad_rlen = 0;
+ ad_reso_fileno(ad) = -1;
+ }
}
}
- LOG(log_debug, logtype_default,
- "ad_close(%s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ LOG(log_debug, logtype_ad,
+ "ad_close(%s): END: %d {d: %d, m: %d, r: %d} "
+ "[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
adflags2logstr(adflags), err,
+ ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount,
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
projects / netatalk.git / blobdiff