As proposed by Tim Furlong:

set starttm.tm_isdst to -1 to have mktime() propperly interpret DST.
Might fix Bug 1158

svn path=/trunk/; revision=19662

1 files changed, 4 insertions, 1 deletions

diff --git a/editcap.c b/editcap.c
index 791689c6ca..923642f39b 100644
--- a/editcap.c
+++ b/editcap.c
@@ -476,7 +476,7 @@ int main(int argc, char *argv[])
 		struct tm starttm;
 
 		memset(&starttm,0,sizeof(struct tm));
-
+		
 		if(!strptime(optarg,"%F %T",&starttm)) {
 			fprintf(stderr, "editcap: \"%s\" isn't a valid time format\n\n",
 					optarg);
@@ -484,6 +484,8 @@ int main(int argc, char *argv[])
 		}
 
 		check_startstop = TRUE;
+		starttm.tm_isdst = -1;
+		
 		starttime = mktime(&starttm);
 		break;
 	}
@@ -499,6 +501,7 @@ int main(int argc, char *argv[])
 			exit(1);
 		}
 		check_startstop = TRUE;
+		stoptm.tm_isdst = -1;
 		stoptime = mktime(&stoptm);
 		break;
 	}