Merge branch 'master' into logging-2

CHANGELOG.md

@@ -10,7 +10,7 @@
 * allow wget download over non-80 port
 * simple JSON logging to kippo.json
 * accept log and deny publickey authentication
-* add uname -r command
+* add uname -r, -m flags
 * add working sleep command
 * enabled ssh diffie-hellman-group-exchange-sha1 algorithm
 * add 'bash -c' support (no effect option)

kippo/commands/uname.py

@@ -12,6 +12,8 @@ class command_uname(HoneyPotCommand):
                 self.honeypot.hostname)
         elif len(self.args) and self.args[0].strip() in ('-r', '--kernel-release'):
             self.writeln( '2.6.26-2-686' )
+        elif len(self.args) and self.args[0].strip() in ('-m', '--machine'):
+            self.writeln( 'i686' )
         else:
             self.writeln('Linux')