diff --git a/appl/login/limits_conf.c b/appl/login/limits_conf.c
index afa8539c4..0cd62a824 100644
--- a/appl/login/limits_conf.c
+++ b/appl/login/limits_conf.c
@@ -157,6 +157,7 @@ read_limits_conf(const char *file, const struct passwd *pwd)
 	if(strcmp(args[3], "-") == 0) {
 	    value = RLIM_INFINITY;
 	} else {
+	    errno = 0;
 	    value = strtol(args[3], &end, 10);
 	    if(*end != '\0') {
 		syslog(LOG_ERR, "%s: line %d: bad value %s", file, lineno, args[3]);
diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
index cc45be0ac..aa0cad000 100644
--- a/lib/hdb/hdb-ldap.c
+++ b/lib/hdb/hdb-ldap.c
@@ -1171,6 +1171,7 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
 
     values = ldap_get_values(HDB2LDAP(db), msg, "krb5KDCFlags");
     if (values != NULL) {
+	errno = 0;
 	tmp = strtoul(values[0], (char **) NULL, 10);
 	if (tmp == ULONG_MAX && errno == ERANGE) {
 	    krb5_set_error_string(context, "strtoul: could not convert flag");