s4-auth-krb: Simplify salt_princ handling.