X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcmd_dbd.c;h=a643ef0510bd8eedee0a4840264ae3af16b62a65;hb=5825df1c826101269dccd558ac9ac85c0dcd4e36;hp=34df98a0c00bc637ff6d9abb6d37d325cad360b9;hpb=e5e2393c2fe037bbcf674849c57fc5b11d5e07df;p=netatalk.git diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c index 34df98a0..a643ef05 100644 --- a/etc/cnid_dbd/cmd_dbd.c +++ b/etc/cnid_dbd/cmd_dbd.c @@ -1,6 +1,4 @@ /* - $Id: cmd_dbd.c,v 1.10 2009-10-12 11:55:27 franklahm Exp $ - Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -84,6 +82,7 @@ int nocniddb = 0; /* Dont open CNID database, only scan filesystem */ volatile sig_atomic_t alarmed; +struct volinfo volinfo; /* needed by pack.c:idxname() */ static DBD *dbd; static int verbose; /* Logging flag */ @@ -91,15 +90,18 @@ static int exclusive; /* Exclusive volume access */ static struct db_param db_param = { NULL, /* Volume dirpath */ 1, /* bdb logfile autoremove */ - 16384, /* bdb cachesize */ - -1, /* not used ... */ - -1, - "", - -1, - -1, - -1 + 64 * 1024, /* bdb cachesize (64 MB) */ + DEFAULT_MAXLOCKS, /* maxlocks */ + DEFAULT_MAXLOCKOBJS, /* maxlockobjs */ + 0, /* flush_interval */ + 0, /* flush_frequency */ + 1000, /* txn_frequency */ + 0, /* usock_file */ + -1, /* fd_table_size */ + -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 @@ -131,7 +133,7 @@ static void sig_handler(int signo) return; } -void set_signal(void) +static void set_signal(void) { struct sigaction sv; @@ -165,7 +167,7 @@ void set_signal(void) } } -int get_lock(const char *dbpath) +static int get_lock(const char *dbpath) { int lockfd; char lockpath[PATH_MAX]; @@ -215,7 +217,7 @@ int get_lock(const char *dbpath) return lockfd; } -void free_lock(int lockfd) +static void free_lock(int lockfd) { struct flock lock; @@ -227,14 +229,14 @@ void free_lock(int lockfd) close(lockfd); } -static void usage () +static void usage (void) { - printf("Usage: dbd [-e|-v|-x] -d [-i] | -s [-n]| -r [-f] | -u \n" + printf("Usage: dbd [-e|-t|-v|-x] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u \n" "dbd can dump, scan, reindex and rebuild Netatalk dbd CNID databases.\n" "dbd must be run with appropiate permissions i.e. as root.\n\n" "Main commands are:\n" " -d Dump CNID database\n" - " Option: -i dump indexes too\n" + " Option: -i dump indexes too\n\n" " -s Scan volume:\n" " 1. Compare CNIDs in database with volume\n" " 2. Check if .AppleDouble dirs exist\n" @@ -244,7 +246,8 @@ static void usage () " 6. Check name encoding by roundtripping, log on error\n" " 7. Check for orphaned CNIDs in database (requires -e)\n" " 8. Open and close adouble files\n" - " Option: -n Don't open CNID database, skip CNID checks\n" + " Options: -c Don't check .AppleDouble stuff, only ckeck orphaned.\n" + " -n Don't open CNID database, skip CNID checks\n\n" " -r Rebuild volume:\n" " 1. Sync CNIDSs in database with volume\n" " 2. Make sure .AppleDouble dir exist, create if missing\n" @@ -254,8 +257,9 @@ static void usage () " 6. Check name encoding by roundtripping, log on error\n" " 7. Check for orphaned CNIDs in database (requires -e)\n" " 8. Open and close adouble files\n" - " Option: -f wipe database and rebuild from IDs stored in AppleDouble files,\n" - " only available for volumes without 'nocnidcache' option. Implies -e.\n" + " 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" @@ -264,11 +268,11 @@ static void usage () "General options:\n" " -e only work on inactive volumes and lock them (exclusive)\n" " -x rebuild indexes (just for completeness, mostly useless!)\n" + " -t show statistics while running\n" " -v verbose\n\n" "WARNING:\n" - "If you want/need to run an -r -f rebuild after adding 'cachecnid' to a volume configuration,\n" - "you must run a rebuild with -r alone at first in order to sync all existing CNIDs from the db\n" - "to the AppleDouble files!\n" + "For -r -f restore of the CNID database from the adouble files, the CNID must of course\n" + "be synched to them files first with a plain -r rebuild !\n" ); } @@ -278,16 +282,20 @@ int main(int argc, char **argv) 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) { usage(); exit(EXIT_FAILURE); } + /* Inhereting perms in ad_mkdir etc requires this */ + ad_setfuid(0); - while ((c = getopt(argc, argv, ":dsnruvxife")) != -1) { + while ((c = getopt(argc, argv, ":cdefinrstuvx")) != -1) { switch(c) { + case 'c': + flags |= DBD_FLAGS_CLEANUP; + break; case 'd': dump = 1; break; @@ -299,11 +307,14 @@ int main(int argc, char **argv) flags |= DBD_FLAGS_SCAN; break; case 'n': - nocniddb = 1; + nocniddb = 1; /* FIXME: this could/should be a flag too for consistency */ break; case 'r': rebuild = 1; break; + case 't': + flags |= DBD_FLAGS_STATS; + break; case 'u': prep_upgrade = 1; break; @@ -341,6 +352,8 @@ int main(int argc, char **argv) } volpath = argv[optind]; + setvbuf(stdout, (char *) NULL, _IONBF, 0); + /* Remember cwd */ if ((cdir = open(".", O_RDONLY)) < 0) { dbd_log( LOGSTD, "Can't open dir: %s", strerror(errno)); @@ -358,7 +371,7 @@ int main(int argc, char **argv) /* Load .volinfo file */ if (loadvolinfo(volpath, &volinfo) == -1) { - dbd_log( LOGSTD, "Unkown volume options!"); + dbd_log( LOGSTD, "Not a Netatalk volume at '%s', no .volinfo file at '%s/.AppleDesktop/.volinfo' or unknown volume options", volpath, volpath); exit(EXIT_FAILURE); } if (vol_load_charsets(&volinfo) == -1) { @@ -366,23 +379,53 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + /* Sanity checks to ensure we can touch this volume */ + if (volinfo.v_vfs_ea != AFPVOL_EA_AD && volinfo.v_vfs_ea != AFPVOL_EA_SYS) { + dbd_log( LOGSTD, "Unknown Extended Attributes option: %u", volinfo.v_vfs_ea); + 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"); - /* - Before we do anything else, check if there is an instance of cnid_dbd - running already and silently exit if yes. - */ - lockfd = get_lock(dbpath); + /* Check or create dbpath */ + int dbdirfd = open(dbpath, O_RDONLY); + if (dbdirfd == -1 && errno == ENOENT) { + if (errno == ENOENT) { + if ((mkdir(dbpath, 0755)) != 0) { + dbd_log( LOGSTD, "Can't create .AppleDB for \"%s\": %s", dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + dbd_log( LOGSTD, "Somethings wrong with .AppleDB for \"%s\", giving up: %s", dbpath, strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + close(dbdirfd); + } /* Prepare upgrade ? */ if (prep_upgrade) { - if (dbif_prep_upgrade(dbpath)) + lockfd = get_lock(dbpath); + if (dbif_env_remove(dbpath)) goto exit_failure; goto exit_success; } @@ -390,12 +433,22 @@ int main(int argc, char **argv) /* 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]; - 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."); } + /* + Before we do anything else, check if there is an instance of cnid_dbd + running already and silently exit if yes. + */ + lockfd = get_lock(dbpath); + /* Lets start with the BerkeleyDB stuff */ @@ -411,12 +464,7 @@ int main(int argc, char **argv) if (exclusive) dbd_log( LOGDEBUG, "Finished recovery."); - if (dbif_open(dbd, &db_param, rebuildindexes) < 0) { - dbif_close(dbd); - goto exit_failure; - } - - if (dbd_stamp(dbd) < 0) { + if (dbif_open(dbd, NULL, rebuildindexes) < 0) { dbif_close(dbd); goto exit_failure; } @@ -427,16 +475,19 @@ int main(int argc, char **argv) if (dbif_dump(dbd, dumpindexes) < 0) { dbd_log( LOGSTD, "Error dumping database"); } - } else if ((rebuild && ! nocniddb) || (scan && nocniddb)) { + } else if ((rebuild && ! nocniddb) || scan) { if (cmd_dbd_scanvol(dbd, &volinfo, flags) < 0) { dbd_log( LOGSTD, "Error repairing database."); } } /* Cleanup */ - if (! nocniddb && dbif_close(dbd) < 0) { - dbd_log( LOGSTD, "Error closing database"); - goto exit_failure; + dbd_log(LOGDEBUG, "Closing db"); + if (! nocniddb) { + if (dbif_close(dbd) < 0) { + dbd_log( LOGSTD, "Error closing database"); + goto exit_failure; + } } exit_success: