X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=8934ee61269e1185fa50881cc65ec9e0cb93cb3f;hp=35284a08ecf1290bfed44ba7a0ea29dbf2d1cace;hb=d4635f9ba0fcf9ad3fd0fddb1f7f03850821092d;hpb=377bb95c67b8ad7a705691695297fd08e43901b6 diff --git a/cgisimple.c b/cgisimple.c index 35284a08..8934ee61 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.59 2007/10/19 16:42:36 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.60 2007/10/27 13:12:13 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,10 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.59 2007/10/19 16:42:36 fabian * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.60 2007/10/27 13:12:13 fabiankeil + * Finish 1.49 and check write access before + * showing edit buttons on show-url-info page. + * * Revision 1.59 2007/10/19 16:42:36 fabiankeil * Plug memory leak I introduced five months ago. * Yay Valgrind and Privoxy-Regression-Test. @@ -1240,7 +1244,9 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, buf); #ifdef FEATURE_CGI_EDIT_ACTIONS - if (NULL == strstr(csp->actions_list[i]->filename, "standard.action") && NULL != csp->config->actions_file_short[i]) + if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS) + && (NULL == strstr(csp->actions_list[i]->filename, "standard.action")) + && (NULL != csp->config->actions_file_short[i])) { #ifdef HAVE_ACCESS if (access(csp->config->actions_file[i], W_OK) == 0) @@ -1311,6 +1317,13 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = map_block_killer(exports, "trust-support"); #endif /* ndef FEATURE_TRUST */ +#ifdef FEATURE_CGI_EDIT_ACTIONS + if (!err && (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS)) + { + err = map_block_killer(exports, "cgi-editor-is-disabled"); + } +#endif /* ndef CGI_EDIT_ACTIONS */ + if (err) { free_map(exports);