Update NEWS

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

diff --git a/etc/afpd/afp_asp.c b/etc/afpd/afp_asp.c
index 85c412e11d3dcb6ceb52232a082837a1ed6f70fc..3e208f74a102d1db449b49b317908f508e8a75ec 100644 (file)
--- a/etc/afpd/afp_asp.c
+++ b/etc/afpd/afp_asp.c
@@ -32,8 +32,8 @@
 #include <atalk/asp.h>
 #include <atalk/compat.h>
 #include <atalk/util.h>
+#include <atalk/globals.h>
 
-#include "globals.h"
 #include "switch.h"
 #include "auth.h"
 #include "fork.h"
@@ -88,7 +88,6 @@ static void afp_authprint_remove(AFPObj *obj)
            if ((len = read( capfd, addr_filename_buff, 256 )) > 0) {
                int file_pid;
                char *p_filepid;
-               close(capfd);
                addr_filename_buff[len] = 0;
                if ( (p_filepid = strrchr(addr_filename_buff, ':')) != NULL) {
                    *p_filepid = '\0';
@@ -116,6 +115,8 @@ static void afp_authprint_remove(AFPObj *obj)
            } else {
                LOG(log_info, logtype_afpd, "couldn't read data from %s", addr_filename );
            }
+        if (capfd != -1)
+            close(capfd);
        } else {
            LOG(log_info, logtype_afpd, "%s is not a regular file", addr_filename );
        }
@@ -283,6 +284,11 @@ void afp_over_asp(AFPObj *obj)
         afp_asp_die(EXITERR_SYS);
     }
 
+    if (dircache_init(obj->options.dircachesize) != 0) {
+        LOG(log_error, logtype_afpd, "afp_over_asp: dircache_init error");
+        afp_asp_die(EXITERR_SYS);
+    }
+
     LOG(log_info, logtype_afpd, "session from %u.%u:%u on %u.%u:%u",
         ntohs( asp->asp_sat.sat_addr.s_net ),
         asp->asp_sat.sat_addr.s_node, asp->asp_sat.sat_port,