← Back to branch summary

~ubuntu-branches/ubuntu/feisty/apache2/feisty

« back to all changes in this revision

Viewing changes to debian/patches/042_htdigest_CAN-2005-1344

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Barth
  • Date: 2006-12-09 21:05:45 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061209210545-h70s0xaqc2v8vqr2
Tags: 2.2.3-3.2
http://bugs.debian.org/396265
* Non-maintainer upload.
* 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
  issue with regard to connection reuse in mod_proxy_ajp.
  Closes: #396265

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/042_htdigest_CAN-2005-1344
1
 
--- build-tree/apache2/support/htdigest.c.orig  2005-05-05 02:54:31.000000000 -0600
2
 
+++ build-tree/apache2/support/htdigest.c       2005-05-05 02:59:05.000000000 -0600
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 042_htdigest_CAN-2005-1344 by Adam Conrad <adconrad@0c3.net>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Fix buffer overflow in htdigest.
 
6
 
 
7
@DPATCH@
 
8
--- apache2/support/htdigest.c.orig     2005-05-05 02:54:31.000000000 -0600
 
9
+++ apache2/support/htdigest.c  2005-05-05 02:59:05.000000000 -0600
3
10
@@ -222,9 +222,11 @@
4
11
                     apr_strerror(rv, errmsg, sizeof errmsg));
5
12
             exit(1);
6
13
         }
7
14
+       apr_cpystrn(user, argv[4], sizeof(user));
8
15
+       apr_cpystrn(realm, argv[3], sizeof(realm));
9
 
         apr_file_printf(errfile, "Adding password for %s in realm %s.\n", 
 
16
         apr_file_printf(errfile, "Adding password for %s in realm %s.\n",
10
17
-                    argv[4], argv[3]);
11
18
-        add_password(argv[4], argv[3], f);
12
19
+                    user, realm);