Fix pop3d command parser (complement afda9ba4)

* pop3d/cmd.c (command_table_head): Remove.  Use command_table
instead.  All uses changed.
* pop3d/stls.c (pop3d_stls): Fail if TLS is not requested.

@@ -20,8 +20,6 @@ struct mu_tls_config global_tls_conf;
 
 
 static struct pop3d_command command_table[] = {
 static struct pop3d_command command_table[] = {
   { "STLS", pop3d_stls },
   { "STLS", pop3d_stls },
-#define COMMAND_TABLE_STLS 0
-#define COMMAND_TABLE_PLAIN 1
   { "RETR", pop3d_retr },
   { "RETR", pop3d_retr },
   { "DELE", pop3d_dele },
   { "DELE", pop3d_dele },
   { "USER", pop3d_user },
   { "USER", pop3d_user },
@@ -38,13 +36,11 @@ static struct pop3d_command command_table[] = {
   { NULL }
   { NULL }
 };
 };
 
 
-static struct pop3d_command *command_table_head;
-
 pop3d_command_handler_t
 pop3d_command_handler_t
 pop3d_find_command (const char *name)
 pop3d_find_command (const char *name)
 {
 {
   struct pop3d_command *p;
   struct pop3d_command *p;
-  for (p = command_table_head; p->name; p++)
+  for (p = command_table; p->name; p++)
     {
     {
       if (mu_c_strcasecmp (name, p->name) == 0)
       if (mu_c_strcasecmp (name, p->name) == 0)
 	return p->handler;
 	return p->handler;
@@ -137,11 +133,6 @@ stls_preflight (mu_m_server_t msrv)
   if (errors)
   if (errors)
     return 1;
     return 1;
 
 
-  if (tls_requested)
-    command_table_head = command_table + COMMAND_TABLE_STLS;
-  else
-    command_table_head = command_table + COMMAND_TABLE_PLAIN;
-  
   return 0;
   return 0;
 }
 }
 
 

@@ -22,6 +22,9 @@
 int
 int
 pop3d_stls (char *arg, struct pop3d_session *session)
 pop3d_stls (char *arg, struct pop3d_session *session)
 {
 {
+  if (session->tls_mode == tls_no)
+    return ERR_BAD_CMD;
+      
   if (strlen (arg) != 0)
   if (strlen (arg) != 0)
     return ERR_BAD_ARGS;
     return ERR_BAD_ARGS;