From a46be915f1b54f5b49a06413a04286dfe9e9f68d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 23 Jan 2016 13:38:40 +0000
Subject: [PATCH] document and add new server info queries

---
 README.md      | 3 +++
 whois/query.go | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d0bbf1f..2ee21b9 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,9 @@ it run as user nobody, who cannot bind to port 43 itself.
 - as-set: `$ whois -h <server> 4242420000_4242423999`
 - as-block: `$ whois -h <server> AS-FREIFUNK`
 - route-set: `$ whois -h <server> RS-DN42-NATIVE`
+- version: `$ whois -h <server> -q version`
+- sources: `$ whois -h <server> -q sources`
+- types: `$ whois -h <server> -q types`
 
 
 ## TODO
diff --git a/whois/query.go b/whois/query.go
index 61caaef..ff5ae12 100644
--- a/whois/query.go
+++ b/whois/query.go
@@ -84,7 +84,7 @@ func (r *Registry) HandleQuery(conn *net.TCPConn) {
 
 	flags := query.Flags
 	if flags.ServerInfo != "" {
-		r.printServerInfo(conn, flags.ServerInfo)
+		r.printServerInfo(conn, strings.TrimSpace(flags.ServerInfo))
 		return
 	}
 	found := false
@@ -187,7 +187,7 @@ func (r *Registry) printServerInfo(conn *net.TCPConn, what string) {
 			fmt.Fprintf(conn, "%s\n", t.Name)
 		}
 	default:
-		fmt.Fprintf(conn, "% unknown option %s\n", what)
+		fmt.Fprintf(conn, "%% unknown option %s\n", what)
 	}
 }