httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_kernel.c
Date Wed, 11 Aug 2004 14:25:30 GMT
jorton      2004/08/11 07:25:30

  Modified:    support  htdbm.c
               server/mpm/prefork prefork.c
               server   log.c
               modules/ssl ssl_engine_kernel.c
  Log:
  * modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL),
  * server/log.c (ap_log_pid),
  * server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off),
  * support/htdbm.c (htdbm_list):
  Fix some non-literal format strings (warnings from gcc -Wformat-security).
  
  PR: 30585
  Submitted by: Ulf Harnhammar (SITIC), Joe Orton
  
  Revision  Changes    Path
  1.17      +1 -1      httpd-2.0/support/htdbm.c
  
  Index: htdbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdbm.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -d -w -u -r1.16 -r1.17
  --- htdbm.c	29 Jun 2004 13:33:24 -0000	1.16
  +++ htdbm.c	11 Aug 2004 14:25:29 -0000	1.17
  @@ -263,7 +263,7 @@
           rec[val.dsize] = '\0';
           cmnt = strchr(rec, ':');
           if (cmnt)
  -            fprintf(stderr, cmnt + 1);
  +            fprintf(stderr, "%s", cmnt + 1);
           fprintf(stderr, "\n");
           rv = apr_dbm_nextkey(htdbm->dbm, &key);
           if (rv != APR_SUCCESS)
  
  
  
  1.293     +4 -4      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.292
  retrieving revision 1.293
  diff -d -w -u -r1.292 -r1.293
  --- prefork.c	11 Apr 2004 23:55:10 -0000	1.292
  +++ prefork.c	11 Aug 2004 14:25:29 -0000	1.293
  @@ -210,11 +210,11 @@
   
           if (ap_my_generation != 
               ap_scoreboard_image->global->running_generation) {
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, msg);
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, "%s", msg);
               clean_child_exit(0);
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, msg);
  +            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "%s", msg);
               exit(APEXIT_CHILDFATAL);
           }
       }
  @@ -228,14 +228,14 @@
   
           if (ap_my_generation != 
               ap_scoreboard_image->global->running_generation) {
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, msg);
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, "%s", msg);
               /* don't exit here... we have a connection to
                * process, after which point we'll see that the
                * generation changed and we'll exit cleanly
                */
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, msg);
  +            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "%s", msg);
               exit(APEXIT_CHILDFATAL);
           }
       }
  
  
  
  1.148     +3 -3      httpd-2.0/server/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/log.c,v
  retrieving revision 1.147
  retrieving revision 1.148
  diff -d -w -u -r1.147 -r1.148
  --- log.c	23 Jun 2004 12:32:22 -0000	1.147
  +++ log.c	11 Aug 2004 14:25:30 -0000	1.148
  @@ -625,9 +625,9 @@
            *      based on the last modification time of the pid file.
            */
           ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, p,
  -                      apr_psprintf(p, "pid file %s overwritten -- Unclean "
  +                      "pid file %s overwritten -- Unclean "
                                      "shutdown of previous Apache run?",
  -                                   fname));
  +                      fname);
       }
   
       if ((rv = apr_file_open(&pid_file, fname,
  
  
  
  1.109     +1 -1      httpd-2.0/modules/ssl/ssl_engine_kernel.c
  
  Index: ssl_engine_kernel.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -d -w -u -r1.108 -r1.109
  --- ssl_engine_kernel.c	13 Jul 2004 18:11:22 -0000	1.108
  +++ ssl_engine_kernel.c	11 Aug 2004 14:25:30 -0000	1.109
  @@ -1401,7 +1401,7 @@
   
               BIO_free(bio);
   
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, buff);
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s", buff);
           }
   
           /*
  
  
  

Mime
View raw message