1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
Description: rpc/rpc.h was refactored to fix conflicts
of several gssapi.h headers. Now some hearder must be
included directly.
Index: b/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h
===================================================================
--- a/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h
+++ b/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h
@@ -39,6 +39,7 @@ extern "C" {
#include <rpc/rpc.h>
#include <rpc/key_prot.h>
+#include <rpc/rpcsec_gss.h>
#include <rpcsvc/nis.h> /* to get nis_server */
Index: b/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c
===================================================================
--- a/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c
+++ b/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c
@@ -34,7 +34,7 @@
#include <syslog.h>
#include <string.h>
#include <unistd.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
#include <rpc/rpc.h>
#include <rpcsvc/nis.h>
#include <rpcsvc/nis_dhext.h>
@@ -48,7 +48,6 @@
#include <netinet/in.h>
#include <netdb.h>
#include <dlfcn.h>
-#include <gssapi/gssapi.h>
extern int bin2hex(int len, unsigned char *binnum, char *hexnum);
extern int hex2bin(int len, char *hexnum, char *binnum);
Index: b/usr/src/lib/libnsl/rpc/rpc_mt.h
===================================================================
--- a/usr/src/lib/libnsl/rpc/rpc_mt.h
+++ b/usr/src/lib/libnsl/rpc/rpc_mt.h
@@ -35,6 +35,9 @@
#include <sys/types.h>
#include <rpc/rpc.h>
+#include <rpc/rpcsec_gss.h>
+#include <rpc/svc_mt.h>
+#include <rpc/svc_auth.h>
#include <netconfig.h>
#ifdef __cplusplus
Index: b/usr/src/lib/libnsl/rpc/ti_opts.c
===================================================================
--- a/usr/src/lib/libnsl/rpc/ti_opts.c
+++ b/usr/src/lib/libnsl/rpc/ti_opts.c
@@ -47,6 +47,8 @@
#include <net/if.h>
#include <sys/sockio.h>
#include <rpc/rpc.h>
+#include <rpc/rpcsec_gss.h>
+#include <rpc/svc_mt.h>
#include <sys/tl.h>
#include <sys/stropts.h>
#include <errno.h>
|