X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_flush.c;h=6a1900c72f2f718e4e334139a19dd1b4bea43369;hb=1fd316930fbb61d754cf7df36e584348bb95cfc3;hp=fc95412c0d5fd03511e83de0c1352f35f1e91551;hpb=a5f965283b1646cdcc8a8006a3f3bef0c3e572f4;p=netatalk.git diff --git a/libatalk/adouble/ad_flush.c b/libatalk/adouble/ad_flush.c index fc95412c..6a1900c7 100644 --- a/libatalk/adouble/ad_flush.c +++ b/libatalk/adouble/ad_flush.c @@ -164,7 +164,7 @@ int ad_rebuild_adouble_header_osx(struct adouble *ad, char *adbuf) memcpy(buf, &temp, sizeof( temp )); buf += sizeof( temp ); - memcpy(buf, "Netatalk ", 16); + memcpy(buf, AD_FILLER_NETATALK, strlen(AD_FILLER_NETATALK)); buf += sizeof( ad->ad_filler ); nent = htons(ADEID_NUM_OSX); @@ -217,15 +217,12 @@ int ad_copy_header(struct adouble *add, struct adouble *ads) 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 );