2c2
< * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
---
> * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
16c16
< SM_RCSID("@(#)$Id: map.c,v 8.666 2004/08/17 16:50:19 gshapiro Exp $")
---
> SM_RCSID("@(#)$Id: map.c,v 8.669 2005/02/09 01:46:35 ca Exp $")
5660,5662c5660,5665
< if (s != NULL)
< return s->s_alias;
< return NULL;
---
> if (s == NULL)
> return NULL;
> if (bitset(MF_MATCHONLY, map->map_mflags))
> return map_rewrite(map, name, strlen(name), NULL);
> else
> return map_rewrite(map, s->s_alias, strlen(s->s_alias), av);
5665d5667
<
7557c7559
< char *replybuf, *rval, *value, *status;
---
> char *replybuf, *rval, *value, *status, *key;
7558a7561
> char keybuf[MAXNAME + 1];
7567c7570,7583
< nettolen = strlen(map->map_mname) + 1 + strlen(name);
---
> if (!bitset(MF_NOFOLDCASE, map->map_mflags))
> {
> nettolen = strlen(name);
> if (nettolen > sizeof keybuf - 1)
> nettolen = sizeof keybuf - 1;
> memmove(keybuf, name, nettolen);
> keybuf[nettolen] = '\0';
> makelower(keybuf);
> key = keybuf;
> }
> else
> key = name;
>
> nettolen = strlen(map->map_mname) + 1 + strlen(key);
7569c7585
< SM_ASSERT(nettolen > strlen(name));
---
> SM_ASSERT(nettolen > strlen(key));
7571c7587
< nettolen, map->map_mname, name) == SM_IO_EOF) ||
---
> nettolen, map->map_mname, key) == SM_IO_EOF) ||
7641c7657
< rval = map_rewrite(map, name, strlen(name), NULL);
---
> rval = map_rewrite(map, key, strlen(key), NULL);
7650c7666
< map->map_mname, name);
---
> map->map_mname, key);
7656c7672
< map->map_mname, name, status,
---
> map->map_mname, key, status,