| /trunk/debian/patches/30_extra_fields.dpatch |
|---|
| File deleted |
| /trunk/debian/patches/fix_warnings.dpatch |
|---|
| 275,17 → 275,6 |
| { |
| if (values[j] != NULL && values[j] < values[0]) |
| { |
| @@ -1411,8 +1411,8 @@ |
| return DKIM_POLICY_DNS_PERM_FAILURE; |
| } |
| - unsigned pos = sDomain.find('.'); |
| - if (pos == -1 || sDomain.find('.', pos+1) == -1) |
| + string::size_type pos = sDomain.find('.'); |
| + if (pos == string::npos || sDomain.find('.', pos+1) == string::npos) |
| { |
| // SSP not found but the domain exists, it's non-suspicious |
| iSSP = DKIM_SSP_UNKNOWN; |
| diff -ru libdkim-1.0.19.orig/src/libdkimtest.cpp libdkim-1.0.19/src/libdkimtest.cpp |
| --- libdkim-1.0.19.orig/src/libdkimtest.cpp 2008-05-12 20:08:54.000000000 +1000 |
| +++ libdkim-1.0.19/src/libdkimtest.cpp 2009-04-15 19:38:08.000000000 +1000 |
| /trunk/debian/patches/01_strtok_r.dpatch |
|---|
| 117,31 → 117,3 |
| } |
| } |
| @@ -1388,6 +1394,9 @@ |
| //////////////////////////////////////////////////////////////////////////////// |
| int CDKIMVerify::GetSSP( const string &sDomain, int &iSSP, bool &bTesting ) |
| { |
| + // for strtok_r() |
| + char *saveptr; |
| + |
| string sFQDN = "_ssp._domainkey."; |
| sFQDN += sDomain; |
| @@ -1456,7 +1465,7 @@ |
| // flags |
| if (values[1] != NULL) |
| { |
| - char *s = strtok(values[1], "|"); |
| + char *s = strtok_r(values[1], "|", &saveptr); |
| while (s != NULL) |
| { |
| if (strcmp(s, "y") == 0) |
| @@ -1474,7 +1483,7 @@ |
| return DKIM_SUCCESS; |
| } |
| } |
| - s = strtok(NULL, "|"); |
| + s = strtok_r(NULL, "|", &saveptr); |
| } |
| } |
| } |
| /trunk/debian/patches/00list |
|---|
| 1,3 → 1,2 |
| 01_strtok_r |
| 30_extra_fields |
| fix_warnings |