Grrrr. Fix the htpasswd -c -n logic bug *the right way* this time. :(

PR: 9989

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

diff --git a/CHANGES b/CHANGES
index 065d6d3781b505eb4cfcd5519478a9d840269271..6c64f0f84b7be913b53ec37f549861f2b98f31b6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 Changes with Apache 2.0.40
 
+  *) Fix a silly htpasswd.c logic error that incorrectly reported that
+     both -c and -n had been used.  PR 9989  [Cliff Woolley]
+
   *) Fixed a mod_include error case in which no HTTP response was sent
      to the client if an shtml document contained an unterminated SSI
      directive [Brian Pane]

diff --git a/support/htpasswd.c b/support/htpasswd.c
index c2e374dde3faae152109339cbde2db4bd2400edf..f760d6631a26d0e572bcfb69bdefbc43c11088eb 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -375,7 +375,7 @@ static void check_args(apr_pool_t *pool, int argc, const char *const argv[],
         }
     }
 
-    if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
+    if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
         apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
         exit(ERR_SYNTAX);
     }