tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/src ssl.c
Date Fri, 20 May 2005 09:56:48 GMT
mturk       2005/05/20 02:56:48

  Modified:    jni/native/src ssl.c
  Log:
  Fix chekcing for nCipher "chil" engine.
  
  Revision  Changes    Path
  1.7       +6 -4      jakarta-tomcat-connectors/jni/native/src/ssl.c
  
  Index: ssl.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/ssl.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ssl.c	20 May 2005 09:50:20 -0000	1.6
  +++ ssl.c	20 May 2005 09:56:47 -0000	1.7
  @@ -134,10 +134,12 @@
               if ((ee = ENGINE_by_id(J2S(engine))) == NULL
                   && (ee = ssl_try_load_engine(J2S(engine))) == NULL)
                   err = APR_ENOTIMPL;
  -            if (strcmp(J2S(engine), "chil") == 0)
  -                ENGINE_ctrl(ee, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
  -            if (!ENGINE_set_default(ee, ENGINE_METHOD_ALL))
  -                err = APR_ENOTIMPL;
  +            else {
  +                if (strcmp(J2S(engine), "chil") == 0)
  +                    ENGINE_ctrl(ee, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
  +                if (!ENGINE_set_default(ee, ENGINE_METHOD_ALL))
  +                    err = APR_ENOTIMPL;
  +            }
               /* Free our "structural" reference. */
               ENGINE_free(ee);
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message