launchd-329.3.1.tar.gz

[apple/launchd.git] / launchd / src / launchproxy.c

diff --git a/launchd/src/launchproxy.c b/launchd/src/launchproxy.c
index d0a07d07d6c1794f94a800b79f2e77db4fb0e0ad..3a909359607182c8f7dca676f337b54b186724af 100644 (file)
--- a/launchd/src/launchproxy.c
+++ b/launchd/src/launchproxy.c
@@ -17,9 +17,12 @@
  * 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */

+#include "config.h"
+#if HAVE_SECURITY

 #include <Security/Authorization.h>
 #include <Security/AuthorizationTags.h>
 #include <Security/AuthSession.h>
 #include <Security/Authorization.h>
 #include <Security/AuthorizationTags.h>
 #include <Security/AuthSession.h>

+#endif

 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/event.h>
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/event.h>


@@ -40,7 +43,7 @@
 
 #include "launch.h"
 
 
 #include "launch.h"
 

-#if __GNUC__ >= 4
+#if __GNUC__ >= 4 && HAVE_SECURITY

 OSStatus SessionCreate(SessionCreationFlags flags, SessionAttributeBits attributes) __attribute__((weak));
 #endif
 
 OSStatus SessionCreate(SessionCreationFlags flags, SessionAttributeBits attributes) __attribute__((weak));
 #endif
 


@@ -78,7 +81,7 @@ int main(int argc __attribute__((unused)), char *argv[])
 {
        struct timespec timeout = { 10, 0 };
        struct sockaddr_storage ss;
 {
        struct timespec timeout = { 10, 0 };
        struct sockaddr_storage ss;

-       socklen_t slen = sizeof(ss);
+       socklen_t slen = (socklen_t)sizeof ss;

        struct kevent kev;
        int r, ec = EXIT_FAILURE;
        launch_data_t tmp, resp, msg = launch_data_alloc(LAUNCH_DATA_STRING);
        struct kevent kev;
        int r, ec = EXIT_FAILURE;
        launch_data_t tmp, resp, msg = launch_data_alloc(LAUNCH_DATA_STRING);


@@ -140,40 +143,47 @@ int main(int argc __attribute__((unused)), char *argv[])
                }
 
                if (w) {
                }
 
                if (w) {

-                       dup2(kev.ident, STDIN_FILENO);
+                       dup2((int)kev.ident, STDIN_FILENO);

                        if (dupstdout)
                        if (dupstdout)

-                               dup2(kev.ident, STDOUT_FILENO);
+                               dup2((int)kev.ident, STDOUT_FILENO);

                        if (dupstderr)
                        if (dupstderr)

-                               dup2(kev.ident, STDERR_FILENO);
+                               dup2((int)kev.ident, STDERR_FILENO);

                        execv(prog, argv + 1);
                        syslog(LOG_ERR, "execv(): %m");
                        exit(EXIT_FAILURE);
                }
 
                        execv(prog, argv + 1);
                        syslog(LOG_ERR, "execv(): %m");
                        exit(EXIT_FAILURE);
                }
 

-               if ((r = accept(kev.ident, (struct sockaddr *)&ss, &slen)) == -1) {
+               if ((r = accept((int)kev.ident, (struct sockaddr *)&ss, &slen)) == -1) {

                        if (errno == EWOULDBLOCK)
                                continue;
                        if (errno == EWOULDBLOCK)
                                continue;

-                       syslog(LOG_DEBUG, "accept(): %m");
+                       syslog(LOG_WARNING, "accept(): %m");

                        goto out;
                } else {
                        goto out;
                } else {

-                       char fromhost[NI_MAXHOST];
-                       char fromport[NI_MAXSERV];
-                       int gni_r;
-
-                       gni_r = getnameinfo((struct sockaddr *)&ss, slen,
-                                       fromhost, sizeof(fromhost),
-                                       fromport, sizeof(fromport),
-                                       NI_NUMERICHOST | NI_NUMERICSERV);
-
-                       if (gni_r) {
-                               syslog(LOG_WARNING, "%s: getnameinfo(): %s", prog, gai_strerror(gni_r));
+                       if (ss.ss_family == AF_INET || ss.ss_family == AF_INET6) {
+                               char fromhost[NI_MAXHOST];
+                               char fromport[NI_MAXSERV];
+                               int gni_r;
+
+                               gni_r = getnameinfo((struct sockaddr *)&ss, slen,
+                                               fromhost, (socklen_t) sizeof fromhost,
+                                               fromport, (socklen_t) sizeof fromport,
+                                               NI_NUMERICHOST | NI_NUMERICSERV);
+
+                               if (gni_r) {
+                                       syslog(LOG_WARNING, "%s: getnameinfo(): %s", prog, gai_strerror(gni_r));
+                               } else {
+                                       syslog(LOG_INFO, "%s: Connection from: %s on port: %s", prog, fromhost, fromport);
+                               }

                        } else {
                        } else {

-                               syslog(LOG_INFO, "%s: Connection from: %s on port: %s", prog, fromhost, fromport);
+                               syslog(LOG_WARNING, "%s: getnameinfo() only supports IPv4/IPv6. Connection from address family: %u", prog, ss.ss_family);

                        }
 
                        switch (fork()) {
                        case -1:
                                syslog(LOG_WARNING, "fork(): %m");
                        }
 
                        switch (fork()) {
                        case -1:
                                syslog(LOG_WARNING, "fork(): %m");

+                               if( errno != ENOMEM ) {
+                                       continue;
+                               }

                                goto out;
                        case 0:
                                break;
                                goto out;
                        case 0:
                                break;


@@ -184,6 +194,7 @@ int main(int argc __attribute__((unused)), char *argv[])
 
                        setpgid(0, 0);
 
 
                        setpgid(0, 0);
 

+#if HAVE_SECURITY

                        if ((tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_SESSIONCREATE)) && launch_data_get_bool(tmp)) {
                                if (SessionCreate) {
                                        OSStatus scr = SessionCreate(0, 0);
                        if ((tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_SESSIONCREATE)) && launch_data_get_bool(tmp)) {
                                if (SessionCreate) {
                                        OSStatus scr = SessionCreate(0, 0);


@@ -193,6 +204,7 @@ int main(int argc __attribute__((unused)), char *argv[])
                                        syslog(LOG_NOTICE, "%s: SessionCreate == NULL!", prog);
                                }
                        }
                                        syslog(LOG_NOTICE, "%s: SessionCreate == NULL!", prog);
                                }
                        }

+#endif

                        fcntl(r, F_SETFL, 0);
                        fcntl(r, F_SETFD, 1);
                        dup2(r, STDIN_FILENO);
                        fcntl(r, F_SETFL, 0);
                        fcntl(r, F_SETFD, 1);
                        dup2(r, STDIN_FILENO);