1 files changed, 9 insertions, 4 deletions

diff --git a/validatecert.hs b/validatecert.hs
index 19df9fc..efbf84a 100644
--- a/validatecert.hs
+++ b/validatecert.hs
@@ -54,7 +54,7 @@ parseHeader first_line = parseHeaderWords $ S.words first_line
     parseHeaderWords (channelId:_)
         = Left $ channelId <> " BH message=\"Insufficient words in message.\"\1"
     parseHeaderWords []
-        = Left $ "what: " <> bshow first_line <> "\n"
+        = Left ""
 
 data ValidationError = ValidationError
     { veName :: S.ByteString
@@ -70,10 +70,13 @@ pemToCert pem = either (const Nothing) Just $ decodeSignedObject obj
     obj = foldl1' (<>) $ L.toChunks $ pemBlob pem
 
 certSubject :: Cert -> S.ByteString
-certSubject cert = maybe "" X509.getCharacterStringRawData cn
+certSubject cert = maybe "" X509.getCharacterStringRawData
+                    $ foldr1 mplus [cn,ou,o]
  where
     dn = X509.certSubjectDN $ X509.getCertificate cert
     cn = X509.getDnElement X509.DnCommonName dn
+    ou = X509.getDnElement X509.DnOrganizationUnit dn
+    o  = X509.getDnElement X509.DnOrganization dn
 
 data ValidationRequest = ValidationRequest
     { vrHostname :: S.ByteString
@@ -99,7 +102,8 @@ main = do
         continue e $ \first_line -> do
         when (S.all isSpace first_line)
              next
-        let wlog' s | debug     = wlog s
+        let wlog' s | S.null s  = return ()
+                    | debug     = wlog s
                     | otherwise = return ()
         flip (either wlog') (parseHeader first_line) $ \(channelId,code,bodylen,body0) -> do
         when debug $ wlog $ "GOT " <> "Code=" <> code <> " " <> bshow bodylen <> "\n"
@@ -125,7 +129,8 @@ main = do
                         else channelId <> " ERR " <> len <> " " <> response0 <> "\1"
         S.putStr response
         hFlush stdout
-        when debug $ wlog $ ">> " <> S.init response <> "\n"
+        when debug $ forM_ (S.lines $ S.init response) $ \msg -> do
+            wlog $ ">> " <> msg <> "\n"
         next
 
 createResponse :: ValidationRequest -> Map S.ByteString ValidationError -> S.ByteString