#include <atalk/ea.h>
#include <atalk/util.h>
#include <atalk/acl.h>
+#include <atalk/compat.h>
#include "cmd_dbd.h"
#include "dbif.h"
*/
static int check_adfile(const char *fname, const struct stat *st)
{
- int ret, adflags;
+ int ret;
+ int adflags = ADFLAGS_HF;
struct adouble ad;
- char *adname;
+ const char *adname;
if (dbd_flags & DBD_FLAGS_CLEANUP)
return 0;
if (S_ISREG(st->st_mode))
- adflags = 0;
- else
- adflags = ADFLAGS_DIR;
+ adflags |= ADFLAGS_DIR;
adname = myvolinfo->ad_path(fname, adflags);
return -1;
/* Create ad file */
- ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
- if ((ret = ad_open_metadata( fname, adflags, O_CREAT, &ad)) != 0) {
+ if ((ret = ad_open(&ad, fname, adflags | ADFLAGS_CREATE | ADFLAGS_RDWR, 0666)) != 0) {
dbd_log( LOGSTD, "Error creating AppleDouble file '%s/%s': %s",
cwdbuf, adname, strerror(errno));
/* Set name in ad-file */
ad_setname(&ad, utompath((char *)fname));
ad_flush(&ad);
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
chown(adname, st->st_uid, st->st_gid);
/* FIXME: should we inherit mode too here ? */
chmod(adname, st->st_mode);
#endif
} else {
- ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
- if (ad_open_metadata( fname, adflags, O_RDONLY, &ad) != 0) {
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ if (ad_open(&ad, fname, adflags | ADFLAGS_RDONLY) != 0) {
dbd_log( LOGSTD, "Error opening AppleDouble file for '%s/%s'", cwdbuf, fname);
return -1;
}
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
}
return 0;
}
if ((dp = opendir(".")) == NULL) {
dbd_log(LOGSTD, "Couldn't open the directory '%s/%s': %s",
cwdbuf, ADv2_DIRNAME, strerror(errno));
- return;
+ goto exit;
}
while ((ep = readdir(dp))) {
} /* if */
} /* while */
+exit:
if (dp)
closedir(dp);
-
+ if ((chdir("..")) != 0) {
+ dbd_log(LOGSTD, "Couldn't chdir to '%s': %s", cwdbuf, strerror(errno));
+ /* we can't proceed */
+ longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */
+ }
}
/*
}
/* Create ad dir and set name */
- ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
- if (ad_open_metadata( ".", ADFLAGS_DIR, O_CREAT, &ad) != 0) {
+ if (ad_open(&ad, ".", ADFLAGS_HF | ADFLAGS_DIR | ADFLAGS_CREATE | ADFLAGS_RDWR, 0777) != 0) {
dbd_log( LOGSTD, "Error creating AppleDouble dir in %s: %s", cwdbuf, strerror(errno));
return -1;
}
/* Update name in ad file */
ad_setname(&ad, mname);
ad_flush(&ad);
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
/* Inherit owner/group from "." to ".AppleDouble" and ".Parent" */
if ((lstat(".", &st)) != 0) {
/* Get CNID from ad-file if volume is using AFPVOL_CACHE */
ad_cnid = 0;
if ( (myvolinfo->v_flags & AFPVOL_CACHE) && ADFILE_OK) {
- ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
- if (ad_open_metadata( name, adflags, O_RDWR, &ad) != 0) {
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ if (ad_open(&ad, name, adflags | ADFLAGS_RDWR) != 0) {
if (dbd_flags & DBD_FLAGS_CLEANUP)
return CNID_INVALID;
ad_flush(&ad);
}
else
- ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, did, stamp);
+ ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, 0, stamp);
if (ad_cnid == 0)
dbd_log( LOGSTD, "Bad CNID in adouble file of '%s/%s'", cwdbuf, name);
else
dbd_log( LOGDEBUG, "CNID from .AppleDouble file for '%s/%s': %u", cwdbuf, name, ntohl(ad_cnid));
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
}
/* Get CNID from database */
/* Everything is fine */
return db_cnid;
} else if (ad_cnid && db_cnid && (ad_cnid != db_cnid)) {
- /* Mismatch ? Delete both from db and re-add data from file */
+ /* Mismatch, overwrite ad file with value from db */
dbd_log( LOGSTD, "CNID mismatch for '%s/%s', db: %u, ad-file: %u", cwdbuf, name, ntohl(db_cnid), ntohl(ad_cnid));
if ( ! (dbd_flags & DBD_FLAGS_SCAN)) {
- rqst.cnid = db_cnid;
- ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID);
- if (dbif_txn_close(dbd, ret) != 0)
- return CNID_INVALID;
-
- rqst.cnid = ad_cnid;
- ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID);
- if (dbif_txn_close(dbd, ret) != 0)
- return CNID_INVALID;
-
- ret = dbd_rebuild_add(dbd, &rqst, &rply);
- if (dbif_txn_close(dbd, ret) != 0)
+ dbd_log(LOGSTD, "Updating AppleDouble file for '%s/%s' with CNID: %u from database",
+ cwdbuf, name, ntohl(db_cnid));
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ if (ad_open(&ad, name, adflags | ADFLAGS_HF | ADFLAGS_RDWR) != 0) {
+ dbd_log(LOGSTD, "Error opening AppleDouble file for '%s/%s': %s",
+ cwdbuf, name, strerror(errno));
return CNID_INVALID;
+ }
+ ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp);
+ ad_flush(&ad);
+ ad_close(&ad, ADFLAGS_HF);
}
- return ad_cnid;
+ return db_cnid;
} else if (ad_cnid && (db_cnid == 0)) {
/* in ad-file but not in db */
if ( ! (dbd_flags & DBD_FLAGS_SCAN)) {
rqst.cnid = ad_cnid;
ret = dbd_resolve(dbd, &rqst, &rply);
- if (ret == CNID_DBD_RES_OK) {
+ if (rply.result == CNID_DBD_RES_OK) {
/* Occupied! Choose another, update ad-file */
ret = dbd_add(dbd, &rqst, &rply, 1);
if (dbif_txn_close(dbd, ret) != 0)
&& ( ! (dbd_flags & DBD_FLAGS_SCAN))) {
dbd_log(LOGSTD, "Writing CNID data for '%s/%s' to AppleDouble file",
cwdbuf, name, ntohl(db_cnid));
- ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
- if (ad_open_metadata( name, adflags, O_RDWR, &ad) != 0) {
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ if (ad_open(&ad, name, adflags | ADFLAGS_RDWR) != 0) {
dbd_log(LOGSTD, "Error opening AppleDouble file for '%s/%s': %s",
cwdbuf, name, strerror(errno));
return CNID_INVALID;
}
ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp);
ad_flush(&ad);
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
}
return db_cnid;
}
if ( ! (dbd_flags & DBD_FLAGS_SCAN)) {
dbd_log(LOGSTD, "Writing CNID data for '%s/%s' to AppleDouble file",
cwdbuf, name, ntohl(db_cnid));
- ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
- if (ad_open_metadata( name, adflags, O_RDWR, &ad) != 0) {
+ ad_init_old(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options);
+ if (ad_open(&ad, name, adflags | ADFLAGS_RDWR) != 0) {
dbd_log(LOGSTD, "Error opening AppleDouble file for '%s/%s': %s",
cwdbuf, name, strerror(errno));
return CNID_INVALID;
}
ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp);
ad_flush(&ad);
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
}
}
return db_cnid;
struct dirent *ep;
static struct stat st; /* Save some stack space */
- /* keep trying to get the lock */
- if (!db_locked)
- if ((db_locked = get_lock(1, NULL)) == -1)
- return -1;
-
/* Check again for .AppleDouble folder, check_adfile also checks/creates it */
if ((addir_ok = check_addir(volroot)) != 0)
if ( ! (dbd_flags & DBD_FLAGS_SCAN))
static int scanvol(struct volinfo *vi, dbd_flags_t flags)
{
- /* Dont scanvol on no-appledouble vols */
- if (vi->v_flags & AFPVOL_NOADOUBLE) {
- dbd_log( LOGSTD, "Volume without AppleDouble support: skipping volume scanning.");
- return 0;
- }
-
/* Make this stuff accessible from all funcs easily */
myvolinfo = vi;
dbd_flags = flags;
return -1;
}
- /* temporary rebuild db, used with -re rebuild to delete unused CNIDs, not used with -f */
- if (! nocniddb && !(flags & DBD_FLAGS_FORCE)) {
- /* Get volume stamp */
- dbd_getstamp(dbd, &rqst, &rply);
- if (rply.result != CNID_DBD_RES_OK)
- goto exit;
- memcpy(stamp, rply.name, CNID_DEV_LEN);
+ /* Get volume stamp */
+ dbd_getstamp(dbd, &rqst, &rply);
+ if (rply.result != CNID_DBD_RES_OK) {
+ ret = -1;
+ goto exit;
+ }
+ memcpy(stamp, rply.name, CNID_DEV_LEN);
- /* open/create rebuild dbd, copy rootinfo key */
+ /* temporary rebuild db, used with -re rebuild to delete unused CNIDs, not used with -f */
+ if (! nocniddb && (flags & DBD_FLAGS_EXCL) && !(flags & DBD_FLAGS_FORCE)) {
tmpdb_path = get_tmpdb_path();
if (NULL == (dbd_rebuild = dbif_init(tmpdb_path, "cnid2.db"))) {
ret = -1;
exit:
if (! nocniddb) {
- if (dbif_txn_close(dbd, 2) != 0)
+ if (dbif_txn_close(dbd, ret == 0 ? 1 : 0) != 0)
ret = -1;
if (dbd_rebuild)
- if (dbif_txn_close(dbd_rebuild, 2) != 0)
+ if (dbif_txn_close(dbd_rebuild, ret == 0 ? 1 : 0) != 0)
ret = -1;
if ((ret == 0) && dbd_rebuild && (flags & DBD_FLAGS_EXCL) && !(flags & DBD_FLAGS_FORCE))
/* We can only do this in exclusive mode, otherwise we might delete CNIDs added from