diff --git a/lib/krb5/keytab_keyfile.c b/lib/krb5/keytab_keyfile.c
index 2cd6b331e..dbfd12b6a 100644
--- a/lib/krb5/keytab_keyfile.c
+++ b/lib/krb5/keytab_keyfile.c
@@ -82,8 +82,7 @@ get_cell_and_realm (krb5_context context,
 	krb5_set_error_string (context, "no cell in %s", AFS_SERVERTHISCELL);
 	return EINVAL;
     }
-    if (buf[strlen(buf) - 1] == '\n')
-	buf[strlen(buf) - 1] = '\0';
+    buf[strcspn(buf, "\n")] = '\0';
     fclose(f);
 
     d->cell = strdup (buf);
@@ -100,8 +99,7 @@ get_cell_and_realm (krb5_context context,
 				   AFS_SERVERMAGICKRBCONF);
 	    return EINVAL;
 	}
-	if (buf[strlen(buf)-1] == '\n')
-	    buf[strlen(buf)-1] = '\0';
+	buf[strcspn(buf, "\n")] = '\0';
 	fclose(f);
     }
     /* uppercase */