]> arthur.barton.de Git - netatalk.git/commitdiff
Add missing default value for dbpath
authorFrank Lahm <franklahm@googlemail.com>
Mon, 12 Mar 2012 16:15:37 +0000 (17:15 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 12 Mar 2012 16:15:37 +0000 (17:15 +0100)
libatalk/util/netatalk_conf.c

index 8a4cfb2afe67ca42d3ee4e4eb837bd82ed843874..99520e05350231050fa7ba593d0460dcb4d1ea25 100644 (file)
@@ -608,8 +608,8 @@ static struct vol *creatvol(AFPObj *obj,
     else
         EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) );
 
-    if (val = getoption(obj->iniconfig, section, "dbpath", preset))
-        EC_NULL( volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) );
+    val = getoption(obj->iniconfig, section, "dbpath", preset);
+    EC_NULL( volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, val ? val : path, pwd, path, name) );
 
     if (val = getoption(obj->iniconfig, section, "cnidscheme", preset))
         EC_NULL( volume->v_cnidscheme = strdup(val) );