[src/trunk]: src/usr.sbin/lpr/common_source allow lp=port@host again. PR997...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4994a4ccfb96
branches:  trunk
changeset: 485323:4994a4ccfb96
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Apr 25 02:34:49 2000 +0000

description:
allow lp=port@host again.   PR9975 from Andreas Gustafsson.

diffstat:

 usr.sbin/lpr/common_source/common.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 1fad98b9d347 -r 4994a4ccfb96 usr.sbin/lpr/common_source/common.c
--- a/usr.sbin/lpr/common_source/common.c       Mon Apr 24 23:46:37 2000 +0000
+++ b/usr.sbin/lpr/common_source/common.c       Tue Apr 25 02:34:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: common.c,v 1.19 2000/04/24 02:53:05 itojun Exp $       */
+/*     $NetBSD: common.c,v 1.20 2000/04/25 02:34:49 itojun Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)common.c   8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: common.c,v 1.19 2000/04/24 02:53:05 itojun Exp $");
+__RCSID("$NetBSD: common.c,v 1.20 2000/04/25 02:34:49 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -133,6 +133,7 @@
        int s, lport = IPPORT_RESERVED - 1;
        int error;
        int refuse, trial;
+       char pbuf[NI_MAXSERV];
 
        /*
         * Get the host address and port number to connect to.
@@ -142,7 +143,11 @@
        memset(&hints, 0, sizeof(hints));
        hints.ai_family = PF_UNSPEC;
        hints.ai_socktype = SOCK_STREAM;
-       error = getaddrinfo(rhost, "printer", &hints, &res);
+       if (rport)
+               snprintf(pbuf, sizeof(pbuf), "%d", rport);
+       else
+               snprintf(pbuf, sizeof(pbuf), "printer");
+       error = getaddrinfo(rhost, pbuf, &hints, &res);
        if (error)
                fatal("printer/tcp: %s", gai_strerror(error));