lib-smtp: smtp-server - Make default command functions public.

diff --git a/src/lib-smtp/smtp-server-private.h b/src/lib-smtp/smtp-server-private.h
index 54edb6bedad14e7621cf8fed536c81a152e07743..e4fe4f4adad845872ae6d18d3e3184e3208a9cf5 100644 (file)
--- a/src/lib-smtp/smtp-server-private.h
+++ b/src/lib-smtp/smtp-server-private.h
@@ -278,26 +278,6 @@ smtp_server_command_is_complete(struct smtp_server_command *cmd)
                !smtp_server_connection_pending_command_data(conn));
 }
 
-void smtp_server_cmd_ehlo(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_helo(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_xclient(struct smtp_server_cmd_ctx *cmd,
-                            const char *params);
-
-void smtp_server_cmd_starttls(struct smtp_server_cmd_ctx *cmd,
-                             const char *params);
-void smtp_server_cmd_auth(struct smtp_server_cmd_ctx *cmd, const char *params);
-
-void smtp_server_cmd_mail(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_rcpt(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_data(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_bdat(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_rset(struct smtp_server_cmd_ctx *cmd, const char *params);
-
-void smtp_server_cmd_noop(struct smtp_server_cmd_ctx *cmd, const char *params);
-void smtp_server_cmd_vrfy(struct smtp_server_cmd_ctx *cmd, const char *params);
-
-void smtp_server_cmd_quit(struct smtp_server_cmd_ctx *cmd, const char *params);
-
 /*
  * Connection
  */

diff --git a/src/lib-smtp/smtp-server.h b/src/lib-smtp/smtp-server.h
index e6291f9a037d74dae832a8b7ff2d37521e091426..f3f1b5ef08cbdfd61381dc05d7e9f48c394f4707 100644 (file)
--- a/src/lib-smtp/smtp-server.h
+++ b/src/lib-smtp/smtp-server.h
@@ -627,12 +627,22 @@ void smtp_server_command_input_capture(
 
 /* EHLO */
 
+void smtp_server_cmd_ehlo(struct smtp_server_cmd_ctx *cmd, const char *params);
+void smtp_server_cmd_helo(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 struct smtp_server_reply *
 smtp_server_cmd_ehlo_reply_create(struct smtp_server_cmd_ctx *cmd);
 void smtp_server_cmd_ehlo_reply_default(struct smtp_server_cmd_ctx *cmd);
 
+/* STARTTLS */
+
+void smtp_server_cmd_starttls(struct smtp_server_cmd_ctx *cmd,
+                             const char *params);
+
 /* AUTH */
 
+void smtp_server_cmd_auth(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 void smtp_server_cmd_auth_send_challenge(struct smtp_server_cmd_ctx *cmd,
                                         const char *challenge);
 void smtp_server_cmd_auth_success(struct smtp_server_cmd_ctx *cmd,
@@ -641,29 +651,51 @@ void smtp_server_cmd_auth_success(struct smtp_server_cmd_ctx *cmd,
 
 /* MAIL */
 
+void smtp_server_cmd_mail(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 void smtp_server_cmd_mail_reply_success(struct smtp_server_cmd_ctx *cmd);
 
 /* RCPT */
 
+void smtp_server_cmd_rcpt(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 bool smtp_server_command_is_rcpt(struct smtp_server_cmd_ctx *cmd);
 void smtp_server_cmd_rcpt_reply_success(struct smtp_server_cmd_ctx *cmd);
 
 /* RSET */
 
+void smtp_server_cmd_rset(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 void smtp_server_cmd_rset_reply_success(struct smtp_server_cmd_ctx *cmd);
 
 /* DATA */
 
+void smtp_server_cmd_data(struct smtp_server_cmd_ctx *cmd, const char *params);
+void smtp_server_cmd_bdat(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 bool smtp_server_cmd_data_check_size(struct smtp_server_cmd_ctx *cmd);
 
 /* VRFY */
 
+void smtp_server_cmd_vrfy(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 void smtp_server_cmd_vrfy_reply_default(struct smtp_server_cmd_ctx *cmd);
 
 /* NOOP */
 
+void smtp_server_cmd_noop(struct smtp_server_cmd_ctx *cmd, const char *params);
+
 void smtp_server_cmd_noop_reply_success(struct smtp_server_cmd_ctx *cmd);
 
+/* QUIT */
+
+void smtp_server_cmd_quit(struct smtp_server_cmd_ctx *cmd, const char *params);
+
+/* XCLIENT */
+
+void smtp_server_cmd_xclient(struct smtp_server_cmd_ctx *cmd,
+                            const char *params);
+
 /*
  * Reply
  */