Permalink
Browse files

Added Ruben Kerkhof's fixes to my typos in the run_script() stuff.

  • Loading branch information...
1 parent f96ba17 commit 26a34df1c32e8214bac4bf678dd45bb88b0d4801 @grke committed with Apr 16, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −0 CHANGELOG
  2. +1 −0 CONTRIBUTORS
  3. +1 −1 src/ca_server.c
  4. +1 −2 src/handy.c
View
@@ -20,6 +20,7 @@
fifo options.
* Add 'notify_success_changes_only' option, which means that success
notifications only get sent if there were new or changed files.
+ * Added Ruben Kerkhof's fixes to my typos in the run_script() stuff.
2012-03-31 Changes in burp-1.3.2:
* Add options for the client to automatically generate a certificate signing
View
@@ -8,6 +8,7 @@ Bas van den Dikkenberg
Bartosz Fenski
Jason Haar
Graham Keeling (main author)
+Ruben Kerkhof
Patrick Koppen
Wai Keong Phan
Michael Roland
View
@@ -264,7 +264,7 @@ static int sign_client_cert(const char *client, struct config *conf, struct cntr
// Now, sign it.
logp("Signing certificate signing request from %s\n", client);
- logp("Running '%s --name %s --ca %s --sign --batch --dir %s' --conf '%s'\n", conf->ca_burp_ca, client, conf->ca_name, gca_dir, conf->ca_conf);
+ logp("Running '%s --name %s --ca %s --sign --batch --dir %s --config %s'\n", conf->ca_burp_ca, client, conf->ca_name, gca_dir, conf->ca_conf);
if(run_script(conf->ca_burp_ca, NULL, 0, "--name", client,
"--ca", conf->ca_name, "--sign", "--batch", "--dir", gca_dir,
"--config", conf->ca_conf,
View
@@ -1033,7 +1033,6 @@ int run_script(const char *script, struct strlist **userargs, int userargc, cons
char *cmd[64]={ NULL };
#ifndef HAVE_WIN32
int s=0;
- int pid_status=0;
#endif
if(!script) return 0;
@@ -1090,7 +1089,7 @@ int run_script(const char *script, struct strlist **userargs, int userargc, cons
else if(WIFSIGNALED(run_script_status))
{
logp("%s terminated on signal %s\n",
- script, WTERMSIG(pid_status));
+ script, WTERMSIG(run_script_status));
if(cntr) logw(cntr, "%s terminated on signal %s\n",
script, WTERMSIG(run_script_status));
}

0 comments on commit 26a34df

Please sign in to comment.