Merge branch-2-1

[netatalk.git] / etc / afpd / volume.c

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 479923f246e46c70496878ed3c46c062772d9648..e53599b0149202940c62436733b307106c42abee 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -504,6 +504,8 @@ static void volset(struct vol_option *options, struct vol_option *save,
                 options[VOLOPT_FLAGS].i_value &= ~AFPVOL_CACHE;
             else if (strcasecmp(p, "tm") == 0)
                 options[VOLOPT_FLAGS].i_value |= AFPVOL_TM;
+            else if (strcasecmp(p, "searchdb") == 0)
+                options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB;
 /* Found this in branch dir-rewrite, maybe we want to use it sometimes */
 #if 0
             else if (strcasecmp(p, "cdrom") == 0)
@@ -733,7 +735,8 @@ static int creatvol(AFPObj *obj, struct passwd *pwd,
     volume->v_vid = htons(volume->v_vid);
 #ifdef HAVE_ACLS
     if (check_vol_acl_support(volume))
-        volume->v_flags |= AFPVOL_ACLS;
+        volume->v_flags |= AFPVOL_ACLS
+;
 #endif
 
     /* handle options */
@@ -1936,7 +1939,7 @@ static int volume_openDB(struct vol *volume)
     }
 #endif
 
-    volume->v_cdb = cnid_open(volume->v_dbpath ? volume->v_dbpath : volume->v_path,
+    volume->v_cdb = cnid_open(volume->v_path,
                               volume->v_umask,
                               volume->v_cnidscheme,
                               flags,