Updated config.guess, config.sub, install.sh.

[wget] / src / http-ntlm.c

diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 5ca8e85c11317ea39515a6945570c8b860daac34..fbba2c61e5d6d3a93edf2eabc1466843fbad73cc 100644 (file)
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -1,5 +1,5 @@
 /* NTLM code.
 /* NTLM code.

-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

    Contributed by Daniel Stenberg.
 
 This file is part of GNU Wget.
    Contributed by Daniel Stenberg.
 
 This file is part of GNU Wget.


@@ -17,17 +17,18 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
 You should have received a copy of the GNU General Public License
 along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 

-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+Additional permission under GNU GPL version 3 section 7

 
 

-#include <config.h>
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
+
+#include "wget.h"

 
 /* NTLM details:
    
 
 /* NTLM details:
    


@@ -44,7 +45,6 @@ so, delete this exception statement from your version.  */
 #include <openssl/md4.h>
 #include <openssl/opensslv.h>
 
 #include <openssl/md4.h>
 #include <openssl/opensslv.h>
 

-#include "wget.h"

 #include "utils.h"
 #include "http-ntlm.h"
 
 #include "utils.h"
 #include "http-ntlm.h"
 


@@ -526,7 +526,7 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
 
     /* Make sure that the user and domain strings fit in the target buffer
        before we copy them there. */
 
     /* Make sure that the user and domain strings fit in the target buffer
        before we copy them there. */

-    if(size + userlen + domlen >= sizeof(ntlmbuf))
+    if(((size_t) size + userlen + domlen) >= sizeof(ntlmbuf))

       return NULL;
     
     memcpy(&ntlmbuf[size], domain, domlen);
       return NULL;
     
     memcpy(&ntlmbuf[size], domain, domlen);