Merge branch 'devel-2.7'

[ganeti-local] / lib / http / auth.py

diff --git a/lib/http/auth.py b/lib/http/auth.py
index 1e33f2c..5dec95b 100644 (file)
--- a/lib/http/auth.py
+++ b/lib/http/auth.py
@@ -310,6 +310,8 @@ def ParsePasswordFile(contents):
     parts = line.split(None, 2)
     if len(parts) < 2:
       # Invalid line
+      # TODO: Return line number from FilterEmptyLinesAndComments
+      logging.warning("Ignoring non-comment line with less than two fields")
       continue
 
     name = parts[0]
@@ -320,6 +322,8 @@ def ParsePasswordFile(contents):
     if len(parts) >= 3:
       for part in parts[2].split(","):
         options.append(part.strip())
+    else:
+      logging.warning("Ignoring values for user '%s': %s", name, parts[3:])
 
     users[name] = PasswordFileUser(name, password, options)