Maybe my use of "and" was confusing.
>> He was a military guy, and now he’s a civilian employee <<
I think Gen. Kelly had retired before he was sworn in as SecHS, at which point he became a civilian employee. But I believe Gen. McMaster is still active duty military, albeit on detail to the WH.