57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13 2006-10-01 12:33:43.000000000 -0500
|
|
+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-07-19 06:52:21.000000000 -0500
|
|
@@ -108,7 +108,7 @@ cupsGetConf(void)
|
|
* 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 +116,7 @@ cupsGetConf(void)
|
|
*/
|
|
|
|
snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
|
- cups_server->hostname);
|
|
+ cupsServer());
|
|
|
|
if ((password = cupsGetPassword(prompt)) == NULL)
|
|
break;
|
|
@@ -135,7 +135,7 @@ cupsGetConf(void)
|
|
* 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 +334,7 @@ cupsPutConf(const char *name) /* I - Na
|
|
* 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 +342,7 @@ cupsPutConf(const char *name) /* I - Na
|
|
*/
|
|
|
|
snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
|
- cups_server->hostname);
|
|
+ cupsServer());
|
|
|
|
if ((password = cupsGetPassword(prompt)) == NULL)
|
|
break;
|
|
@@ -361,7 +361,7 @@ cupsPutConf(const char *name) /* I - Na
|
|
* 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...
|