Project

General

Profile

« Previous | Next » 

Revision b4bb2544

Added by Jim Pingle about 7 years ago

Correct text for reserved alias name checks against protocols and services. Fixes #8409

(cherry picked from commit a2405c1a8c366e1ad2ececd4f62c577eed31ab7c)

View differences:

src/etc/inc/util.inc
1054 1054 
	}
1055 1055 
	if (getprotobyname($name)) {
1056 1056 
		if ($return_message) {
1057 
			return sprintf(gettext('The %1$s name must not be a well-known IP protocol name such as TCP, UDP, ICMP etc.'), $object);
1057 
			return sprintf(gettext('The %1$s name must not be an IP protocol name such as TCP, UDP, ICMP etc.'), $object);
1058 1058 
		} else {
1059 1059 
			return false;
1060 1060 
		}
1061 1061 
	}
1062 1062 
	if (getservbyname($name, "tcp") || getservbyname($name, "udp")) {
1063 1063 
		if ($return_message) {
1064 
			return sprintf(gettext('The %1$s name must not be a well-known TCP or UDP port name such as ssh, smtp, pop3, tftp, http, openvpn etc.'), $object);
1064 
			return sprintf(gettext('The %1$s name must not be a well-known or registered TCP or UDP port name such as ssh, smtp, pop3, tftp, http, openvpn etc.'), $object);
1065 1065 
		} else {
1066 1066 
			return false;
1067 1067 
		}

Also available in: Unified diff