sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-fault: changed to use %d for PID, instead of %PID%

Browse Source 
this matches the s3 behaviour

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell 2011-07-13 17:26:31 +10:00
parent 80c8f42f05
commit 18995cde5c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util/fault.c
View File

@ -121,7 +121,7 @@ static void smb_panic_default(const char *why)
char cmdstring[200];
strlcpy(cmdstring, panic_action, sizeof(cmdstring));
snprintf(pidstr, sizeof(pidstr), "%d", (int) getpid());
all_string_sub(cmdstring, "%PID%", pidstr, sizeof(cmdstring));
all_string_sub(cmdstring, "%d", pidstr, sizeof(cmdstring));
DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmdstring));
result = system(cmdstring);

2
selftest/selftest.pl
View File

@ -643,7 +643,7 @@ sub write_clientconf($$$)
cache dir = $clientdir/cachedir
ncalrpc dir = $clientdir/ncalrpcdir
name resolve order = file bcast
panic action = $RealBin/gdb_backtrace \%PID\%
panic action = $RealBin/gdb_backtrace \%d
max xmit = 32K
notify:inotify = false
ldb:nosync = true

2
selftest/target/Samba4.pm
View File

@ -606,7 +606,7 @@ sub provision_raw_step1($$)
name resolve order = file bcast
interfaces = $ctx->{interfaces}
tls dh params file = $ctx->{tlsdir}/dhparms.pem
panic action = $RealBin/gdb_backtrace \%PID%
panic action = $RealBin/gdb_backtrace \%d
wins support = yes
server role = $ctx->{server_role}
server services = +echo

2
wintest/test-s4-howto.py
View File

@ -50,7 +50,7 @@ def start_s4(t):
t.chdir("${PREFIX}")
t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
t.run_cmd(['sbin/samba',
'--option', 'panic action=gnome-terminal -e "gdb --pid %PID%"'])
'--option', 'panic action=gnome-terminal -e "gdb --pid %d"'])
t.port_wait("${INTERFACE_IP}", 139)
def test_smbclient(t):