Since we do not honour the Confidential: field, and as an attempt to

decrease the number of misfiled PR submissions in general, do not
allow users to send a PR that contains errors.

Discussed with:	core

1 files changed, 13 insertions, 0 deletions

diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index b776d37f12e7..f80a0a4a4f04 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -317,6 +317,10 @@ SEND-PR: BE ADVISED THAT FREEBSD PROBLEM REPORTS ARE PUBLIC INFORMATION AND
 SEND-PR: WILL BE PUBLISHED AS-IS ON THE PROJECT'S MAILING LISTS AND WEB SITES.
 SEND-PR: DO NOT SUBMIT ANY INFORMATION YOU DO NOT WANT MADE PUBLIC.
 SEND-PR:
+SEND-PR: If you wish to submit a problem report confidentially, then contact
+SEND-PR: the FreeBSD bugmaster (bugmaster@FreeBSD.org) to arrange for a
+SEND-PR: relevant developer to be contacted.
+SEND-PR:
 SEND-PR: For sensitive security issues, consider contacting the FreeBSD
 SEND-PR: security officer team (security-officer@freebsd.org) directly.
 SEND-PR:
@@ -501,6 +505,15 @@ while true; do
 	continue 2
 	;;
       s*)
+        if [ $CNT -lt 6 ]; then
+          if [ -z "$BATCH" ]; then
+            echo "But there are still errors in the problem report!"
+            continue 2
+          else
+            echo "Errors found in PR"
+            exit 1
+          fi
+        fi
 	break 2
 	;;
     esac