From 9a03c651b1ceb166c95cb49e542d42e0a9d30f10 Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <steffen@sdaoden.eu>
Date: Wed, 11 Jan 2017 15:44:29 +0100
Subject: [PATCH] Some obsolete things

---
 nail.h      | 2 +-
 sendout.c   | 1 +
 urlcrecry.c | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nail.h b/nail.h
index 635beb3f..85eb5e87 100644
--- a/nail.h
+++ b/nail.h
@@ -1477,7 +1477,7 @@ enum okeys {
 
    ok_v__account_name,                 /* {nolopts=1,rdonly=1,nodel=1} */
    ok_b_add_file_recipients,
-   ok_v_agent_shell_lookup,
+ok_v_agent_shell_lookup,
    ok_b_allnet,
    ok_b_append,
    ok_b_ask,
diff --git a/sendout.c b/sendout.c
index 5594ba3b..08df3a2e 100644
--- a/sendout.c
+++ b/sendout.c
@@ -1194,6 +1194,7 @@ __mta_start(struct sendbundle *sbp)
    bool_t rv;
    NYD_ENTER;
 
+   /* Let rv mean "is smtp-based MTA" */
    if((mta = ok_vlook(smtp)) != NULL){
       OBSOLETE(_("please don't use *smtp*, but assign an SMTP URL to *mta*"));
       /* For *smtp* the smtp:// protocol was optional; be simple: don't check
diff --git a/urlcrecry.c b/urlcrecry.c
index 19e2309c..0cbb3a38 100644
--- a/urlcrecry.c
+++ b/urlcrecry.c
@@ -1166,6 +1166,10 @@ ccred_lookup_old(struct ccred *ccp, enum cproto cproto, char const *addr)
    bool_t addr_is_nuser = FAL0; /* XXX v15.0 legacy! v15_compat */
    NYD_ENTER;
 
+   OBSOLETE(_("You are using old-style credentials, which will vanish in v15!\n"
+      "  Please read the manual section "
+         "\"On URL syntax and credential lookup\""));
+
    memset(ccp, 0, sizeof *ccp);
 
    switch (cproto) {
-- 
2.11.4.GIT