forked from rpms/openssl
34 lines
810 B
Diff
34 lines
810 B
Diff
|
--- openssl-0.9.8b/crypto/x509/by_dir.c.add-dir 2005-07-03 15:15:53.000000000 +0200
|
||
|
|
+++ openssl-0.9.8b/crypto/x509/by_dir.c 2006-10-03 15:14:06.000000000 +0200
|
||
|
|
@@ -189,7 +189,7 @@
|
||
|
|
|
||
|
|
s=dir;
|
||
|
|
p=s;
|
||
|
|
- for (;;)
|
||
|
|
+ for (;;p++)
|
||
|
|
{
|
||
|
|
if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0'))
|
||
|
|
{
|
||
|
|
@@ -198,8 +198,11 @@
|
||
|
|
len=(int)(p-ss);
|
||
|
|
if (len == 0) continue;
|
||
|
|
for (j=0; j<ctx->num_dirs; j++)
|
||
|
|
- if (strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
|
||
|
|
- continue;
|
||
|
|
+ if (strlen(ctx->dirs[j]) == len &&
|
||
|
|
+ strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
|
||
|
|
+ break;
|
||
|
|
+ if (j<ctx->num_dirs)
|
||
|
|
+ continue;
|
||
|
|
if (ctx->num_dirs_alloced < (ctx->num_dirs+1))
|
||
|
|
{
|
||
|
|
ctx->num_dirs_alloced+=10;
|
||
|
|
@@ -231,7 +234,6 @@
|
||
|
|
ctx->num_dirs++;
|
||
|
|
}
|
||
|
|
if (*p == '\0') break;
|
||
|
|
- p++;
|
||
|
|
}
|
||
|
|
return(1);
|
||
|
|
}
|