AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
1999-08-02  Thorsten Kukuk  <kukuk@suse.de>

	* nis/nis_callback.c: Fix port problem on big-endian machines
	* sunrpc/clnt_udp.c: Cast to uint32_t pointer, not short. RPC
	fields are always 32 bit.
	Patches from Paul Mackerras <paulus@cs.anu.edu.au>

	* nis/nss_nis/nis-service.c: Remove htons, port is always in
	network-byte-order.
	* nis/nss_nisplus/nisplus-service.c: Rename number to port.
This commit is contained in:
Ulrich Drepper 1999-08-03 17:22:13 +00:00
parent 4bdd64534f
commit d6f6ffa166
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
1999-08-02 Thorsten Kukuk <kukuk@suse.de>
* nis/nis_callback.c: Fix port problem on big-endian machines
* sunrpc/clnt_udp.c: Cast to uint32_t pointer, not short. RPC
fields are always 32 bit.
Patches from Paul Mackerras <paulus@cs.anu.edu.au>
* nis/nss_nis/nis-service.c: Remove htons, port is always in
network-byte-order.
* nis/nss_nisplus/nisplus-service.c: Rename number to port.
1999-08-03 Andreas Schwab <schwab@suse.de> 1999-08-03 Andreas Schwab <schwab@suse.de>
* sysdeps/posix/sigset.c: Unblock the signal after setting its * sysdeps/posix/sigset.c: Unblock the signal after setting its

4
nis/nis_callback.c
View File

@ -351,10 +351,10 @@ __nis_create_callback (int (*callback) (const_nis_name, const nis_object *,
syslog (LOG_ERR, "NIS+: failed to read local socket info"); syslog (LOG_ERR, "NIS+: failed to read local socket info");
return NULL; return NULL;
} }
port = sin.sin_port; port = ntohs (sin.sin_port);
get_myaddress (&sin); get_myaddress (&sin);
snprintf (addr, sizeof (addr), "%s.%d.%d", inet_ntoa (sin.sin_addr), snprintf (addr, sizeof (addr), "%s.%d.%d", inet_ntoa (sin.sin_addr),
port & 0x00FF, (port & 0xFF00) >> 8); (port & 0xFF00) >> 8, port & 0x00FF);
cb->serv->ep.ep_val[0].uaddr = strdup (addr); cb->serv->ep.ep_val[0].uaddr = strdup (addr);
return cb; return cb;

7
nis/nss_nis/nis-service.c
View File

@ -1,6 +1,6 @@
/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. /* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as modify it under the terms of the GNU Library General Public License as
@ -270,8 +270,7 @@ _nss_nis_getservbyport_r (int port, char *protocol, struct servent *serv,
while (!found && while (!found &&
((status = internal_nis_getservent_r (serv, buffer, buflen, errnop, ((status = internal_nis_getservent_r (serv, buffer, buflen, errnop,
&data)) == NSS_STATUS_SUCCESS)) &data)) == NSS_STATUS_SUCCESS))
if (htons (serv->s_port) == port if (serv->s_port == port && strcmp (serv->s_proto, protocol) == 0)
&& strcmp (serv->s_proto, protocol) == 0)
found = 1; found = 1;
internal_nis_endservent (&data); internal_nis_endservent (&data);

12
nis/nss_nisplus/nisplus-service.c
View File

@ -1,6 +1,6 @@
/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. /* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as modify it under the terms of the GNU Library General Public License as
@ -347,9 +347,9 @@ _nss_nisplus_getservbyname_r (const char *name, const char *protocol,
} }
enum nss_status enum nss_status
_nss_nisplus_getservbynumber_r (const int number, const char *protocol, _nss_nisplus_getservbyport_r (const int number, const char *protocol,
struct servent *serv, struct servent *serv,
char *buffer, size_t buflen, int *errnop) char *buffer, size_t buflen, int *errnop)
{ {
if (tablename_val == NULL) if (tablename_val == NULL)
{ {
@ -370,7 +370,7 @@ _nss_nisplus_getservbynumber_r (const int number, const char *protocol,
nis_result *result; nis_result *result;
char buf[60 + strlen (protocol) + tablename_len]; char buf[60 + strlen (protocol) + tablename_len];
sprintf (buf, "[number=%d,proto=%s],%s", sprintf (buf, "[port=%d,proto=%s],%s",
number, protocol, tablename_val); number, protocol, tablename_val);
result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);

2
sunrpc/clnt_udp.c
View File

@ -290,7 +290,7 @@ call_again:
/* /*
* the transaction is the first thing in the out buffer * the transaction is the first thing in the out buffer
*/ */
(*(u_short *) (cu->cu_outbuf))++; (*(uint32_t *) (cu->cu_outbuf))++;
if ((!XDR_PUTLONG (xdrs, (long *) &proc)) || if ((!XDR_PUTLONG (xdrs, (long *) &proc)) ||
(!AUTH_MARSHALL (cl->cl_auth, xdrs)) || (!AUTH_MARSHALL (cl->cl_auth, xdrs)) ||
(!(*xargs) (xdrs, argsp))) (!(*xargs) (xdrs, argsp)))