diff --git a/ChangeLog b/ChangeLog
index e740528c4..700a53e28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-16  Jacques Vidrine  <nectar@kth.se>
+
+	* lib/krb5/kuserok.c, lib/krb5/prompter_posix.c: use strcspn
+	to convert the newline to NUL in fgets results.
+
 2002-09-13  Johan Danielsson  <joda@pdc.kth.se>
 
 	* kuser/kinit.1: remove unneeded Ns
diff --git a/lib/krb5/kuserok.c b/lib/krb5/kuserok.c
index c6b9b5995..28af0bcc1 100644
--- a/lib/krb5/kuserok.c
+++ b/lib/krb5/kuserok.c
@@ -88,9 +88,7 @@ krb5_kuserok (krb5_context context,
     while (fgets (buf, sizeof(buf), f) != NULL) {
 	krb5_principal tmp;
 
-	if(buf[strlen(buf) - 1] == '\n')
-	    buf[strlen(buf) - 1] = '\0';
-
+	buf[strcspn(buf, "\n")] = '\0';
 	ret = krb5_parse_name (context, buf, &tmp);
 	if (ret) {
 	    fclose (f);
diff --git a/lib/krb5/prompter_posix.c b/lib/krb5/prompter_posix.c
index 9c59f21c9..7e3e47b5d 100644
--- a/lib/krb5/prompter_posix.c
+++ b/lib/krb5/prompter_posix.c
@@ -65,8 +65,7 @@ krb5_prompter_posix (krb5_context context,
 		     prompts[i].reply->length,
 		     stdin) == NULL)
 		return 1;
-	    if(s[strlen(s) - 1] == '\n')
-		s[strlen(s) - 1] = '\0';
+	    s[strcspn(s, "\n")] = '\0';
 	}
     }
     return 0;