]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Fix AUTH_UID for peer credentials.
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Mon, 2 May 2011 21:27:38 +0000 (21:27 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Mon, 2 May 2011 21:27:38 +0000 (21:27 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9733 7a7537e8-13f0-0310-91df-b6672ffda945

scheduler/ipp.c
scheduler/job.c

index fea3c06a53376c6d705f56aa99f1eca39e5ef80c..2a71d6fe95d00a0e6b31335e43dfc877ae6e776c 100644 (file)
@@ -10371,7 +10371,7 @@ save_auth_info(
   }
 
 #ifdef HAVE_GSSAPI
-  if (con->have_gss && con->gss_uid > 0)
+  if (con->gss_uid > 0)
   {
     cupsFilePrintf(fp, "%d\n", (int)con->gss_uid);
     cupsdSetStringf(&job->auth_uid, "AUTH_UID=%d", (int)con->gss_uid);
index cefd671c5737d900d7ab70ec521f3ba8f8426977..b211e0e411b08819d58eaf31f652d05dba5f675e 100644 (file)
@@ -1757,6 +1757,9 @@ cupsdLoadJob(cupsd_job_t *job)            /* I - Job */
          cupsdSetStringf(&job->auth_domain, "AUTH_DOMAIN=%s", data);
        else if (!strcmp(destptr->auth_info_required[i], "password"))
          cupsdSetStringf(&job->auth_password, "AUTH_PASSWORD=%s", data);
+        else if (!strcmp(destptr->auth_info_required[i], "negotiate") &&
+                isdigit(line[0] & 255))
+         cupsdSetStringf(&job->auth_uid, "AUTH_UID=%s", line);
       }
 
       if (cupsFileGets(fp, line, sizeof(line)) && isdigit(line[0] & 255))