Fix prev commit, days at month boundaries

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index f176cb208679afb46b6f0b75a437d2741476ac6a..4182c6bf1114ad9b8bc1e9a59edcaf7900e8317c 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -222,7 +222,15 @@ parse_time( char *atm )
 
        tmg.tm_mday -= tml.tm_mday;
        tmg.tm_hour -= tml.tm_hour;
-       if ( tmg.tm_mday ) tmg.tm_hour += tmg.tm_mday > 0 ? 24 : -24;
+       if ( tmg.tm_mday ) {
+               /* The difference should only be +/- 1 day, but may
+                * fall outside this range at the beginning/end of a month
+                */
+               if ( tmg.tm_mday > 1 ) tmg.tm_mday = -1;
+               else if ( tmg.tm_mday < -1 ) tmg.tm_mday = 1;
+
+               tmg.tm_hour += tmg.tm_mday > 0 ? 24 : -24;
+       }
        if ( tmg.tm_hour ) t -= tmg.tm_hour * 3600;
        tmg.tm_min -= tml.tm_min;
        if ( tmg.tm_min ) t -= tmg.tm_min * 60;