[Merge] lp:~pac72/ubuntu/maverick/cntlm/devel into lp:ubuntu/maverick/cntlm

[Paolo Cancedda]

Paolo Cancedda has proposed merging lp:~pac72/ubuntu/maverick/cntlm/devel into lp:ubuntu/maverick/cntlm.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #733537 in cntlm (Ubuntu): "cntlm starts even when disabled"
  https://bugs.launchpad.net/ubuntu/+source/cntlm/+bug/733537

For more details, see:
https://code.launchpad.net/~pac72/ubuntu/maverick/cntlm/devel/+merge/53106

I hope this is the right branch to merge with, my first tries did not seem good.
The change is easy to describe: let's make sure that cntlm is actually enabled (checking existence of link /etc/rc${runlevel}.d/S??cntlm) before trying to start it from /etc/network/if-up.d/cntlm
-- 
https://code.launchpad.net/~pac72/ubuntu/maverick/cntlm/devel/+merge/53106
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~pac72/ubuntu/maverick/cntlm/devel into lp:ubuntu/maverick/cntlm.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 496 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20110311/eac5d618/attachment.diff>