Merge changes from r6781 to r6792 (CUPS 1.3.0)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@405 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 9 insertions, 0 deletions

diff --git a/backend/socket.c b/backend/socket.c
index 68f9a29c5..06790d96c 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -432,6 +432,7 @@ side_cb(int print_fd,			/* I - Print file */
   cups_sc_status_t	status;		/* Request/response status */
   char			data[2048];	/* Request/response data */
   int			datalen;	/* Request/response data size */
+  const char		*device_id;	/* 1284DEVICEID env var */
 
 
   datalen = sizeof(data);
@@ -462,6 +463,14 @@ side_cb(int print_fd,			/* I - Print file */
         datalen = 1;
         break;
 
+    case CUPS_SC_CMD_GET_DEVICE_ID :
+        if ((device_id = getenv("1284DEVICEID")) != NULL)
+	{
+	  strlcpy(data, device_id, sizeof(data));
+	  datalen = (int)strlen(data);
+	  break;
+	}
+
     default :
         status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
 	datalen = 0;