Merge branch 2-1

diff --combined etc/cnid_dbd/cmd_dbd.c
index 532b7b8a6bd3b67d3966e374185ea83f02e91b04,f915b9961f973bd0a1af4b42af4dcdda473260d6..a643ef0510bd8eedee0a4840264ae3af16b62a65
--- 1/etc/cnid_dbd/cmd_dbd.c
--- 2/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@@ -82,7 -82,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,8 -90,6 +91,8 @@@ static struct db_param db_param = 
      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 */
      1000,                       /* txn_frequency */
@@@ -101,7 -98,7 +101,7 @@@
      -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
@@@ -282,6 -279,7 +282,6 @@@ 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) {
@@@ -385,25 -383,12 +385,25 @@@
          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 */
@@@ -422,15 -407,10 +422,10 @@@
          close(dbdirfd);
      }
  
-     /* 
-        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);
- 
      /* 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;
      }        
@@@ -438,16 -418,18 +433,22 @@@
      /* 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
      */
@@@ -467,6 -449,11 +468,6 @@@
              dbif_close(dbd);
              goto exit_failure;
          }
 -
 -        if (dbd_stamp(dbd) < 0) {
 -            dbif_close(dbd);
 -            goto exit_failure;
 -        }
      }
  
      /* Now execute given command scan|rebuild|dump */