summary |
tags |
clone url |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
72ef208)
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 8.15
-static char sccsid[] = "@(#)parseaddr.c 8.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c 8.15 (Berkeley) %G%";
#endif /* not lint */
#include "sendmail.h"
#endif /* not lint */
#include "sendmail.h"
char savedelim;
if (delimptr != NULL)
char savedelim;
if (delimptr != NULL)
+ if (savedelim != '\0')
+ *delimptr = '\0';
+ }
#if 0
/* for testing.... */
if (strcmp(addr, "INvalidADDR") == 0)
{
usrerr("553 INvalid ADDRess");
#if 0
/* for testing.... */
if (strcmp(addr, "INvalidADDR") == 0)
{
usrerr("553 INvalid ADDRess");
- if (delimptr != NULL)
- *delimptr = savedelim;
- return TRUE;
}
#endif
for (; *addr != '\0'; addr++)
}
#endif
for (; *addr != '\0'; addr++)
if ((*addr & 0340) == 0200)
break;
}
if ((*addr & 0340) == 0200)
break;
}
- if (delimptr != NULL)
- *delimptr = savedelim;
+ {
+ if (savedelim != '\0' && delimptr != NULL)
+ *delimptr = savedelim;
setstat(EX_USAGE);
usrerr("553 Address contained invalid control characters");
setstat(EX_USAGE);
usrerr("553 Address contained invalid control characters");
+ addrfailure:
+ if (savedelim != '\0' && delimptr != NULL)
+ *delimptr = savedelim;