Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

backend: fixed bad merge

  • Loading branch information...
commit bad4f6ee93619106bfc5f221262714e3980acfb2 1 parent 866d43f
@AlexanderS AlexanderS authored
Showing with 3 additions and 13 deletions.
  1. +3 −13 src/Backend.hs
View
16 src/Backend.hs
@@ -30,23 +30,13 @@ isFingerprintOk db host port fp = do
getFingerprints :: SQLiteHandle -> String -> Int -> IO [Fingerprint]
getFingerprints db host port = withOpenSSL $ do
fps <- Database.findFingerprints db host port
-<<<<<<< HEAD
- if null fps then do
- qfp <- queryFingerprint host port
- Database.insert db host port qfp
- return [qfp]
- else
- return fps
-=======
- if not $ elem fp fps
+ if null fps
then do
qfp <- queryFingerprint host port
Database.insert db host port qfp
- return $ fp == qfp
+ return [qfp]
else
- return True
-
->>>>>>> a54f098ff0c48fd82e5b5cf6707a0027315faccd
+ return fps
-- | starts a SSL connection to a host on port 443 and gives his fingerprint back
queryFingerprint :: String -> Int -> IO Fingerprint
Please sign in to comment.
Something went wrong with that request. Please try again.