lightningd: really remove relative plugins dirs.

We promised this in 0.8.1! Signed-off-by: Rusty Russell <[email protected]> Changelog-Removed: Plugin: Relative plugin paths are not relative to startup (deprecated v0.7.2.1)
ElementsProject · Sep 15, 2020 · 369c599 · 369c599
1 parent b1f76e7
commit 369c599
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/lightningd/plugin.c b/lightningd/plugin.c
@@ -1223,24 +1223,10 @@ char *add_plugin_dir(struct plugins *plugins, const char *dir, bool error_ok)
 	struct plugin *p;
 
 	if (!d) {
-		if (deprecated_apis && !path_is_abs(dir)) {
-			dir = path_join(tmpctx,
-					plugins->ld->original_directory, dir);
-			d = opendir(dir);
-			if (d) {
-				log_unusual(plugins->log, "DEPRECATED WARNING:"
-					    " plugin-dir is now relative to"
-					    " lightning-dir, please change to"
-					    " plugin-dir=%s",
-					    dir);
-			}
-		}
-		if (!d) {
-			if (!error_ok && errno == ENOENT)
-				return NULL;
-			return tal_fmt(NULL, "Failed to open plugin-dir %s: %s",
-				       dir, strerror(errno));
-		}
+		if (!error_ok && errno == ENOENT)
+			return NULL;
+		return tal_fmt(NULL, "Failed to open plugin-dir %s: %s",
+			       dir, strerror(errno));
 	}
 
 	while ((di = readdir(d)) != NULL) {