#define DBOPTIONS (DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN)
int nocniddb = 0; /* Dont open CNID database, only scan filesystem */
+struct volinfo volinfo; /* needed by pack.c:idxname() */
volatile sig_atomic_t alarmed; /* flags for signals */
int db_locked; /* have we got the fcntl lock on lockfile ? */
NULL, /* Volume dirpath */
1, /* bdb logfile autoremove */
64 * 1024, /* bdb cachesize (64 MB) */
+ DEFAULT_MAXLOCKS, /* maxlocks */
+ DEFAULT_MAXLOCKOBJS, /* maxlockobjs */
0, /* flush_interval */
0, /* flush_frequency */
0, /* usock_file */
-1, /* idle_timeout */
-1 /* max_vols */
};
-static char dbpath[PATH_MAX]; /* Path to the dbd database */
+static char dbpath[MAXPATHLEN+1]; /* Path to the dbd database */
/*
Provide some logging
" Options: -c Don't create .AppleDouble stuff, only cleanup orphaned.\n"
" -f wipe database and rebuild from IDs stored in AppleDouble files,\n"
" only available for volumes without 'nocnidcache' option. Implies -e.\n\n"
- " -u Prepare upgrade:\n"
- " Before installing an upgraded version of Netatalk that is linked against\n"
- " a newer BerkeleyDB lib, run `dbd -u ...` from the OLD Netatalk pior to\n"
- " upgrading on all volumes. This removes the BerkleyDB environment.\n"
- " On exit cnid_dbd does this automatically, so normally calling dbd -u should not be necessary.\n\n"
+ " -u Upgrade:\n"
+ " Opens the database which triggers any necessary upgrades, then closes and exits.\n\n"
"General options:\n"
" -e only work on inactive volumes and lock them (exclusive)\n"
" -x rebuild indexes (just for completeness, mostly useless!)\n"
int dump=0, scan=0, rebuild=0, prep_upgrade=0, rebuildindexes=0, dumpindexes=0, force=0;
dbd_flags_t flags = 0;
char *volpath;
- struct volinfo volinfo;
int cdir;
if (geteuid() != 0) {
exit(EXIT_FAILURE);
}
+ /* Enuser dbpath is there, create if necessary */
+ struct stat st;
+ if (stat(volinfo.v_dbpath, &st) != 0) {
+ if (errno != ENOENT) {
+ dbd_log( LOGSTD, "Can't stat dbpath \"%s\": %s", volinfo.v_dbpath, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ if ((mkdir(volinfo.v_dbpath, 0755)) != 0) {
+ dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", dbpath, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ }
+
/* Put "/.AppleDB" at end of volpath, get path from volinfo file */
- if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > (PATH_MAX - 1) ) {
+ if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) {
dbd_log( LOGSTD, "Volume pathname too long");
exit(EXIT_FAILURE);
}
- strncpy(dbpath, volinfo.v_dbpath, PATH_MAX - 9 - 1);
+ strncpy(dbpath, volinfo.v_dbpath, MAXPATHLEN - strlen("/.AppleDB"));
strcat(dbpath, "/.AppleDB");
/* Check or create dbpath */
goto exit_failure;
}
- /* Prepare upgrade ? */
- if (prep_upgrade) {
- if (dbif_prep_upgrade(dbpath))
- goto exit_failure;
- goto exit_success;
- }
-
/* Check if -f is requested and wipe db if yes */
if ((flags & DBD_FLAGS_FORCE) && rebuild && (volinfo.v_flags & AFPVOL_CACHE)) {
char cmd[8 + MAXPATHLEN];
if ((db_locked = get_lock(LOCK_FREE, NULL)) != 0)
goto exit_failure;
- snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/*", dbpath);
+
+ snprintf(cmd, 8 + MAXPATHLEN, "rm -rf \"%s\"", dbpath);
dbd_log( LOGDEBUG, "Removing old database of volume: '%s'", volpath);
system(cmd);
+ if ((mkdir(dbpath, 0755)) != 0) {
+ dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", dbpath, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
dbd_log( LOGDEBUG, "Removed old database.");
if ((db_locked = get_lock(LOCK_EXCL, dbpath)) == -1)
goto exit_failure;
goto exit_failure;
}
- if (dbd_stamp(dbd) < 0) {
- dbif_close(dbd);
- goto exit_failure;
+ /* Prepare upgrade ? We're done */
+ if (prep_upgrade) {
+ (void)dbif_txn_close(dbd, 1);
+ goto cleanup;
}
}
}
}
+cleanup:
/* Cleanup */
dbd_log(LOGDEBUG, "Closing db");
if (! nocniddb) {