diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-07-13 17:26:31 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-07-13 12:51:05 +0200 |
| commit | 18995cde5c5d2e647d94f9dcde4ba9261464c217 (patch) | |
| tree | 2c7f286a432f23a99ae1cb3fa8f4ffb6f7c130b3 | |
| parent | 80c8f42f058bdcdf639037927c5941190f019a67 (diff) | |
| download | samba-18995cde5c5d2e647d94f9dcde4ba9261464c217.tar.gz samba-18995cde5c5d2e647d94f9dcde4ba9261464c217.tar.bz2 samba-18995cde5c5d2e647d94f9dcde4ba9261464c217.zip | |
s4-fault: changed to use %d for PID, instead of %PID%
this matches the s3 behaviour
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/util/fault.c | 2 | ||||
| -rwxr-xr-x | selftest/selftest.pl | 2 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 2 | ||||
| -rwxr-xr-x | wintest/test-s4-howto.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/util/fault.c b/lib/util/fault.c index 708dc670d1..ed7684aaf3 100644 --- a/lib/util/fault.c +++ b/lib/util/fault.c @@ -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); diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 808be222bb..218f83ba14 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -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 diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 2bb74ca785..2610232c58 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -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 diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index e09f8ba7a9..6f8bc7446c 100755 --- a/wintest/test-s4-howto.py +++ b/wintest/test-s4-howto.py @@ -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): |