From 156ab78cd5b684411b412369651cb0b8f99a323a Mon Sep 17 00:00:00 2001
From: Frank Lahm <franklahm@googlemail.com>
Date: Sat, 3 Mar 2012 22:24:13 +0100
Subject: [PATCH] Fixes, from Anton Starikov

---
 bin/misc/Makefile.am          | 2 +-
 etc/afpd/fce_api.c            | 2 --
 etc/afpd/fce_util.c           | 2 --
 libatalk/util/netatalk_conf.c | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/misc/Makefile.am b/bin/misc/Makefile.am
index b8ec7040..0a9cd7b5 100644
--- a/bin/misc/Makefile.am
+++ b/bin/misc/Makefile.am
@@ -17,6 +17,6 @@ fce_CFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS += afpldaptest
 afpldaptest_SOURCES = uuidtest.c
-afpldaptest_CFLAGS = -D_PATH_CONFDIR=\"$(pkgconfdir)\"
+afpldaptest_CFLAGS = -D_PATH_CONFDIR=\"$(pkgconfdir)/\"
 afpldaptest_LDADD =  $(top_builddir)/libatalk/libatalk.la
 
diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 6f6bd0fe..69458f08 100644
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -37,8 +37,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <netatalk/at.h>
-
 #include <atalk/adouble.h>
 #include <atalk/vfs.h>
 #include <atalk/logger.h>
diff --git a/etc/afpd/fce_util.c b/etc/afpd/fce_util.c
index 75bc3f4b..07b59d73 100644
--- a/etc/afpd/fce_util.c
+++ b/etc/afpd/fce_util.c
@@ -35,8 +35,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <netatalk/at.h>
-
 #include <atalk/adouble.h>
 #include <atalk/vfs.h>
 #include <atalk/logger.h>
diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index ddd8e50a..baf17697 100644
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -504,7 +504,7 @@ static const char *getoption(const dictionary *conf, const char *vol, const char
     EC_INIT;
     const char *result = NULL;
 
-    if (!(result = iniparser_getstring(conf, vol, opt, NULL)))
+    if ((!(result = iniparser_getstring(conf, vol, opt, NULL))) && (def != NULL))
         result = iniparser_getstring(conf, def, opt, NULL);
     
 EC_CLEANUP:
-- 
2.39.2