From 5ba1b2b91743c0e4d693db848f20e36436b15025 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Thu, 20 Mar 2008 21:47:14 +0000 Subject: [PATCH] Fix messages around getservbyname() in the IPv4 code to mention "sane-port" instead of "sane". --- ChangeLog | 3 +++ frontend/saned.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 767a30f75..09d693cc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2008-03-20 Julien Blache * include/Makefile.in: remove _stdint.h and byteorder.h in distclean target, autogenerated cruft. + * frontend/saned.c: fix debug messages around the getservbyname() + call in the IPv4 code as it still referred to the "sane" port + instead of "sane-port". 2008-03-16 Nicolas Martin * backend/pixma_mp150.c, backend/pixma.h, doc/sane-pixma.man, diff --git a/frontend/saned.c b/frontend/saned.c index a3d8c915a..14e28b4d6 100644 --- a/frontend/saned.c +++ b/frontend/saned.c @@ -2335,7 +2335,7 @@ main (int argc, char *argv[]) memset (&sin, 0, sizeof (sin)); DBG (DBG_DBG, - "main: trying to get port for service `sane' (getservbyname)\n"); + "main: trying to get port for service `sane-port' (getservbyname)\n"); serv = getservbyname ("sane-port", "tcp"); if (serv) { @@ -2345,9 +2345,9 @@ main (int argc, char *argv[]) else { port = htons (6566); - DBG (DBG_WARN, "main: could not find `sane' service (%s)\n", - strerror (errno)); - DBG (DBG_WARN, "main: using default port %d\n", ntohs (port)); + DBG (DBG_WARN, "main: \"sane-port\" service unknown on your host; you should add\n"); + DBG (DBG_WARN, "main: sane-port 6566/tcp saned # SANE network scanner daemon\n"); + DBG (DBG_WARN, "main: to your /etc/services file (or equivalent). Proceeding anyway.\n"); } sin.sin_family = AF_INET; sin.sin_addr.s_addr = INADDR_ANY;