Closing after release.

I don't close issues until I cut a release with the fix anyway.

I confirm that the patch in SVN fixes this issue. Thanks again!
Unfortunately I can't find a way to close it.

You are right on both points: I meant -F and broke the normal shutdown.

The current code (with your fix included) looks good, but isn't transparent, as it hinges on -t implying -F during argument processing.
Below is how I'd do it (gratuitous, jfyi, probably buggy, etc.). Thanks a lot for the fix!

if (shar_checkonly) {
fprintf...
conf.term();
return 0;
}

ListenerService* listener = ...

...

bool success = listener->run(&shibd_shutdown);
listener->term();
conf.term();
if (daemonize && pidfile)
unlink (pidfile);
if (!success) {
fprintf...
return -3;
}
return 0;

http://svn.middleware.georgetown.edu/view/cpp-sp?view=rev&revision=3209

Slightly revised, your patch wasn't removing the file even on normal shutdown of the daemon.