From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 12 Mar 2012 16:15:37 +0000 (+0100)
Subject: Add missing default value for dbpath
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=c974b1b746e3766a373e33cba7222814375d1d96;p=netatalk.git

Add missing default value for dbpath
---

diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 8a4cfb2a..99520e05 100644
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -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) );