Merge branch 'master' into feature/readall

1 files changed, 8 insertions, 2 deletions

diff --git a/main.c b/main.c
index c88c23a6..7d14c8bf 100644
--- a/main.c
+++ b/main.c
@@ -368,8 +368,12 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (do_lint && os_is_setuid())
-		lintwarn(_("running %s setuid root may be a security problem"), myname);
+	if (do_lint) {
+		if (os_is_setuid())
+			lintwarn(_("running %s setuid root may be a security problem"), myname);
+		if (do_intervals)
+			lintwarn(_("The -r/--re-interval options no longer have any effect"));
+	}
 
 	if (do_debug)	/* Need to register the debugger pre-exec hook before any other */
 		init_debug();
@@ -1688,6 +1692,8 @@ parse_args(int argc, char **argv)
 			break;
 
 		case 'r':
+			// This no longer has any effect. It remains for the
+			// lint check in main().
 			do_flags |= DO_INTERVALS;
  			break;