diff options
author | Tom 'spot' Callaway <tcallawa@redhat.com> | 2010-08-31 13:38:21 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2010-08-31 13:38:21 -0400 |
commit | ba3945e2c7828be7926fd55d50f03db97dc7e022 (patch) | |
tree | bc56a27bc38c29d0fb03ff6ad7c7bdf660bb08b4 /src/svc_auth_des.c | |
parent | 4f4ada08b780c27398b0749b7965fd248a7f3b99 (diff) | |
download | ti-rpc-ba3945e2c7828be7926fd55d50f03db97dc7e022.tar.gz |
Fixed last remaining license issues
Three files in libtirpc have the "BSD with advertising" or "BSD 4
clause" license on them (Free, but GPL incompatible). Thankfully, two of
the three files (tirpc/libc_private.h and tirpc/nss_tls.h) aren't
necessary on Linux at all. They were copied from FreeBSD, but FreeBSD
(and NetBSD) include those headers, so they can be conditionalized out
in the code. The third header, tirpc/reentrant.h originally came from
FreeBSD, but had been modified to point to the Linux pthread equivalent
functions. I'm pretty sure that would cause the code to break on
FreeBSD/NetBSD.
This patch does the following:
- Zeros out tirpc/libc_private.h (This file should be deleted from the
source control)
- Zeros out tirpc/nss_tls.h (This file should be deleted from the source
control)
- Takes a fresh copy of tirpc/reentrant.h from FreeBSD CVS to inherit
the new license (the advertising clause has been dropped in FreeBSD)
- Updates tirpc/reentrant.h so that it contains the correct definition
mappings for Linux, conditionalized only for Linux.
- Updates all source files which #include libc_private.h so that the
include is conditionalized on FreeBSD or NetBSD. I honestly don't think
these files even need to be included on those platforms, but I'd rather
be safe than sorry here.
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'src/svc_auth_des.c')
-rw-r--r-- | src/svc_auth_des.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c index 479334f..e0ff6cb 100644 --- a/src/svc_auth_des.c +++ b/src/svc_auth_des.c @@ -60,7 +60,9 @@ #include <rpc/svc.h> #include <rpc/rpc_msg.h> #include <rpc/svc_auth.h> +#if defined(__FreeBSD__) || defined(__NetBSD__) #include <libc_private.h> +#endif extern int key_decryptsession_pk(const char *, netobj *, des_block *); |