1. Short title This Act may be cited as the LEOSA Reform Act . 2. Conforming the Law Enforcement Officers Safety Act of 2004 and the Gun-Free School Zones Act of 1990 Section 922(q) of title 18, United States Code, is amended— (1) in paragraph (2)(B)— (A) in clause (vi), by striking or at the end; (B) in clause (vii), by striking the period at the end and inserting ; or ; and (C) by adding at the end the following: (viii) by an individual authorized by section 926B or 926C to carry a concealed firearm. ; and (2) in paragraph (3)(B)— (A) in clause (iii), by striking or at the end; (B) in clause (iv), by striking the period at the end and inserting ; or ; and (C) by adding at the end the following: (v) by an individual authorized by section 926B or 926C to carry a concealed firearm. . 3. Making improvements to the Law Enforcement Officers Safety Act of 2004 (a) Carrying of concealed firearms by qualified law enforcement officers Section 926B of title 18, United States Code, is amended— (1) in subsection (a), by inserting , or any other provision of Federal law (including any regulation prescribed by the Secretary of the Interior pertaining to a unit of the National Park System) after thereof ; (2) in subsection (b)— (A) in paragraph (1), by inserting , except to the extent that the laws apply on property used by a common or contract carrier to transport people or property by land, rail, or water or on property open to the public (whether or not a fee is charged to enter the property) before the semicolon; and (B) in paragraph (2), by inserting , except to the extent that the laws apply on property used by a common or contract carrier to transport people or property by land, rail, or water or on property open to the public (whether or not a fee is charged to enter the property) before the period at the end