iptadmin 1.3.2 → 1.3.3

raw patch · 3 files changed

+10/−10 lines, 3 filesdep ~happstack-server-tlsdep ~iptables-helpers

Dependency ranges changed: happstack-server-tls, iptables-helpers

Files

• iptadmin.cabal +4/−4
• src/IptAdmin/EditChainForm/Parse.hs +2/−3
• src/Main.hs +4/−3

@@ -1,5 +1,5 @@ Name:           iptadmin-Version:        1.3.2+Version:        1.3.3 Cabal-Version:  >= 1.4 Author:         Evgeny Tarasov Build-type:     Simple@@ -7,7 +7,7 @@ License:        BSD3 License-file:   LICENSE Maintainer:     etarasov.ekb@gmail.com-HomePage:       http://iptadmin.confmgr.org+HomePage:       http://iptadmin.117.su Stability:      Stable Synopsis:       web-interface for iptables Description:    web-interface for iptables with PAM authorization@@ -47,10 +47,10 @@                     utf8-string >= 0.3,                     bytestring >= 0.9,                     happstack-server >= 7.0.5 && < 7.1,-                    happstack-server-tls >= 7.0 && < 7.1,+                    happstack-server-tls >= 7.0.2 && < 7.1,                     mtl >= 1.1,                     safe >= 0.3,-                    iptables-helpers >= 0.4 && < 0.5,+                    iptables-helpers >= 0.4.2 && < 0.5,                     process >= 1.0 && < 2,                     blaze-html >= 0.5,                     blaze-markup >= 0.5 && < 0.6,

@@ -3,16 +3,15 @@  import Control.Monad import Data.Char+import Iptables.Parser import Text.ParserCombinators.Parsec.Char import Text.ParserCombinators.Parsec.Combinator import Text.ParserCombinators.Parsec.Prim hiding (State(..)) --- let's assume that chain names can contain only letters and digits--- it's not mentioned in iptables man page parseChainName :: GenParser Char () String parseChainName = do     spaces <?> ""-    name <- many1 $ oneOf (['A'..'Z'] ++ ['a'..'z'] ++ ['0'..'9']) `label` "latin letter of digit"+    name <- chainNameParser `label` "latin letter, digit, '_' or '-'"     when (all isUpper name) $         fail "Uppercase letters only is prohibited for chain name"     spaces

@@ -49,10 +49,11 @@             putStrLn $ "Iptadmin v" ++ ver ++ ", (C) Evgeny Tarasov 2011"             exitSuccess         ("--help":_) -> do-            putStrLn $ "usage: \niptadmin [--no-daemon] (start|stop|restart)\niptadmin --help | --version"+            putStrLn $ "usage: \niptadmin [--no-daemon] (start|stop)\niptadmin --help | --version"             exitSuccess-	["--no-daemon"] -> return ()-        [] -> return ()+        ["--no-daemon"] -> return ()+        ["start"] -> return ()+        ["stop"] -> return ()         a -> do             putStrLn $ "Unrecognized options: " ++ show a             exitFailure