mars_nwe/mars-tinyldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes from Thomas

Browse Source
This commit is contained in:
leitner
2002-05-22 12:19:46 +00:00
parent 5c8d2ac830
commit bd31d2568b
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ldap_match_mapped.c
View File

@@ -28,12 +28,13 @@ static int substringmatch(struct Substring* x,const char* attr,int ignorecase) {
found:
break;
case any:
if (x->s.l<strlen(attr)) return 0;
for (i=0; i<x->s.l-strlen(attr); ++i)
if (!diff(x->s.s+i,x->s.l,attr)) goto found;
if (x->s.l>strlen(attr)) return 0;
for (i=0; i<x->s.l-strlen(attr); ++i) {
if (!diff(x->s.s,x->s.l,attr+i)) goto found;
}
return 0;
case suffix:
if (diff(x->s.s+x->s.l-strlen(attr),x->s.l,attr)) return 0;
if (diff(x->s.s,x->s.l,attr+strlen(attr)-x->s.l)) return 0;
}
x=x->next;
}

27
tinyldap.c
View File

@@ -464,6 +464,7 @@ static void answerwith(uint32 ofs,struct SearchRequest* sr,long messageid,int ou
for (; i<j; ++i)
if (!matchstring(&adl->a,map+uint32_read(map+ofs+i*8))) {
val=map+uint32_read(map+ofs+i*8+4);
++i;
break;
}
}
@@ -477,19 +478,19 @@ nomem:
(*pal)->type=adl->a;
{
struct AttributeDescriptionList** a=&(*pal)->values;
while (i<j) {
*a=malloc(sizeof(struct AttributeDescriptionList));
if (!*a) goto nomem;
(*a)->a.s=val;
(*a)->a.l=strlen(val);
(*a)->next=0;
for (;i<j; ++i)
if (!matchstring(&adl->a,map+uint32_read(map+ofs+i*8))) {
val=map+uint32_read(map+ofs+i*8+4);
++i;
break;
}
}
add_attribute:
*a=malloc(sizeof(struct AttributeDescriptionList));
if (!*a) goto nomem;
(*a)->a.s=val;
(*a)->a.l=strlen(val);
for (;i<j; ++i)
if (!matchstring(&adl->a,map+uint32_read(map+ofs+i*8))) {
val=map+uint32_read(map+ofs+i*8+4);
++i;
a=&(*a)->next;
goto add_attribute;
}
(*a)->next=0;
}
(*pal)->next=0;
pal=&(*pal)->next;