From 2f4beb43087ef2ec616b33cc4d3f614c66af0e07 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Thu, 15 Mar 2012 11:02:21 +0100 Subject: [PATCH] Option for specifying path to CNID database is now a global opion named 'vol dbpath' --- libatalk/util/netatalk_conf.c | 3 +-- man/man5/afp.conf.5.tmpl | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 3425c741..1e5c64dd 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -610,8 +610,7 @@ static struct vol *creatvol(AFPObj *obj, EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) ); bstring dbpath; - if ((val = getoption(obj->iniconfig, section, "dbpath", preset)) == NULL) - val = _PATH_STATEDIR "CNID/"; + EC_NULL_LOG( val = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol dbpath", _PATH_STATEDIR "CNID/") ); EC_NULL_LOG( dbpath = bformat("%s/%s/", val, name) ); volume->v_dbpath = strdup(bdata(dbpath)); bdestroy(dbpath); diff --git a/man/man5/afp.conf.5.tmpl b/man/man5/afp.conf.5.tmpl index 09e93f44..7add8ccd 100644 --- a/man/man5/afp.conf.5.tmpl +++ b/man/man5/afp.conf.5.tmpl @@ -500,6 +500,13 @@ Try to set TCP send buffer using setsockpt()\&. Often OSes impose restrictions o .RE .SS "Miscellaneous Options" .PP +vol dbpath = \fIpath\fR \fB(G)\fR +.RS 4 +Sets the database information to be stored in path\&. You have to specifiy a writable location, even if the volume is read only\&. The default is +$localstatedir/netatalk/CNID/, where $localstatedir defaults to +/var\&. +.RE +.PP basedir regex = \fIregex\fR \fB(H)\fR .RS 4 Regular expression which matches the parent directory of the user homes\&. In the simple case this is just a path ie @@ -818,11 +825,6 @@ cnidscheme = \fIbackend\fR \fB(V)\fR set the CNID backend to be used for the volume, default is [:DEFAULT_CNID_SCHEME:] available schemes: [:COMPILED_BACKENDS:] .RE .PP -dbpath = \fIpath\fR \fB(V)\fR -.RS 4 -Sets the database information to be stored in path\&. You have to specifiy a writable location, even if the volume is read only\&. -.RE -.PP cnidserver = \fIhost[:port]\fR \fB(V)\fR .RS 4 Query this servername or IP address (default:\fIlocalhost\fR) and port (default: -- 2.39.2