git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: move testcase (requires plaintext authenticator)
[exim.git]
/
test
/
src
/
fakens.c
diff --git
a/test/src/fakens.c
b/test/src/fakens.c
index 912f41984d1da3c91f342a0004e44e3f5ad206b5..baabf1d30308d4d004fcf6da9458f1603aa25c8a 100644
(file)
--- a/
test/src/fakens.c
+++ b/
test/src/fakens.c
@@
-57,6
+57,7
@@
as such then the response will have the "AD" bit set. */
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <netdb.h>
#include <errno.h>
#include <string.h>
#include <netdb.h>
#include <errno.h>
@@
-156,7
+157,7
@@
uschar *yield;
char buffer[256];
va_list ap;
va_start(ap, format);
char buffer[256];
va_list ap;
va_start(ap, format);
-vsprintf(buffer, format, ap);
+vsprintf(buffer,
CS
format, ap);
va_end(ap);
yield = (uschar *)malloc(Ustrlen(buffer) + 1);
Ustrcpy(yield, buffer);
va_end(ap);
yield = (uschar *)malloc(Ustrlen(buffer) + 1);
Ustrcpy(yield, buffer);
@@
-194,6
+195,19
@@
while (*name != 0)
return pk;
}
return pk;
}
+uschar *
+bytefield(uschar ** pp, uschar * pk)
+{
+unsigned value = 0;
+uschar * p = *pp;
+
+while (isdigit(*p)) value = value*10 + *p++ - '0';
+while (isspace(*p)) p++;
+*pp = p;
+*pk++ = value & 255;
+return pk;
+}
+
uschar *
shortfield(uschar ** pp, uschar * pk)
{
uschar *
shortfield(uschar ** pp, uschar * pk)
{
@@
-407,7
+421,7
@@
while (fgets(CS buffer, sizeof(buffer), f) != NULL)
case ns_t_mx:
pk = shortfield(&p, pk);
case ns_t_mx:
pk = shortfield(&p, pk);
- if (ep[-1] != '.') sprintf(ep, "%s.", zone);
+ if (ep[-1] != '.') sprintf(
CS
ep, "%s.", zone);
pk = packname(p, pk);
plen = Ustrlen(p);
break;
pk = packname(p, pk);
plen = Ustrlen(p);
break;
@@
-420,9
+434,9
@@
while (fgets(CS buffer, sizeof(buffer), f) != NULL)
break;
case ns_t_tlsa:
break;
case ns_t_tlsa:
- pk =
shortfield(&p, pk);
/* usage */
- pk =
shortfield(&p, pk);
/* selector */
- pk =
shortfield(&p, pk);
/* match type */
+ pk =
bytefield(&p, pk);
/* usage */
+ pk =
bytefield(&p, pk);
/* selector */
+ pk =
bytefield(&p, pk);
/* match type */
while (isxdigit(*p))
{
value = toupper(*p) - (isdigit(*p) ? '0' : '7') << 4;
while (isxdigit(*p))
{
value = toupper(*p) - (isdigit(*p) ? '0' : '7') << 4;
@@
-451,7
+465,7
@@
while (fgets(CS buffer, sizeof(buffer), f) != NULL)
case ns_t_cname:
case ns_t_ns:
case ns_t_ptr:
case ns_t_cname:
case ns_t_ns:
case ns_t_ptr:
- if (ep[-1] != '.') sprintf(ep, "%s.", zone);
+ if (ep[-1] != '.') sprintf(
CS
ep, "%s.", zone);
pk = packname(p, pk);
plen = Ustrlen(p);
break;
pk = packname(p, pk);
plen = Ustrlen(p);
break;
@@
-502,7
+516,7
@@
if (argc != 4)
/* Find the zones */
/* Find the zones */
-(void)sprintf(buffer, "%s/../dnszones", argv[1]);
+(void)sprintf(
CS
buffer, "%s/../dnszones", argv[1]);
d = opendir(CCS buffer);
if (d == NULL)
d = opendir(CCS buffer);
if (d == NULL)
@@
-514,20
+528,20
@@
if (d == NULL)
while ((de = readdir(d)) != NULL)
{
while ((de = readdir(d)) != NULL)
{
- uschar *name = de->d_name;
+ uschar *name =
US
de->d_name;
if (Ustrncmp(name, "qualify.", 8) == 0)
{
if (Ustrncmp(name, "qualify.", 8) == 0)
{
- qualify = fcopystring("%s", name + 7);
+ qualify = fcopystring(
US
"%s", name + 7);
continue;
}
if (Ustrncmp(name, "db.", 3) != 0) continue;
if (Ustrncmp(name + 3, "ip4.", 4) == 0)
continue;
}
if (Ustrncmp(name, "db.", 3) != 0) continue;
if (Ustrncmp(name + 3, "ip4.", 4) == 0)
- zones[zonecount].zone = fcopystring("%s.in-addr.arpa", name + 6);
+ zones[zonecount].zone = fcopystring(
US
"%s.in-addr.arpa", name + 6);
else if (Ustrncmp(name + 3, "ip6.", 4) == 0)
else if (Ustrncmp(name + 3, "ip6.", 4) == 0)
- zones[zonecount].zone = fcopystring("%s.ip6.arpa", name + 6);
+ zones[zonecount].zone = fcopystring(
US
"%s.ip6.arpa", name + 6);
else
else
- zones[zonecount].zone = fcopystring("%s", name + 2);
- zones[zonecount++].zonefile = fcopystring("%s", name);
+ zones[zonecount].zone = fcopystring(
US
"%s", name + 2);
+ zones[zonecount++].zonefile = fcopystring(
US
"%s", name);
}
(void)closedir(d);
}
(void)closedir(d);
@@
-573,7
+587,7
@@
if (zonefile == NULL)
return PASS_ON;
}
return PASS_ON;
}
-(void)sprintf(buffer, "%s/../dnszones/%s", argv[1], zonefile);
+(void)sprintf(
CS
buffer, "%s/../dnszones/%s", argv[1], zonefile);
/* Initialize the start of the response packet. We don't have to fake up
everything, because we know that Exim will look only at the answer and
/* Initialize the start of the response packet. We don't have to fake up
everything, because we know that Exim will look only at the answer and
@@
-584,7
+598,7
@@
pk += 12;
/* Open the zone file. */
/* Open the zone file. */
-f = fopen(buffer, "r");
+f = fopen(
CS
buffer, "r");
if (f == NULL)
{
fprintf(stderr, "fakens: failed to open %s: %s\n", buffer, strerror(errno));
if (f == NULL)
{
fprintf(stderr, "fakens: failed to open %s: %s\n", buffer, strerror(errno));