diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2001-07-20 21:13:44 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2001-07-20 21:13:44 +0200 |
| commit | 1adf783132189539274ebf5a45a41026999a17a4 (patch) | |
| tree | c307bced2ae0db423b18db8fad4cbe1fd822881b /support/htpasswd.c | |
| parent | Get ONE_PROCESS working again for beos. (diff) | |
| download | apache2-1adf783132189539274ebf5a45a41026999a17a4.tar.xz apache2-1adf783132189539274ebf5a45a41026999a17a4.zip | |
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
Diffstat (limited to 'support/htpasswd.c')
| -rw-r--r-- | support/htpasswd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/support/htpasswd.c b/support/htpasswd.c index bfbbcabeb1..c34ce2bbcb 100644 --- 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); |