le beau-père

Short answer: indeed, the same word is used for both, step-father and father-in-law. In archaic French, there used to be parâtre (and marâtre) for step-father (and step-mother). But they aren't used anymore.