In setitimer(2), if the it_value of the new itimer value is clear, then

don't add the current time to it, but leave it as clear so that when the
timer is disabled, the it_value is always clear.

Reviewed by:	bde
Approved by:	re (rwatson)

1 files changed, 4 insertions, 3 deletions

diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 6a046fa..29de672 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -482,11 +482,12 @@ setitimer(struct thread *td, struct setitimer_args *uap)
 		PROC_LOCK(p);
 		if (timevalisset(&p->p_realtimer.it_value))
 			callout_stop(&p->p_itcallout);
-		if (timevalisset(&aitv.it_value)) 
+		getmicrouptime(&ctv);
+		if (timevalisset(&aitv.it_value)) {
 			callout_reset(&p->p_itcallout, tvtohz(&aitv.it_value),
 			    realitexpire, p);
-		getmicrouptime(&ctv);
-		timevaladd(&aitv.it_value, &ctv);
+			timevaladd(&aitv.it_value, &ctv);
+		}
 		oitv = p->p_realtimer;
 		p->p_realtimer = aitv;
 		PROC_UNLOCK(p);