From: Willy Tarreau <w@1wt.eu>
Date: Mon, 28 Apr 2014 20:28:02 +0000 (+0200)
Subject: MEDIUM: config: inform the user about the deprecatedness of "block" rules
X-Git-Tag: v1.5-dev25~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de9d2d7b86abb0d7110bc3190aca5b26fec6fd64;p=thirdparty%2Fhaproxy.git

MEDIUM: config: inform the user about the deprecatedness of "block" rules

It's just a warning emitted once.
---

diff --git a/include/types/global.h b/include/types/global.h
index 21433e86c3..967d3b472e 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -173,7 +173,7 @@ extern struct task *global_listener_queue_task;
 extern unsigned int warned;     /* bitfield of a few warnings to emit just once */
 
 /* bit values to go with "warned" above */
-/* #define WARN_* */
+#define WARN_BLOCK_DEPRECATED       0x00000001
 
 /* to be used with warned and WARN_* */
 static inline int already_warned(unsigned int warning)
diff --git a/src/cfgparse.c b/src/cfgparse.c
index f2afcd0af8..485205945f 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2896,6 +2896,10 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
 	                                          (curproxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR,
 	                                          file, linenum);
 		LIST_ADDQ(&curproxy->block_rules, &rule->list);
+
+		if (!already_warned(WARN_BLOCK_DEPRECATED))
+			Warning("parsing [%s:%d] : The '%s' directive is now deprecated in favor of 'http-request deny' which uses the exact same syntax. The rules are translated but support might disappear in a future version.\n", file, linenum, args[0]);
+
 	}
 	else if (!strcmp(args[0], "redirect")) {
 		struct redirect_rule *rule;