From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 12 Feb 2014 16:15:46 +0000 (+0000)
Subject: Correctly log the connected client from a domain socket.
X-Git-Tag: v2.2b1~762
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e4dcdb951af51e65094deaaee65c1863aed4f92;p=thirdparty%2Fcups.git

Correctly log the connected client from a domain socket.

Update the comment in the launchd plist to avoid a BBEdit syntax coloring bug.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11581 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/scheduler/client.c b/scheduler/client.c
index eac78f3cbe..743df7bc5a 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -274,17 +274,17 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
     char	peername[256];		/* Name of process */
 
     peersize = sizeof(peerpid);
-    if (!getsockopt(con->number, SOL_LOCAL, LOCAL_PEERPID, &peerpid,
+    if (!getsockopt(httpGetFd(con->http), SOL_LOCAL, LOCAL_PEERPID, &peerpid,
                     &peersize))
     {
-      if (!proc_name(peerpid, peername, sizeof(peername)))
+      if (!proc_name((int)peerpid, peername, sizeof(peername)))
 	cupsdLogClient(con, CUPSD_LOG_DEBUG,
 	               "Accepted from %s (Domain ???[%d])",
                        httpGetHostname(con->http, NULL, 0), (int)peerpid);
       else
 	cupsdLogClient(con, CUPSD_LOG_DEBUG,
                        "Accepted from %s (Domain %s[%d])",
-                       httpGetHostname(con->http, NULL, 0), name, (int)peerpid);
+                       httpGetHostname(con->http, NULL, 0), peername, (int)peerpid);
     }
     else
 #  endif /* __APPLE__ */
diff --git a/scheduler/org.cups.cupsd.plist b/scheduler/org.cups.cupsd.plist
index 2529f62e56..7a5e0fd011 100644
--- a/scheduler/org.cups.cupsd.plist
+++ b/scheduler/org.cups.cupsd.plist
@@ -21,8 +21,7 @@
 		<string>/usr/sbin/cupsd</string>
 		<string>-l</string>
 	</array>
-	<!-- These environment variables are only used when CUPS is compiled
-	     with --enable-debug-printfs -->
+	<!-- These environment variables are only used when CUPS is compiled with debug-printfs support -->
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>CUPS_DEBUG_LOG</key>