Attachment 1905569 Details for Bug 2118294 – patch v2

[patch] patch v2

1.diff (text/plain), 1.23 KB, created by Mikhail Novosyolov on 2022-08-15 12:57:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Novosyolov

Created: 2022-08-15 12:57:58 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/scheduler/client.c b/scheduler/client.c
>index 37626e3f5..4e0f4e97d 100644
>--- a/scheduler/client.c
>+++ b/scheduler/client.c
>@@ -2007,9 +2007,9 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
> 	  }
> 
> #ifdef WITH_LSPP
>-	  if (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
>+	  if ( (con->file > 0) && (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) )
> 	  {
>-	    if (getfilecon(con->filename, &spoolcon) == -1)
>+	    if (fgetfilecon(con->file, &spoolcon) == -1)
> 	    {
> 	      cupsdSendError(con, HTTP_STATUS_SERVER_ERROR, CUPSD_AUTH_NONE);
> 	      cupsdCloseClient(con);
>diff --git a/scheduler/job.c b/scheduler/job.c
>index 4c9486082..c96329804 100644
>--- a/scheduler/job.c
>+++ b/scheduler/job.c
>@@ -2386,9 +2386,9 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - Job */
>   fchown(cupsFileNumber(fp), RunUser, Group);
> 
> #ifdef WITH_LSPP
>-  if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
>+  if ((fp > 0) && job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
>   {
>-    if (getfilecon(filename, &spoolcon) == -1)
>+    if (fgetfilecon(fp, &spoolcon) == -1)
>     {
>       cupsdLogJob(job, CUPSD_LOG_ERROR,
> 		  "Unable to get context of job control file \"%s\" - %s.",

Actions: View | Diff

Attachments on bug 2118294: 1905562 | 1905569 | 1905611