diff options
Diffstat (limited to 'uts/debian/patches/rpc-rpc-h.patch')
| -rw-r--r-- | uts/debian/patches/rpc-rpc-h.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/uts/debian/patches/rpc-rpc-h.patch b/uts/debian/patches/rpc-rpc-h.patch new file mode 100644 index 0000000..07efa89 --- /dev/null +++ b/uts/debian/patches/rpc-rpc-h.patch @@ -0,0 +1,30 @@ +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 @@ + #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 */ +-#include <rpc/rpcsec_gss.h> /* GSS style security */ + + #include <rpc/svc.h> /* service manager and multiplexer */ +-#include <rpc/svc_auth.h> /* service side authenticator */ + + #ifndef _KERNEL + #ifndef _RPCB_PROT_H_RPCGEN /* Don't include before rpcb_prot defined */ + #include <rpc/rpcb_clnt.h> /* rpcbind interface functions */ + #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 /* !_RPC_RPC_H */ |