syslog-132.tar.gz

[apple/syslog.git] / syslogd.tproj / bsd_in.c

diff --git a/syslogd.tproj/bsd_in.c b/syslogd.tproj/bsd_in.c
index eafca64b52eefe409b21472abf5818a3239409c9..fa10fd46c68de7a5f7bf3a44a284b02e5fda863a 100644 (file)
--- a/syslogd.tproj/bsd_in.c
+++ b/syslogd.tproj/bsd_in.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -40,7 +40,7 @@
 
 static int sock = -1;
 
-asl_msg_t *
+aslmsg
 bsd_in_acceptmsg(int fd)
 {
        uint32_t len;
@@ -55,7 +55,7 @@ bsd_in_acceptmsg(int fd)
 
        line[n] = '\0';
 
-       return asl_input_parse(line, n, NULL, 0);
+       return asl_input_parse(line, n, NULL, SOURCE_BSD_SOCKET);
 }
 
 int
@@ -132,17 +132,19 @@ bsd_in_init(void)
 }
 
 int
-bsd_in_reset(void)
+bsd_in_close(void)
 {
+       if (sock < 0) return 1;
+
+       aslevent_removefd(sock);
+       close(sock);
+       sock = -1;
+
        return 0;
 }
 
 int
-bsd_in_close(void)
+bsd_in_reset(void)
 {
-       if (sock < 0) return 1;
-
-       close(sock);
-       unlink(_PATH_SYSLOG_IN);
        return 0;
 }