Commit da0f4bd2 authored by Joe Orton's avatar Joe Orton
Browse files

* support/htpasswd.c (main): Only check for readability if running in 

  verify (-v) mode.

PR: 61631


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) htpasswd: Don't fail in -v mode if password file is unwritable.

     PR 61631.  [Joe Orton]



  *) core: A signal received while stopping could have crashed the main

     process.  PR 61558.  [Yann Ylavic]

support/htpasswd.c

+11 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ int main(int argc, const char * const argv[]) 
     */

    if (!(mask & APHTP_NOFILE)) {

        existing_file = exists(pwfilename, pool);

        if (existing_file) {

        if (existing_file && (mask & APHTP_VERIFY) == 0) {

            /*

             * Check that this existing file is readable and writable.

             */
@@ -339,6 +339,16 @@ int main(int argc, const char * const argv[]) 
                exit(ERR_FILEPERM);

            }

        }

        else if (existing_file && (mask & APHTP_VERIFY) != 0) {

            /*

             * Check that this existing file is readable.

             */

            if (!accessible(pool, pwfilename, APR_FOPEN_READ)) {

                apr_file_printf(errfile, "%s: cannot open file %s for "

                                "read access" NL, argv[0], pwfilename);

                exit(ERR_FILEPERM);

            }

        }

        else {

            /*

             * Error out if -c was omitted for this non-existant file.