lib-lda: Renamed smtp-client to smtp-submit (1/2).

Renamed the files.

diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am
index 54cad69036e3b6f2fc15dbe8f3379dbbaa4d9c10..3a298e870d14a394b3101d20f1c1bb5dcbbafce3 100644 (file)
--- a/src/lib-lda/Makefile.am
+++ b/src/lib-lda/Makefile.am
@@ -19,14 +19,14 @@ liblda_la_SOURCES = \
        lda-settings.c \
        mail-deliver.c \
        mail-send.c \
-       smtp-client.c
+       smtp-submit.c
 
 headers = \
        duplicate.h \
        lda-settings.h \
        mail-deliver.h \
        mail-send.h \
-       smtp-client.h
+       smtp-submit.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
@@ -42,7 +42,7 @@ libdovecot_lda_la_LDFLAGS = -export-dynamic
 test_programs =
 
 test_nocheck_programs = \
-       test-smtp-client
+       test-smtp-submit
 
 noinst_PROGRAMS = $(test_programs) $(test_nocheck_programs)
 
@@ -71,10 +71,10 @@ test_deps = \
        ../lib-test/libtest.la \
        ../lib/liblib.la
 
-test_smtp_client_SOURCES = test-smtp-client.c
-test_smtp_client_LDFLAGS = -export-dynamic
-test_smtp_client_LDADD = $(test_libs)
-test_smtp_client_DEPENDENCIES = $(test_deps)
+test_smtp_submit_SOURCES = test-smtp-submit.c
+test_smtp_submit_LDFLAGS = -export-dynamic
+test_smtp_submit_LDADD = $(test_libs)
+test_smtp_submit_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
 check-test: all-am

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index c0622097a7afcb9c857815f0d917a2ebac73fb4a..9753c78ee583dd98991b0189da3e71bcab1c87b9 100644 (file)
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -15,7 +15,7 @@
 #include "mail-storage-settings.h"
 #include "lda-settings.h"
 #include "mail-deliver.h"
-#include "smtp-client.h"
+#include "smtp-submit.h"
 #include "mail-send.h"
 
 #include <sys/wait.h>

diff --git a/src/lib-lda/smtp-client.h b/src/lib-lda/smtp-client.h
index 585bb2276c8402d20a6ff9497a48d481c73028ca..2f40c075d17c3cac206b81b10e95f984eaed9f35 100644 (file)
--- a/src/lib-lda/smtp-client.h
+++ b/src/lib-lda/smtp-client.h
@@ -1,18 +1 @@
-#ifndef SMTP_CLIENT_H
-#define SMTP_CLIENT_H
-
-struct smtp_client * ATTR_NULL(3)
-smtp_client_init(const struct lda_settings *set, const char *return_path);
-/* Add a new recipient */
-void smtp_client_add_rcpt(struct smtp_client *client, const char *address);
-/* Get an output stream where the message can be written to. The recipients
-   must already be added before calling this. */
-struct ostream *smtp_client_send(struct smtp_client *client);
-void smtp_client_abort(struct smtp_client **client);
-/* Returns 1 on success, 0 on permanent failure (e.g. invalid destination),
-   -1 on temporary failure. */
-int smtp_client_deinit(struct smtp_client *client, const char **error_r);
-/* Same as smtp_client_deinit(), but timeout after given number of seconds. */
-int smtp_client_deinit_timeout(struct smtp_client *client,
-                              unsigned int timeout_secs, const char **error_r);
-#endif
+#include "smtp-submit.h"

diff --git a/src/lib-lda/smtp-client.c b/src/lib-lda/smtp-submit.c
similarity index 99%
rename from src/lib-lda/smtp-client.c
rename to src/lib-lda/smtp-submit.c
index b1e83f3629b042644a9d1157426c962eae98ddee..538fe2ee022fd8586977204113127003ea90dc36 100644 (file)
--- a/src/lib-lda/smtp-client.c
+++ b/src/lib-lda/smtp-submit.c
@@ -12,7 +12,7 @@
 #include "lda-settings.h"
 #include "mail-deliver.h"
 #include "program-client.h"
-#include "smtp-client.h"
+#include "smtp-submit.h"
 
 #include <unistd.h>
 #include <sys/wait.h>

diff --git a/src/lib-lda/smtp-submit.h b/src/lib-lda/smtp-submit.h
new file mode 100644 (file)
index 0000000..585bb22
--- /dev/null
+++ b/src/lib-lda/smtp-submit.h
@@ -0,0 +1,18 @@
+#ifndef SMTP_CLIENT_H
+#define SMTP_CLIENT_H
+
+struct smtp_client * ATTR_NULL(3)
+smtp_client_init(const struct lda_settings *set, const char *return_path);
+/* Add a new recipient */
+void smtp_client_add_rcpt(struct smtp_client *client, const char *address);
+/* Get an output stream where the message can be written to. The recipients
+   must already be added before calling this. */
+struct ostream *smtp_client_send(struct smtp_client *client);
+void smtp_client_abort(struct smtp_client **client);
+/* Returns 1 on success, 0 on permanent failure (e.g. invalid destination),
+   -1 on temporary failure. */
+int smtp_client_deinit(struct smtp_client *client, const char **error_r);
+/* Same as smtp_client_deinit(), but timeout after given number of seconds. */
+int smtp_client_deinit_timeout(struct smtp_client *client,
+                              unsigned int timeout_secs, const char **error_r);
+#endif

diff --git a/src/lib-lda/test-smtp-client.c b/src/lib-lda/test-smtp-submit.c
similarity index 99%
rename from src/lib-lda/test-smtp-client.c
rename to src/lib-lda/test-smtp-submit.c
index bb8f176bda76d15dcb6f02d99f43c06cdedf0339..46c93a8ae9a38a4138f07a2d057cb551c2fa6ea7 100644 (file)
--- a/src/lib-lda/test-smtp-client.c
+++ b/src/lib-lda/test-smtp-submit.c
@@ -16,7 +16,7 @@
 #include "istream-dot.h"
 #include "test-common.h"
 #include "lda-settings.h"
-#include "smtp-client.h"
+#include "smtp-submit.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>