--- a/commands/vchforwards.cc	Sun Jan 20 00:12:17 2008 +0100
+++ b/commands/vchforwards.cc	Sun Jan 20 00:22:09 2008 +0100
@@ -18,15 +18,14 @@
 #include "fdbuf/fdbuf.h"
 #include "mystring/mystring.h"
 #include "config/configrc.h"
-#include "cli/cli.h"
+#include "cli++/cli++.h"
 #include "vcommand.h"
 
 const char* cli_program = "vchforwards";
 const char* cli_help_prefix =
 "Change virtual user forwarding addresses.\n";
 const char* cli_help_suffix =
-"If no forwarding addresses are given, forwarding is disabled.
-";
+"If no forwarding addresses are given, forwarding is disabled.\n";
 const char* cli_args_usage = "USERNAME [DESTINATION1 ...]";
 const int cli_args_min = 1;
 const int cli_args_max = -1;
@@ -54,7 +53,7 @@
   mystring username = argv[0];
   username = username.lower();
   
-  vpwentry* vpw = domain.lookup(username, false);
+  vpwentry* vpw = domain.lookup(username);
   if(!vpw) {
     if(!o_quiet)
       ferr << "vchforwards: User '" << username << "' does not exist." << endl;