[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/cups
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2007-08-29 17:24:01
Message-ID: 1188408241.181289.31504.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 706199 by helio:

- Forward port of last cups 1.3 fixes

 M  +3 -3      ipprequest.cpp  


--- trunk/KDE/kdelibs/kdeprint/cups/ipprequest.cpp #706198:706199
@@ -308,10 +308,10 @@
 	}
 
 #ifdef HAVE_CUPS_NO_PWD_CACHE
-#ifdef CUPS_VERSION < 1.0300
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
     strncpy(  HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
 #else
-	strncpy( httpGetAuthString( HTTP ), cups_authstring.data(), HTTP_MAX_VALUE );
+    httpSetAuthString( HTTP, NULL, cups_authstring.data() );
 #endif
 #endif
 
@@ -322,7 +322,7 @@
 
 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : \
qPrintable(res)), (filename.isEmpty() ? NULL : qPrintable(filename)));  #ifdef \
                HAVE_CUPS_NO_PWD_CACHE
-#ifdef CUPS_VERSION < 1.0300
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
     cups_authstring = HTTP->authstring;
 #else
 	cups_authstring = httpGetAuthString( HTTP );


[prev in list] [next in list] [prev in thread] [next in thread]