Attachment 159588 Details for Bug 248717 – kdelibs-cups13.patch

[patch] kdelibs-cups13.patch

kdelibs-cups13.patch (text/plain), 2.71 KB, created by Tim Waugh on 2007-07-19 14:59:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Waugh

Created: 2007-07-19 14:59:14 UTC

Size: 2.71 KB

patch

obsolete

>--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2007-07-18 14:50:28.000000000 +0100
>+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-18 15:34:00.000000000 +0100
>@@ -108,7 +108,8 @@
>       * See if we should retry the current digest password...
>       */
> 
>-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
>+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
>+		  "Basic", 5) == 0 ||
>           digest_tries > 1 || !pwdstring[0])
>       {
>        /*
>@@ -116,7 +117,7 @@
> 	*/
> 
> 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
>-        	 cups_server->hostname);
>+        	 cupsServer());
> 
>         if ((password = cupsGetPassword(prompt)) == NULL)
> 	  break;
>@@ -135,7 +136,8 @@
>       * Got a password; encode it for the server...
>       */
> 
>-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
>+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
>+		  "Basic", 5) == 0)
>       {
>        /*
> 	* Basic authentication...
>@@ -334,7 +336,8 @@
>       * See if we should retry the current digest password...
>       */
> 
>-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
>+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
>+		  "Basic", 5) == 0 ||
>           digest_tries > 1 || !pwdstring[0])
>       {
>        /*
>@@ -342,7 +345,7 @@
> 	*/
> 
> 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
>-        	 cups_server->hostname);
>+        	 cupsServer());
> 
>         if ((password = cupsGetPassword(prompt)) == NULL)
> 	  break;
>@@ -361,7 +364,8 @@
>       * Got a password; encode it for the server...
>       */
> 
>-      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
>+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
>+		  "Basic", 5) == 0)
>       {
>        /*
> 	* Basic authentication...
>--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-07-19 15:51:14.000000000 +0100
>+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:57:49.000000000 +0100
>@@ -309,7 +309,8 @@
> 		return false;
> 	}
> 
>-#ifdef HAVE_CUPS_NO_PWD_CACHE
>+#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
>+    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
> 	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
> #endif
> 
>@@ -319,7 +320,8 @@
> 	}
> 
> 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
>-#ifdef HAVE_CUPS_NO_PWD_CACHE
>+#ifdef HAVE_CUPS_NO_PWD_CACHE && \
>+    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
> 	cups_authstring = HTTP->authstring;
> #endif
> 	httpClose(HTTP);

Actions: View | Diff

Attachments on bug 248717: 159522 | 159525 | 159588