--- heimdal-1.4.0+git201110101743~lorikeet.orig/lib/hdb/hdb-ldap.c	2012-08-20 15:50:54.039006802 +0200
+++ heimdal-1.4.0+git201110101743~lorikeet/lib/hdb/hdb-ldap.c	2012-08-20 16:00:48.651029415 +0200
@@ -1248,12 +1248,12 @@
             }
         }
 
-	delta = krb5_config_get_time_default(context, NULL,
-					     365 * 24 * 60 * 60,
+        delta = krb5_config_get_time_default(context, NULL,
+					     0,
 					     "kadmin",
 					     "password_lifetime",
 					     NULL);
-        *ent->entry.pw_end = tmp_time + delta;
+        *ent->entry.pw_end = delta ? tmp_time + delta : 0;
     }
 
     ret = LDAP_get_integer_value(db, msg, "sambaPwdMustChange", &tmp_time);