Service spanning rule question

[cpc0506]

Employee A was hired on 12/19/2017 and terminated 1/3/2018.  He was subsequently rehired on 6/1/2018.

Plan requires 2 months of service for deferrals and 6 months of service for employer contributions with monthly entry dates.  No minimum age requirement.

Is Employee A eligible for plan on his rehire date of 6/1/18 for deferrals due to the service spanning rule?  And therefore eligible for PS as of 7/1/2018? 

[Madison71]

That is my understanding as the period of absence is less than 12 months