Hello community, here is the log from the commit of package libtirpc for openSUSE:Factory checked in at 2016-04-11 10:27:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libtirpc (Old) and /work/SRC/openSUSE:Factory/.libtirpc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libtirpc" Changes: -------- --- /work/SRC/openSUSE:Factory/libtirpc/libtirpc.changes 2016-02-11 12:33:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libtirpc.new/libtirpc.changes 2016-04-11 10:27:37.000000000 +0200 @@ -1,0 +2,37 @@ +Mon Mar 14 15:17:59 CET 2016 - [email protected] + +- Add some patches to get libtirpc compiled without needing glibc + deprecated functions: + - 015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch + - 014-Add-des_crypt.c-and-des_impl.c-to-become-independent.patch + - 013-If-we-don-t-compile-in-YP-support-don-t-include-YP-h.patch + +- Add 012-libtirpc-needs-rpcsvc-nis.h-for-compiling-but-does-n.patch + to allow bootstrapping of libtirpc without glibc sunrpc code or + libnsl NIS+ code. + +------------------------------------------------------------------- +Mon Mar 14 11:09:16 CET 2016 - [email protected] + +- Add 011-Fix-typo-in-src-libtirpc.map-which-prevents-that-key.patch + (fix export of key_secretkey_is_set) + +------------------------------------------------------------------- +Thu Feb 25 13:09:48 CET 2016 - [email protected] + +- Add the following patches to fix some bugs from the poll() + port and an endless loop: + - 006-Remove-old-meanwhile-wrong-comment-about-FD_SETSIZE-.patch + - 007-Change-rtime-function-to-use-poll-instead-of-select.patch + - 008-Add-parameters-to-local-prototypes-to-fix-compiler-w.patch + - 009-makefd_xprt-checks-that-the-filedesriptor-is-lower-t.patch + - 010-The-goto-again-statement-was-an-left-over-from-the-p.patch + +------------------------------------------------------------------- +Thu Jan 21 15:09:28 CET 2016 - [email protected] + +- Remove 004-netconfig-prefer-IPv6.patch for SLES12. +- Remove libtirpc-getnetconfig-races.patch (was backport). + [FATE#320393] + +------------------------------------------------------------------- @@ -27,0 +65 @@ +- Drop libtirpc-xdr-header.patch (was backport) @@ -30,0 +69,6 @@ +Thu Jul 23 11:34:12 UTC 2015 - [email protected] + +- Fix public xdr.h header - xdr_rpcvers() were broken (bsc#902439) + Added: libtirpc-xdr-header.patch + +------------------------------------------------------------------- @@ -221,0 +266,6 @@ + +------------------------------------------------------------------- +Tue Feb 3 08:46:32 UTC 2015 - [email protected] + +- Fix race conditions in getnetconfig (bsc#899576, bsc#882973) + Added: libtirpc-getnetconfig-races.patch Old: ---- 004-netconfig-prefer-IPv6.patch New: ---- 006-Remove-old-meanwhile-wrong-comment-about-FD_SETSIZE-.patch 007-Change-rtime-function-to-use-poll-instead-of-select.patch 008-Add-parameters-to-local-prototypes-to-fix-compiler-w.patch 009-makefd_xprt-checks-that-the-filedesriptor-is-lower-t.patch 010-The-goto-again-statement-was-an-left-over-from-the-p.patch 011-Fix-typo-in-src-libtirpc.map-which-prevents-that-key.patch 012-libtirpc-needs-rpcsvc-nis.h-for-compiling-but-does-n.patch 013-If-we-don-t-compile-in-YP-support-don-t-include-YP-h.patch 014-Add-des_crypt.c-and-des_impl.c-to-become-independent.patch 015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtirpc.spec ++++++ --- /var/tmp/diff_new_pack.qM8Ekq/_old 2016-04-11 10:27:38.000000000 +0200 +++ /var/tmp/diff_new_pack.qM8Ekq/_new 2016-04-11 10:27:38.000000000 +0200 @@ -37,8 +37,17 @@ Patch0: 000-bindresvport_blacklist.patch # Patch2 is only needed for SLES11 Patch2: 002-old-automake.patch -Patch4: 004-netconfig-prefer-IPv6.patch Patch5: 005-libtirpc-1.0.2-rc1.patch +Patch6: 006-Remove-old-meanwhile-wrong-comment-about-FD_SETSIZE-.patch +Patch7: 007-Change-rtime-function-to-use-poll-instead-of-select.patch +Patch8: 008-Add-parameters-to-local-prototypes-to-fix-compiler-w.patch +Patch9: 009-makefd_xprt-checks-that-the-filedesriptor-is-lower-t.patch +Patch10: 010-The-goto-again-statement-was-an-left-over-from-the-p.patch +Patch11: 011-Fix-typo-in-src-libtirpc.map-which-prevents-that-key.patch +Patch12: 012-libtirpc-needs-rpcsvc-nis.h-for-compiling-but-does-n.patch +Patch13: 013-If-we-don-t-compile-in-YP-support-don-t-include-YP-h.patch +Patch14: 014-Add-des_crypt.c-and-des_impl.c-to-become-independent.patch +Patch15: 015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch Patch25: patch6_7.diff # Patch37 is only needed on openSUSE >= 13.1, SLE >= 12 Patch37: libtirpc-new-path-rpcbindsock.patch @@ -88,8 +97,17 @@ %setup -q -n %name-%version %patch0 -p0 %patch2 -p1 -%patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %patch25 -p1 %if 0%{suse_version} >= 1310 %patch37 -p1 ++++++ 006-Remove-old-meanwhile-wrong-comment-about-FD_SETSIZE-.patch ++++++ >From ee37905bd6221576deabd9413403c0dee079b605 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Thu, 25 Feb 2016 12:48:24 +0100 Subject: [PATCH 1/5] Remove old, meanwhile wrong comment about FD_SETSIZE and _rpc_dtablesize(). Remove the local prototype for _rpc_dtablesize() but use the public header instead. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/rpc_dtablesize.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/rpc_dtablesize.c b/src/rpc_dtablesize.c index 13d320c..3fe503a 100644 --- a/src/rpc_dtablesize.c +++ b/src/rpc_dtablesize.c @@ -27,22 +27,14 @@ */ #include <unistd.h> - #include <sys/select.h> - -int _rpc_dtablesize(void); /* XXX */ +#include <rpc/clnt.h> +#include <rpc/rpc_com.h> /* * Cache the result of getdtablesize(), so we don't have to do an * expensive system call every time. */ -/* - * XXX In FreeBSD 2.x, you can have the maximum number of open file - * descriptors be greater than FD_SETSIZE (which us 256 by default). - * - * Since old programs tend to use this call to determine the first arg - * for _select(), having this return > FD_SETSIZE is a Bad Idea(TM)! - */ int _rpc_dtablesize(void) { -- 1.8.5.6 ++++++ 007-Change-rtime-function-to-use-poll-instead-of-select.patch ++++++ >From f506559f6b2dedbb54ee59d0230d451a9dce213c Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Thu, 25 Feb 2016 12:51:50 +0100 Subject: [PATCH 2/5] Change rtime() function to use poll() instead of select(). Signed-off-by: Thorsten Kukuk <[email protected]> --- src/rtime.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/rtime.c b/src/rtime.c index c34e0af..8141ae8 100644 --- a/src/rtime.c +++ b/src/rtime.c @@ -46,6 +46,7 @@ #include <unistd.h> #include <errno.h> #include <sys/types.h> +#include <sys/poll.h> #include <sys/socket.h> #include <sys/time.h> #include <netinet/in.h> @@ -67,7 +68,8 @@ rtime(addrp, timep, timeout) struct timeval *timeout; { int s; - fd_set readfds; + struct pollfd fd; + int milliseconds; int res; unsigned long thetime; struct sockaddr_in from; @@ -94,31 +96,32 @@ rtime(addrp, timep, timeout) addrp->sin_port = serv->s_port; if (type == SOCK_DGRAM) { - res = sendto(s, (char *)&thetime, sizeof(thetime), 0, + res = sendto(s, (char *)&thetime, sizeof(thetime), 0, (struct sockaddr *)addrp, sizeof(*addrp)); if (res < 0) { do_close(s); - return(-1); + return(-1); } - do { - FD_ZERO(&readfds); - FD_SET(s, &readfds); - res = select(_rpc_dtablesize(), &readfds, - (fd_set *)NULL, (fd_set *)NULL, timeout); - } while (res < 0 && errno == EINTR); + + milliseconds = (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000); + fd.fd = s; + fd.events = POLLIN; + do + res = poll (&fd, 1, milliseconds); + while (res < 0 && errno == EINTR); if (res <= 0) { if (res == 0) { errno = ETIMEDOUT; } do_close(s); - return(-1); + return(-1); } fromlen = sizeof(from); - res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0, + res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0, (struct sockaddr *)&from, &fromlen); do_close(s); if (res < 0) { - return(-1); + return(-1); } } else { if (connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) { @@ -133,7 +136,7 @@ rtime(addrp, timep, timeout) } if (res != sizeof(thetime)) { errno = EIO; - return(-1); + return(-1); } thetime = ntohl(thetime); timep->tv_sec = thetime - TOFFSET; -- 1.8.5.6 ++++++ 008-Add-parameters-to-local-prototypes-to-fix-compiler-w.patch ++++++ >From f4baf06134d46512fe36bcc1f63941bd928450e7 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Thu, 25 Feb 2016 12:55:42 +0100 Subject: [PATCH 3/5] Add parameters to local prototypes to fix compiler warnings and avoid portability issues about wrong compiler assumptions. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/svc_auth_des.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c index 5bc264c..2e90146 100644 --- a/src/svc_auth_des.c +++ b/src/svc_auth_des.c @@ -86,13 +86,13 @@ static struct cache_entry *authdes_cache/* [AUTHDES_CACHESZ] */; static short *authdes_lru/* [AUTHDES_CACHESZ] */; static void cache_init(); /* initialize the cache */ -static short cache_spot(); /* find an entry in the cache */ -static void cache_ref(/*short sid*/); /* note that sid was ref'd */ +static short cache_spot(des_block *key, char *name, struct timeval *timestamp); /* find an entry in the cache */ +static void cache_ref(short sid); /* note that sid was ref'd */ -static void invalidate(); /* invalidate entry in cache */ +static void invalidate(char *cred); /* invalidate entry in cache */ /* - * cache statistics + * cache statistics */ static struct { u_long ncachehits; /* times cache hit, and is not replay */ -- 1.8.5.6 ++++++ 009-makefd_xprt-checks-that-the-filedesriptor-is-lower-t.patch ++++++ >From 6be6ad4fe3ada0b1b80228de0fde4ebad9879915 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Thu, 25 Feb 2016 12:59:00 +0100 Subject: [PATCH 4/5] makefd_xprt() checks that the filedesriptor is lower than FD_SETSIZE. But with tirpc now using poll(), this limitation does not exist anymore. Remove the check completly. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/svc_vc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/svc_vc.c b/src/svc_vc.c index 6ae613d..7415244 100644 --- a/src/svc_vc.c +++ b/src/svc_vc.c @@ -270,14 +270,8 @@ makefd_xprt(fd, sendsize, recvsize) struct cf_conn *cd; const char *netid; struct __rpc_sockinfo si; - - assert(fd != -1); - if (fd >= FD_SETSIZE) { - warnx("svc_vc: makefd_xprt: fd too high\n"); - xprt = NULL; - goto done; - } + assert(fd != -1); xprt = mem_alloc(sizeof(SVCXPRT)); if (xprt == NULL) { -- 1.8.5.6 ++++++ 010-The-goto-again-statement-was-an-left-over-from-the-p.patch ++++++ >From 3f4eb06275519308e74e103a0c7681adbd13b7b3 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Thu, 25 Feb 2016 13:01:20 +0100 Subject: [PATCH 5/5] The goto again statement was an left over from the port to poll() interface and needs to be removed. Else we will end in an endless loop in case we run out of filedescriptors. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/svc_vc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/svc_vc.c b/src/svc_vc.c index 7415244..d2135c5 100644 --- a/src/svc_vc.c +++ b/src/svc_vc.c @@ -346,7 +346,6 @@ again: descriptors. */ struct timespec ts = { .tv_sec = 0, .tv_nsec = 50000000 }; nanosleep (&ts, NULL); - goto again; } return (FALSE); } -- 1.8.5.6 ++++++ 011-Fix-typo-in-src-libtirpc.map-which-prevents-that-key.patch ++++++ >From d82f4ca72a7fa638d26eaf68c6ef86bbf1f8fe6f Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Mon, 14 Mar 2016 11:04:25 +0100 Subject: [PATCH 1/1] Fix typo in src/libtirpc.map, which prevents that key_secretkey_is_set will be exported. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/libtirpc.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtirpc.map b/src/libtirpc.map index f385de5..21d6065 100644 --- a/src/libtirpc.map +++ b/src/libtirpc.map @@ -298,7 +298,7 @@ TIRPC_0.3.2 { key_gendes; key_get_conv; key_setsecret; - key_secret_is_set; + key_secretkey_is_set; key_setnet; netname2host; netname2user; -- 1.8.5.6 ++++++ 012-libtirpc-needs-rpcsvc-nis.h-for-compiling-but-does-n.patch ++++++ >From c4230a45c0daa8f65a3f777d183cba4b175a0c68 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Mon, 14 Mar 2016 11:57:08 +0100 Subject: [PATCH 2/2] libtirpc needs rpcsvc/nis.h for compiling, but does not provide this head file. It's only provided by glibc, if the sunrpc code is not marked as deprecated, and by libnsl. But libnsl needs libtirpc to compile ... Since we only need the nis_server * struct, the solution is to create an internal minimal nis.h which only contains this struct. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/auth_des.c | 4 ++-- src/auth_time.c | 4 ++-- src/nis.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/rpc_soc.c | 2 +- 4 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 src/nis.h diff --git a/src/auth_des.c b/src/auth_des.c index 4d3639e..af2f61f 100644 --- a/src/auth_des.c +++ b/src/auth_des.c @@ -46,8 +46,8 @@ #include <rpc/clnt.h> #include <rpc/xdr.h> #include <sys/socket.h> -#undef NIS -#include <rpcsvc/nis.h> + +#include "nis.h" #if defined(LIBC_SCCS) && !defined(lint) #endif diff --git a/src/auth_time.c b/src/auth_time.c index 10e58eb..7f83ab4 100644 --- a/src/auth_time.c +++ b/src/auth_time.c @@ -44,8 +44,8 @@ #include <rpc/rpcb_prot.h> //#include <clnt_soc.h> #include <sys/select.h> -#undef NIS -#include <rpcsvc/nis.h> + +#include "nis.h" #ifdef TESTING diff --git a/src/nis.h b/src/nis.h new file mode 100644 index 0000000..588c041 --- /dev/null +++ b/src/nis.h @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2010, Oracle America, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * * Neither the name of the "Oracle America, Inc." nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _INTERNAL_NIS_H +#define _INTERNAL_NIS_H 1 + +/* This file only contains the definition of nis_server, to be + able to compile libtirpc without the need to have a glibc + with sunrpc or a libnsl already installed. */ + +#define NIS_PK_NONE 0 + +struct nis_attr { + char *zattr_ndx; + struct { + u_int zattr_val_len; + char *zattr_val_val; + } zattr_val; +}; +typedef struct nis_attr nis_attr; + +typedef char *nis_name; + +struct endpoint { + char *uaddr; + char *family; + char *proto; +}; +typedef struct endpoint endpoint; + +struct nis_server { + nis_name name; + struct { + u_int ep_len; + endpoint *ep_val; + } ep; + uint32_t key_type; + netobj pkey; +}; +typedef struct nis_server nis_server; + +#endif /* ! _INTERNAL_NIS_H */ diff --git a/src/rpc_soc.c b/src/rpc_soc.c index 1ec7b3f..ed0892a 100644 --- a/src/rpc_soc.c +++ b/src/rpc_soc.c @@ -61,8 +61,8 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> -#include <rpcsvc/nis.h> +#include "nis.h" #include "rpc_com.h" extern mutex_t rpcsoc_lock; -- 1.8.5.6 ++++++ 013-If-we-don-t-compile-in-YP-support-don-t-include-YP-h.patch ++++++ >From cff41dbac81564e8305d656ca771fb0ead9f8bf8 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Mon, 14 Mar 2016 12:51:38 +0100 Subject: [PATCH 3/3] If we don't compile in YP support, don't include YP header files. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/getpublickey.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/getpublickey.c b/src/getpublickey.c index 764a5f9..8cf4dc2 100644 --- a/src/getpublickey.c +++ b/src/getpublickey.c @@ -38,8 +38,10 @@ #include <pwd.h> #include <rpc/rpc.h> #include <rpc/key_prot.h> +#ifdef YP #include <rpcsvc/yp_prot.h> #include <rpcsvc/ypclnt.h> +#endif #include <string.h> #include <stdlib.h> -- 1.8.5.6 ++++++ 014-Add-des_crypt.c-and-des_impl.c-to-become-independent.patch ++++++ >From 9d9907d55dcc9cc380c5b552e0abc6c9ff4faf75 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Mon, 14 Mar 2016 13:31:34 +0100 Subject: [PATCH 4/4] Add des_crypt.c and des_impl.c to become independent of deprecated functions of glibc. Signed-off-by: Thorsten Kukuk <[email protected]> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index e4ed8aa..fba2aa4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ - auth_time.c auth_des.c authdes_prot.c debug.c + auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c ## XDR libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -- 1.8.5.6 ++++++ 015-Fix-includes-to-compile-without-deprecated-glibc-fun.patch ++++++ >From d5e4d0651f9ecc8e7e4110f080a862746d9baa0a Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk <[email protected]> Date: Mon, 14 Mar 2016 13:43:54 +0100 Subject: [PATCH 5/5] Fix includes to compile without deprecated glibc functions Signed-off-by: Thorsten Kukuk <[email protected]> --- src/des_impl.c | 3 ++- tirpc/rpc/des.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/des_impl.c b/src/des_impl.c index c5b7ed6..9dbccaf 100644 --- a/src/des_impl.c +++ b/src/des_impl.c @@ -6,7 +6,8 @@ /* see <http://www.gnu.org/licenses/> to obtain a copy. */ #include <string.h> #include <stdint.h> -#include <rpc/rpc_des.h> +#include <sys/types.h> +#include <rpc/des.h> static const uint32_t des_SPtrans[8][64] = diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h index d2881ad..018aa48 100644 --- a/tirpc/rpc/des.h +++ b/tirpc/rpc/des.h @@ -82,6 +82,6 @@ struct desparams { /* * Software DES. */ -extern int _des_crypt( char *, int, struct desparams * ); +extern int _des_crypt( char *, unsigned, struct desparams * ); #endif -- 1.8.5.6
