From owner-p4-projects@FreeBSD.ORG Tue Jul 5 10:31:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 397A816A420; Tue, 5 Jul 2005 10:31:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED45016A41C for ; Tue, 5 Jul 2005 10:31:03 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D240443D45 for ; Tue, 5 Jul 2005 10:31:03 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j65AV3YA072323 for ; Tue, 5 Jul 2005 10:31:03 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j65AV3Ar072320 for perforce@freebsd.org; Tue, 5 Jul 2005 10:31:03 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 5 Jul 2005 10:31:03 GMT Message-Id: <200507051031.j65AV3Ar072320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 79592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2005 10:31:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=79592 Change 79592 by soc-bushman@soc-bushman_stinger on 2005/07/05 10:30:51 some cleanups and some small bugfixes Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservbyname.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservbyport.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#7 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservbyname.c#5 (text+ko) ==== @@ -36,55 +36,3 @@ #endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); - -/*#include -#include -#include "netdb_private.h" - -int -getservbyname_r(const char *name, const char *proto, struct servent *se, - struct servent_data *sed) -{ - char **cp; - int error; - -#ifdef YP - sed->yp_name = (char *)name; - sed->yp_proto = (char *)proto; -#endif - - setservent_r(sed->stayopen, sed); - while ((error = getservent_r(se, sed)) == 0) { - if (strcmp(name, se->s_name) == 0) - goto gotname; - for (cp = se->s_aliases; *cp; cp++) - if (strcmp(name, *cp) == 0) - goto gotname; - continue; -gotname: - if (proto == 0 || strcmp(se->s_proto, proto) == 0) - break; - } - if (!sed->stayopen) - endservent_r(sed); - -#ifdef YP - sed->yp_name = NULL; - sed->yp_proto = NULL; -#endif - - return (error); -} - -struct servent * -getservbyname(const char *name, const char *proto) -{ - struct servdata *sd; - - if ((sd = __servdata_init()) == NULL) - return (NULL); - if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0) - return (NULL); - return (&sd->serv); -} -*/ ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservbyport.c#5 (text+ko) ==== @@ -36,50 +36,3 @@ #endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $"); - -/* -#include -#include -#include "netdb_private.h" - -int -getservbyport_r(int port, const char *proto, struct servent *se, - struct servent_data *sed) -{ - int error; - -#ifdef YP - sed->yp_port = port; - sed->yp_proto = (char *)proto; -#endif - - setservent_r(sed->stayopen, sed); - while ((error = getservent_r(se, sed)) == 0) { - if (se->s_port != port) - continue; - if (proto == 0 || strcmp(se->s_proto, proto) == 0) - break; - } - if (!sed->stayopen) - endservent_r(sed); - -#ifdef YP - sed->yp_port = 0; - sed->yp_proto = NULL; -#endif - - return (error); -} - -struct servent * -getservbyport(int port, const char *proto) -{ - struct servdata *sd; - - if ((sd = __servdata_init()) == NULL) - return (NULL); - if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0) - return (NULL); - return (&sd->serv); -} -*/ ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#7 (text+ko) ==== @@ -308,9 +308,10 @@ break; } - if (*line=='+') - st->compat_mode_active = 1; - else { + if (*line=='+') { + if (serv_mdata->compat_mode != 0) + st->compat_mode_active = 1; + } else { if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { *errnop = ERANGE; rv = NS_RETURN; @@ -340,7 +341,7 @@ compat_src, port, proto, serv, buffer, bufsize, errnop); break; case nss_lt_all: - rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES, "getservent_r", + rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservent_r", compat_src, serv, buffer, bufsize, errnop); break; }