[patch 9/10] Properly report errors in readline() function

[kwc at citi.umich.edu]

Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>

Change message priorities for errors and debug messages.


---

 nfs-utils-1.0.8-kwc/utils/gssd/cacheio.c      |   10 +++++++---
 nfs-utils-1.0.8-kwc/utils/gssd/svcgssd_proc.c |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff -puN utils/gssd/cacheio.c~svcgssd_cacheio_updates utils/gssd/cacheio.c
--- nfs-utils-1.0.8/utils/gssd/cacheio.c~svcgssd_cacheio_updates	2006-06-16 16:01:18.613084000 -0400
+++ nfs-utils-1.0.8-kwc/utils/gssd/cacheio.c	2006-06-16 16:01:18.699011000 -0400
@@ -55,6 +55,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "err_util.h"
 
 void qword_add(char **bpp, int *lp, char *str)
@@ -264,7 +265,8 @@ int readline(int fd, char **buf, int *le
 	}
 	len = read(fd, *buf, *lenp);
 	if (len <= 0) {
-		printerr(2, "read error in readline: %d\n", len);
+		printerr(0, "readline: read error: len %d errno %d (%s)\n",
+			 len, errno, strerror(errno));
 		return 0;
 	}
 	while ((*buf)[len-1] != '\n') {
@@ -280,12 +282,14 @@ int readline(int fd, char **buf, int *le
 		*buf = new;
 		nl = read(fd, *buf +len, *lenp - len);
 		if (nl <= 0 ) {
-			printerr(2, "read error in readline: %d\n", nl);
+			printerr(0, "readline: read error: len %d "
+				 "errno %d (%s)\n", nl, errno, strerror(errno));
 			return 0;
 		}
 		len += nl;
 	}
 	(*buf)[len-1] = 0;
-	printerr(1, "read line with %d characters:\n%s\n", *lenp, *buf);
+	printerr(3, "readline: read %d chars into buffer of size %d:\n%s\n",
+		 len, *lenp, *buf);
 	return 1;
 }
diff -puN utils/gssd/svcgssd_proc.c~svcgssd_cacheio_updates utils/gssd/svcgssd_proc.c
--- nfs-utils-1.0.8/utils/gssd/svcgssd_proc.c~svcgssd_cacheio_updates	2006-06-16 16:01:18.655055000 -0400
+++ nfs-utils-1.0.8-kwc/utils/gssd/svcgssd_proc.c	2006-06-16 16:01:18.746967000 -0400
@@ -140,7 +140,7 @@ send_response(FILE *f, gss_buffer_desc *
 		return -1;
 	}
 	*bp = '\0';
-	printerr(1, "writing message: %s", buf);
+	printerr(3, "writing message: %s", buf);
 	if (write(g, buf, bp - buf) == -1) {
 		printerr(0, "WARNING: failed to write message\n");
 		close(g);

_