From fa332b71dc71d23f1475ed6c25a6376934ab652a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 25 Sep 2012 20:49:22 +0200 Subject: s4-python: Override SIGINT handler in scripts only. Override the SIGINT handler in a few select cases only, rather than doing so in one of the samba Python modules. I've done this where it matters most; we can add this code to other scripts too if necessary. This means that importing the 'samba' module from a third party application does not have side-effects on the state of the signal handlers. Bug: https://bugzilla.samba.org/show_bug.cgi?id=9068 --- source4/scripting/bin/smbstatus | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source4/scripting/bin/smbstatus') diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus index 055753b3fa..7ff98df6b3 100755 --- a/source4/scripting/bin/smbstatus +++ b/source4/scripting/bin/smbstatus @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # provide information on connected users and open files -# Copyright ǒ Jelmer Vernooij 2008 +# Copyright (c) Jelmer Vernooij 2008 # # Based on the original in EJS: # Copyright Andrew Tridgell 2005 @@ -11,6 +11,12 @@ import os, sys +# make sure the script dies immediately when hitting control-C, +# rather than raising KeyboardInterrupt. As we do all database +# operations using transactions, this is safe. +import signal +signal.signal(signal.SIGINT, signal.SIG_DFL) + sys.path.insert(0, "bin/python") import optparse -- cgit