PERFORCE change 100891 for review
Michael Bushkov
bushman at FreeBSD.org
Fri Jul 7 16:02:58 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100891
Change 100891 by bushman at bushman_nss_ldap_cached on 2006/07/07 16:02:21
Regressions for getproto**(), getrpc**() and getusershell() functions added. Bug in nss_files.c and nss_nis.c fixed - "getrpcbyport_r" should have been "getprcbynumber_r".
Affected files ...
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#11 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.c#8 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#8 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getproto.c#1 add
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getproto.t#1 add
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getrpc.c#1 add
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getrpc.t#1 add
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getusershell.c#1 add
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-getusershell.t#1 add
.. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#8 edit
Differences ...
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#11 (text+ko) ====
@@ -91,7 +91,7 @@
{NSDB_PROTOCOLS, "endprotoent", __files_endprotoent, NULL},
{NSDB_RPC, "getrpcbyname_r", __files_rpcent, (void *)nss_lt_name},
- {NSDB_RPC, "getrpcbyport_r", __files_rpcent, (void *)nss_lt_id},
+ {NSDB_RPC, "getrpcbynumber_r", __files_rpcent, (void *)nss_lt_id},
{NSDB_RPC, "getrpcent_r", __files_rpcent, (void *)nss_lt_all},
{NSDB_RPC, "setrpcent", __files_setrpcent, (void *)nss_set_ent},
{NSDB_RPC, "endrpcent", __files_setrpcent, (void *)nss_end_ent},
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.c#8 (text+ko) ====
@@ -63,7 +63,7 @@
{NSDB_SERVICES, "endservent", __nis_setservent, NULL},
{NSDB_RPC, "getrpcbyname_r", __nis_rpcent, (void *)nss_lt_name},
- {NSDB_RPC, "getrpcbyport_r", __nis_rpcent, (void *)nss_lt_id},
+ {NSDB_RPC, "getrpcbynumber_r", __nis_rpcent, (void *)nss_lt_id},
{NSDB_RPC, "getrpcent_r", __nis_rpcent, (void *)nss_lt_all},
{NSDB_RPC, "setrpcent", __nis_setrpcent, NULL},
{NSDB_RPC, "endrpcent", __nis_setrpcent, NULL},
==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/Makefile#8 (text+ko) ====
@@ -1,6 +1,7 @@
# $FreeBSD$
-TESTS= test-getaddr test-getpw test-getgr test-gethostby test-getserv
+TESTS= test-getaddr test-getgr test-gethostby test-getpw test-getproto\
+ test-getrpc test-getserv test-getusershell
CFLAGS+= -g -Wall
.PHONY: tests
==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/testutil.h#8 (text+ko) ====
@@ -142,8 +142,8 @@
\
rv = 0; \
do { \
- if (e1 == NULL) { \
- if (e2 == NULL) \
+ if ((e1 == NULL) || (e2 == NULL)) { \
+ if (e1 == e2) \
return (0); \
else \
return (-1); \
More information about the p4-projects
mailing list