From d66db0b648e82742c993d841f67be71291f37b98 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Tue, 14 Sep 1999 15:42:45 +0000 Subject: [PATCH] (get_cell_and_realm): only remove the newline if it's there git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6962 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/keytab_keyfile.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/krb5/keytab_keyfile.c b/lib/krb5/keytab_keyfile.c index 88a35560b..2b0c4259f 100644 --- a/lib/krb5/keytab_keyfile.c +++ b/lib/krb5/keytab_keyfile.c @@ -80,7 +80,8 @@ get_cell_and_realm (struct akf_data *d) fclose (f); return EINVAL; } - buf[strlen(buf)-1] = '\0'; + if (buf[strlen(buf) - 1] == '\n') + buf[strlen(buf)-1] = '\0'; fclose(f); d->cell = strdup (buf); @@ -93,11 +94,12 @@ get_cell_and_realm (struct akf_data *d) fclose (f); return EINVAL; } - buf[strlen(buf)-1] = '\0'; + if (buf[strlen(buf)-1] == '\n') + buf[strlen(buf)-1] = '\0'; fclose(f); } /* uppercase */ - for (cp = buf; *cp != 0; cp++) + for (cp = buf; *cp != '\0'; cp++) *cp = toupper(*cp); d->realm = strdup (buf);