Merge branch 'master' into develop

ellzey · Dec 16, 2011 · 908c4a8 · 908c4a8
2 parents c75bc5b + b2bd7e9
commit 908c4a8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/test.c b/test.c
@@ -299,7 +299,7 @@ dummy_check_issued_cb(X509_STORE_CTX * ctx, X509 * x, X509 * issuer) {
 
 #endif
 
-const char * optstr = "htn:a:p:r:s:c:";
+const char * optstr = "htn:a:p:r:s:c:C:";
 
 const char * help   =
     "Options: \n"
@@ -352,6 +352,9 @@ parse_args(int argc, char ** argv) {
             case 'c':
                 ssl_ca      = strdup(optarg);
                 break;
+            case 'C':
+                ssl_capath  = strdup(optarg);
+                break;
 #endif
             default:
                 printf("Unknown opt %s\n", optarg);