diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-23 09:14:02 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-23 09:14:02 +0100 |
| commit | 69ce6c79dbcb2cec2d1245935ef20bf832ffe70a (patch) | |
| tree | 0b6aea71ef4f3ca5c797494d062819bfba63e7f7 /stap-server-connect.c | |
| parent | 72195f6b17c0ed2e508c58bf3cadd5b9dc4e28ac (diff) | |
| parent | 0ee3adb42f2f6d8bffe177e77a415b3a74f3a777 (diff) | |
| download | systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.tar.gz systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.tar.xz systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'stap-server-connect.c')
| -rw-r--r-- | stap-server-connect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stap-server-connect.c b/stap-server-connect.c index f70810a4..cf0e5a65 100644 --- a/stap-server-connect.c +++ b/stap-server-connect.c @@ -467,9 +467,9 @@ handle_connection(PRFileDesc *tcpSocket) } #endif - /* Call the stap-server script. */ - stap_server_prefix = getenv("SYSTEMTAP_SERVER_SCRIPTS") ?: BINDIR; - cmdline = PORT_Alloc(strlen (stap_server_prefix) + sizeof ("/stap-server") + 1 + + /* Call the stap-server-request script. */ + stap_server_prefix = getenv("SYSTEMTAP_SERVER_SCRIPTS") ?: PKGLIBDIR; + cmdline = PORT_Alloc(strlen (stap_server_prefix) + sizeof ("/stap-server-request") + 1 + sizeof (requestFileName) + 1 + sizeof (responseDirName) + 1 + sizeof (responseZipName) + 1 + @@ -482,7 +482,7 @@ handle_connection(PRFileDesc *tcpSocket) goto cleanup; } - sprintf (cmdline, "%s/stap-server %s %s %s %s '%s'", stap_server_prefix, + sprintf (cmdline, "%s/stap-server-request %s %s %s %s '%s'", stap_server_prefix, requestFileName, responseDirName, responseZipName, dbdir, stapOptions); rc = system (cmdline); |