A pool is a REQUIRED ARGUMENT, never optional (NULL).

  This is why Mladen observed that htpasswd was still broken.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89641 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/support/htpasswd.c b/support/htpasswd.c
index bfbbcabeb18652ac1a866d5dd311f6cc7d8588a9..c34ce2bbcb04125abda35386c038edadede29c1a 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -350,12 +350,12 @@ static int writable(char *fname)
 /*
  * Return true if the named file exists, regardless of permissions.
  */
-static int exists(char *fname)
+static int exists(char *fname, apr_pool_t *pool)
 {
     apr_finfo_t sbuf;
     apr_status_t check;
 
-    check = apr_stat(&sbuf, fname, APR_FINFO_NORM, NULL);
+    check = apr_stat(&sbuf, fname, APR_FINFO_NORM, pool);
     return (check ? 0 : 1);
 }
 
@@ -532,7 +532,7 @@ int main(int argc, char *argv[])
         * Verify that the file exists if -c was omitted.  We give a special
         * message if it doesn't.
         */
-       if ((! newfile) && (! exists(pwfilename))) {
+       if ((! newfile) && (! exists(pwfilename, pool))) {
            fprintf(stderr,
                    "%s: cannot modify file %s; use '-c' to create it\n",
                    argv[0], pwfilename);