What is the difference between a samurai and a ronin?

A ronin is a samurai.

Samurai was a status in Japan. A ronin was simply someone of samurai status that had no clan affiliation.