Fixes, from Anton Starikov

diff --git a/bin/misc/Makefile.am b/bin/misc/Makefile.am
index b8ec704016b62150c98b1a5708c622b48be4011e..0a9cd7b579975c1c5ac8a279f7af3dfc9e7e4e81 100644 (file)
--- 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 6f6bd0fe1afa389291ed4f141d39cff2c3965850..69458f08b490419648a9f1f27ff124173843b424 100644 (file)
--- 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 75bc3f4ba2292f8048c8a607dd8b731ce746d700..07b59d73621555cf917eebbc4028ac347860cc37 100644 (file)
--- 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 ddd8e50a71eaa190dbd49a2743f0c5d68eedf7d9..baf17697676d035109fb32d73810bb347d4f8080 100644 (file)
--- 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: