diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-01-11 20:13:07 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-01-11 20:13:07 +0300 |
| commit | e668811bdcb58267414b9dc8a205fb1df21eea68 (patch) | |
| tree | b87c54c15c1b7b3af8ca23e5713255fbd0859848 /uts | |
| parent | 796cf717b6f338a6185bae2d9e294fbea6016858 (diff) | |
| download | illumos-packaging-e668811bdcb58267414b9dc8a205fb1df21eea68.tar.gz | |
rpc/svc_mt.h should not be included for kernel (missing synch.h)
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/debian/patches/rpc-rpc-h.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/uts/debian/patches/rpc-rpc-h.patch b/uts/debian/patches/rpc-rpc-h.patch index 07efa89..be3393f 100644 --- a/uts/debian/patches/rpc-rpc-h.patch +++ b/uts/debian/patches/rpc-rpc-h.patch @@ -2,7 +2,7 @@ Index: uts/usr/src/uts/common/rpc/rpc.h =================================================================== --- uts.orig/usr/src/uts/common/rpc/rpc.h +++ uts/usr/src/uts/common/rpc/rpc.h -@@ -63,16 +63,23 @@ +@@ -63,10 +63,8 @@ #include <rpc/auth_sys.h> /* protocol for unix style cred */ #include <rpc/auth_des.h> /* protocol for des style cred */ #include <sys/socket.h> /* generic socket info */ @@ -13,18 +13,17 @@ Index: uts/usr/src/uts/common/rpc/rpc.h #ifndef _KERNEL #ifndef _RPCB_PROT_H_RPCGEN /* Don't include before rpcb_prot defined */ - #include <rpc/rpcb_clnt.h> /* rpcbind interface functions */ +@@ -75,4 +73,13 @@ + #include <rpc/svc_mt.h> /* private server definitions */ #endif -+#endif -+ + + +// These headers include sys/gssapi.h +// which causes conflicts with other GSS libraries +// like heimdal. For example it causes Samba FTBFS. +#if defined (_KERNEL) || defined (__FULL_RPC_H__) +#include <rpc/rpcsec_gss.h> /* GSS style security */ - #include <rpc/svc_mt.h> /* private server definitions */ +#include <rpc/svc_auth.h> /* service side authenticator */ - #endif - ++#endif ++ #endif /* !_RPC_RPC_H */ |