[freeside-commits] branch FREESIDE_3_BRANCH updated. 782c9989fba6332e28f25187da8d623bddaab466

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  782c9989fba6332e28f25187da8d623bddaab466 (commit)
      from  495d70ed4f160e6c7ef4e9adce066bcbbc85bfef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 782c9989fba6332e28f25187da8d623bddaab466
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Nov 8 11:31:49 2018 -0800

    better debugging for htpasswd failure, RT#78179

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index 9f4c34ddb..70cef4a6a 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -149,7 +149,16 @@ sub htpasswd_kludge {
   {
     return '';
   } else {
-    return 'htpasswd exited unsucessfully';
+
+    if ($? == -1) {
+      return "htpasswd failed to execute: $!";
+    } elsif ($? & 127) {
+      return sprintf("htpasswd died with signal %d, %s coredump",
+                     ($? & 127),  ($? & 128) ? 'with' : 'without' );
+    } else {
+      return sprintf("htpasswd exited with value %d", $? >> 8 );
+    }
+
   }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/access_user.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)