diff --git a/INSTALL b/INSTALL index 2099840..6e90e07 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff --git a/include/pcp/config.h.in b/include/pcp/config.h.in index b53de92..7f7bd36 100644 --- a/include/pcp/config.h.in +++ b/include/pcp/config.h.in @@ -160,6 +160,9 @@ */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff --git a/libpcp/mgmt.c b/libpcp/mgmt.c index 6d83f2e..e5b5b86 100644 --- a/libpcp/mgmt.c +++ b/libpcp/mgmt.c @@ -391,12 +391,15 @@ pcp_ks_bundle_t *pcp_import_pub_pbp(PCPCTX *ptx, Buffer *blob) { date[19] = '\0'; struct tm c; - if(strptime(date, "%Y-%m-%dT%H:%M:%S", &c) == NULL) { + c.tm_isdst = -1; + if(sscanf(date, "%4d-%2d-%2dT%2d:%2d:%2d", &c.tm_year, &c.tm_mon, &c.tm_mday, &c.tm_hour, &c.tm_min, &c.tm_sec)) { fatal(ptx, "Failed to parse creation time in PBP public key file\n"); free(date); ucfree(b, sizeof(pbp_pubkey_t)); goto errimp2; } + c.tm_mon -= 1; + c.tm_year -= 1900; buffer_fwd_offset(blob, 46); memcpy(b->name, buffer_get(blob), buffer_left(blob));