MSPs have passed a Scottish government motion and opposition party amendments after a consensual debate on the government's drugs strategy on 15 September 2010.
Scotland's first national drugs strategy
The Road to Recovery: A New Approach to Tackling Scotland's Drug Problem
was launched in May 2008.
The three-year £94m Scottish drug strategy focuses on helping addicts into recovery and it states that services should support people to move on, towards a drug-free life, as active and contributing members of society.
Community Safety Minister Fergus Ewing said Scotland was leading the way in ensuring recovery from drug misuse and had put the needs of the individual at the heart of drug services.
Labour's community safety spokesman James Kelly backed the strategy but urged the Scottish government and Scottish Prison Service to do more to stop illegal drugs entering prisons.
John Lamont, speaking for the Conservatives, highlighted the role substance abuse played in criminal activity and the complex needs of those in custody with substance addictions.
Liberal Democrat MSP Robert Brown called for more drug treatment and testing orders (DTTO) to be made available to all Scottish courts as required.