Fixes

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

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index cd332a94715e66c5321f85761715c645dee2050d..c07b2e9272229cdd4b0743967d304f0cf0b19487 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -171,21 +171,10 @@ static AFPConfig *AFPConfigInit(struct afp_options *options,
 }
 
 /*!
- * Parse configfile and build AFPObj
+ * Get everything running
  */
-int configinit(AFPObj *AFPObj, const struct afp_options *defoptions)
+int configinit(AFPObj *AFPObj)
 {
-    int have_option = 0;
-
-    afp_options_duplicate(&AFPObj->options, defoptions);
-
-    if ((AFPObj->iniconfig = iniparser_load(AFPObj->options.configfile)) == NULL)
-        /* if config file doesn't exist, load defaults */
-        return AFPConfigInit(AFPObj);
-
-    if (afp_options_parse(AFPObj) != 0)
-        return -1;
-
     AFPConfigInit(AFPObj);
 
 #ifdef HAVE_LDAP
@@ -193,8 +182,6 @@ int configinit(AFPObj *AFPObj, const struct afp_options *defoptions)
     acl_ldap_readconfig(AFPObj->iniconfig);
 #endif /* HAVE_LDAP */
 
-    LOG(log_debug, logtype_afpd, "Finished parsing Config File");
-
     /* Now register with zeroconf, we also need the volumes for that */
     if (! (AFPObj->options.flags & OPTION_NOZEROCONF)) {
         load_volumes(AFPObj);