From 0c5f581277ead60f4aaf00f44ef43f89fb387835 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 3 Feb 2009 17:07:53 -0800 Subject: Update a few more files with Vim modelines --- stap-server-connect.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'stap-server-connect.c') diff --git a/stap-server-connect.c b/stap-server-connect.c index 37b44a9b..2a7827f7 100644 --- a/stap-server-connect.c +++ b/stap-server-connect.c @@ -769,3 +769,5 @@ main(int argc, char **argv) return 0; } + +/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */ -- cgit From 89dd03e34c2f890e9fbb065c74a60036aa480827 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Wed, 11 Feb 2009 12:00:13 -0500 Subject: Server response is no longer signed. Passed as a zip archive instead. --- stap-server-connect.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'stap-server-connect.c') diff --git a/stap-server-connect.c b/stap-server-connect.c index 2a7827f7..8263a3d5 100644 --- a/stap-server-connect.c +++ b/stap-server-connect.c @@ -40,7 +40,7 @@ static SECKEYPrivateKey *privKey = NULL; static char *dbdir = NULL; static char requestFileName[] = "/tmp/stap.server.client.zip.XXXXXX"; static char responseDirName[] = "/tmp/stap.server.XXXXXX"; -static char responseJarName[] = "/tmp/stap.server.XXXXXX.jar.XXXXXX"; +static char responseZipName[] = "/tmp/stap.server.XXXXXX.zip.XXXXXX"; static void Usage(const char *progName) @@ -325,17 +325,17 @@ writeDataToSocket(PRFileDesc *sslSocket) /* Try to open the local file named. * If successful, then write it to the client. */ - prStatus = PR_GetFileInfo(responseJarName, &info); + prStatus = PR_GetFileInfo(responseZipName, &info); if (prStatus != PR_SUCCESS || info.type != PR_FILE_FILE || info.size < 0) { - fprintf (stderr, "Input file %s not found\n", responseJarName); + fprintf (stderr, "Input file %s not found\n", responseZipName); return SECFailure; } - local_file_fd = PR_Open(responseJarName, PR_RDONLY, 0); + local_file_fd = PR_Open(responseZipName, PR_RDONLY, 0); if (local_file_fd == NULL) { - fprintf (stderr, "Could not open input file %s\n", responseJarName); + fprintf (stderr, "Could not open input file %s\n", responseZipName); return SECFailure; } @@ -355,7 +355,7 @@ writeDataToSocket(PRFileDesc *sslSocket) #if DEBUG /* Transmitted bytes successfully. */ fprintf(stderr, "PR_TransmitFile wrote %d bytes from %s\n", - numBytes, responseJarName); + numBytes, responseZipName); #endif PR_Close(local_file_fd); @@ -428,12 +428,12 @@ handle_connection(PRFileDesc *tcpSocket) goto cleanup; } - memcpy (responseJarName, responseDirName, sizeof (responseDirName) - 1); - memcpy (responseJarName + sizeof (responseJarName) - 1 - 6, "XXXXXX", 6); - rc = mkstemp(responseJarName); + memcpy (responseZipName, responseDirName, sizeof (responseDirName) - 1); + memcpy (responseZipName + sizeof (responseZipName) - 1 - 6, "XXXXXX", 6); + rc = mkstemp(responseZipName); if (rc == -1) { - fprintf (stderr, "Could not create temporary file %s\n", responseJarName); + fprintf (stderr, "Could not create temporary file %s\n", responseZipName); perror (""); secStatus = SECFailure; @@ -468,7 +468,7 @@ handle_connection(PRFileDesc *tcpSocket) cmdline = PORT_Alloc(sizeof ("stap-server") + sizeof (requestFileName) + sizeof (responseDirName) + - sizeof (responseJarName) + + sizeof (responseZipName) + strlen (dbdir) + 1); if (! cmdline) { errWarn ("PORT_Alloc"); @@ -477,7 +477,7 @@ handle_connection(PRFileDesc *tcpSocket) } sprintf (cmdline, "stap-server %s %s %s %s", - requestFileName, responseDirName, responseJarName, dbdir); + requestFileName, responseDirName, responseZipName, dbdir); rc = system (cmdline); PR_Free (cmdline); @@ -501,7 +501,7 @@ cleanup: prStatus = PR_Delete (requestFileName); if (prStatus != PR_SUCCESS) errWarn ("PR_Delete"); - prStatus = PR_Delete (responseJarName); + prStatus = PR_Delete (responseZipName); if (prStatus != PR_SUCCESS) errWarn ("PR_Delete"); } -- cgit