25 # |
25 # |
26 # This patch is Solaris specific and is not intended for upstream contribution. |
26 # This patch is Solaris specific and is not intended for upstream contribution. |
27 # In the future MIT might provide support for system native RPC implementation. |
27 # In the future MIT might provide support for system native RPC implementation. |
28 # Patch source: in-house |
28 # Patch source: in-house |
29 # |
29 # |
30 diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in |
|
31 --- a/src/build-tools/krb5-config.in |
30 --- a/src/build-tools/krb5-config.in |
32 +++ b/src/build-tools/krb5-config.in |
31 +++ b/src/build-tools/krb5-config.in |
33 @@ -97,9 +97,6 @@ while test $# != 0; do |
32 @@ -97,9 +97,6 @@ while test $# != 0; do |
34 gssapi) |
33 gssapi) |
35 library=gssapi |
34 library=gssapi |
64 - lib_flags="$lib_flags -lgssrpc" |
63 - lib_flags="$lib_flags -lgssrpc" |
65 - library=gssapi |
64 - library=gssapi |
66 fi |
65 fi |
67 |
66 |
68 if test $library = 'gssapi'; then |
67 if test $library = 'gssapi'; then |
69 diff --git a/src/config/pre.in b/src/config/pre.in |
|
70 --- a/src/config/pre.in |
68 --- a/src/config/pre.in |
71 +++ b/src/config/pre.in |
69 +++ b/src/config/pre.in |
72 @@ -318,7 +318,7 @@ KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@ |
70 @@ -318,7 +318,7 @@ KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@ |
73 KADMCLNT_DEPLIB = $(TOPLIBD)/libkadm5clnt_mit$(DEPLIBEXT) |
71 KADMCLNT_DEPLIB = $(TOPLIBD)/libkadm5clnt_mit$(DEPLIBEXT) |
74 KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv_mit$(DEPLIBEXT) |
72 KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv_mit$(DEPLIBEXT) |
85 -GSSRPC_LIBS = -lgssrpc $(GSS_LIBS) |
83 -GSSRPC_LIBS = -lgssrpc $(GSS_LIBS) |
86 +GSSRPC_LIBS = $(GSS_LIBS) |
84 +GSSRPC_LIBS = $(GSS_LIBS) |
87 KADM_COMM_LIBS = $(GSSRPC_LIBS) |
85 KADM_COMM_LIBS = $(GSSRPC_LIBS) |
88 # need fixing if ever used on Mac OS X! |
86 # need fixing if ever used on Mac OS X! |
89 KADMSRV_LIBS = -lkadm5srv_mit $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS) |
87 KADMSRV_LIBS = -lkadm5srv_mit $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS) |
90 diff --git a/src/include/iprop.h b/src/include/iprop.h |
|
91 --- a/src/include/iprop.h |
88 --- a/src/include/iprop.h |
92 +++ b/src/include/iprop.h |
89 +++ b/src/include/iprop.h |
93 @@ -6,8 +6,7 @@ |
90 @@ -6,8 +6,7 @@ |
94 #ifndef _IPROP_H_RPCGEN |
91 #ifndef _IPROP_H_RPCGEN |
95 #define _IPROP_H_RPCGEN |
92 #define _IPROP_H_RPCGEN |
98 - |
95 - |
99 +#include <rpc/rpc.h> |
96 +#include <rpc/rpc.h> |
100 |
97 |
101 #ifdef __cplusplus |
98 #ifdef __cplusplus |
102 extern "C" { |
99 extern "C" { |
103 diff --git a/src/include/k5-int.h b/src/include/k5-int.h |
|
104 --- a/src/include/k5-int.h |
100 --- a/src/include/k5-int.h |
105 +++ b/src/include/k5-int.h |
101 +++ b/src/include/k5-int.h |
106 @@ -218,11 +218,14 @@ typedef unsigned char u_char; |
102 @@ -218,11 +218,14 @@ typedef unsigned char u_char; |
107 #define KRB5_CONF_HTTP_ANCHORS "http_anchors" |
103 #define KRB5_CONF_HTTP_ANCHORS "http_anchors" |
108 #define KRB5_CONF_IGNORE_ACCEPTOR_HOSTNAME "ignore_acceptor_hostname" |
104 #define KRB5_CONF_IGNORE_ACCEPTOR_HOSTNAME "ignore_acceptor_hostname" |
116 #define KRB5_CONF_IPROP_SLAVE_POLL "iprop_slave_poll" |
112 #define KRB5_CONF_IPROP_SLAVE_POLL "iprop_slave_poll" |
117 +#define KRB5_CONF_SUNW_DBPROP_SLAVE_POLL "sunw_dbprop_slave_poll" |
113 +#define KRB5_CONF_SUNW_DBPROP_SLAVE_POLL "sunw_dbprop_slave_poll" |
118 #define KRB5_CONF_K5LOGIN_AUTHORITATIVE "k5login_authoritative" |
114 #define KRB5_CONF_K5LOGIN_AUTHORITATIVE "k5login_authoritative" |
119 #define KRB5_CONF_K5LOGIN_DIRECTORY "k5login_directory" |
115 #define KRB5_CONF_K5LOGIN_DIRECTORY "k5login_directory" |
120 #define KRB5_CONF_KADMIND_PORT "kadmind_port" |
116 #define KRB5_CONF_KADMIND_PORT "kadmind_port" |
121 diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c |
|
122 --- a/src/kadmin/dbutil/kadm5_create.c |
117 --- a/src/kadmin/dbutil/kadm5_create.c |
123 +++ b/src/kadmin/dbutil/kadm5_create.c |
118 +++ b/src/kadmin/dbutil/kadm5_create.c |
124 @@ -158,11 +158,20 @@ static int add_admin_princs(void *handle, krb5_context context, char *realm) |
119 @@ -158,11 +158,20 @@ static int add_admin_princs(void *handle, krb5_context context, char *realm) |
125 ADMIN_LIFETIME))) |
120 ADMIN_LIFETIME))) |
126 goto clean_and_exit; |
121 goto clean_and_exit; |
140 goto clean_and_exit; |
135 goto clean_and_exit; |
141 +#endif |
136 +#endif |
142 |
137 |
143 if ((ret = add_admin_princ(handle, context, |
138 if ((ret = add_admin_princ(handle, context, |
144 KADM5_CHANGEPW_SERVICE, realm, |
139 KADM5_CHANGEPW_SERVICE, realm, |
145 diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c |
|
146 --- a/src/kadmin/server/ipropd_svc.c |
140 --- a/src/kadmin/server/ipropd_svc.c |
147 +++ b/src/kadmin/server/ipropd_svc.c |
141 +++ b/src/kadmin/server/ipropd_svc.c |
148 @@ -137,6 +137,8 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp) |
142 @@ -137,6 +137,8 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp) |
149 kadm5_server_handle_t handle = global_server_handle; |
143 kadm5_server_handle_t handle = global_server_handle; |
150 char *client_name = 0, *service_name = 0; |
144 char *client_name = 0, *service_name = 0; |
280 @@ -337,3 +338,4 @@ gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name, |
273 @@ -337,3 +338,4 @@ gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name, |
281 free(str); |
274 free(str); |
282 return success; |
275 return success; |
283 } |
276 } |
284 +#endif |
277 +#endif |
285 diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c |
|
286 --- a/src/kadmin/server/ovsec_kadmd.c |
278 --- a/src/kadmin/server/ovsec_kadmd.c |
287 +++ b/src/kadmin/server/ovsec_kadmd.c |
279 +++ b/src/kadmin/server/ovsec_kadmd.c |
288 @@ -45,10 +45,9 @@ |
280 @@ -45,10 +45,9 @@ |
289 #include <unistd.h> |
281 #include <unistd.h> |
290 #include <netinet/in.h> |
282 #include <netinet/in.h> |
453 - free(names[i].name); |
445 - free(names[i].name); |
454 + free(names[i]); |
446 + free(names[i]); |
455 |
447 |
456 krb5_klog_close(context); |
448 krb5_klog_close(context); |
457 krb5_free_context(context); |
449 krb5_free_context(context); |
458 diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c |
|
459 --- a/src/kadmin/server/server_stubs.c |
450 --- a/src/kadmin/server/server_stubs.c |
460 +++ b/src/kadmin/server/server_stubs.c |
451 +++ b/src/kadmin/server/server_stubs.c |
461 @@ -21,10 +21,10 @@ extern gss_name_t gss_changepw_name; |
452 @@ -21,10 +21,10 @@ extern gss_name_t gss_changepw_name; |
462 extern gss_name_t gss_oldchangepw_name; |
453 extern gss_name_t gss_oldchangepw_name; |
463 extern void * global_server_handle; |
454 extern void * global_server_handle; |
1409 + if (maj_stat != GSS_S_COMPLETE) { |
1400 + if (maj_stat != GSS_S_COMPLETE) { |
1410 + return (NULL); |
1401 + return (NULL); |
1411 + } |
1402 + } |
1412 + return (name); |
1403 + return (name); |
1413 } |
1404 } |
1414 diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in |
|
1415 --- a/src/lib/Makefile.in |
1405 --- a/src/lib/Makefile.in |
1416 +++ b/src/lib/Makefile.in |
1406 +++ b/src/lib/Makefile.in |
1417 @@ -1,5 +1,5 @@ |
1407 @@ -1,5 +1,5 @@ |
1418 mydir=lib |
1408 mydir=lib |
1419 -SUBDIRS=crypto krb5 gssapi rpc kdb kadm5 apputils krad |
1409 -SUBDIRS=crypto krb5 gssapi rpc kdb kadm5 apputils krad |
1420 +SUBDIRS=crypto krb5 gssapi kdb kadm5 apputils krad |
1410 +SUBDIRS=crypto krb5 gssapi kdb kadm5 apputils krad |
1421 WINSUBDIRS=crypto krb5 gssapi |
1411 WINSUBDIRS=crypto krb5 gssapi |
1422 BUILDTOP=$(REL).. |
1412 BUILDTOP=$(REL).. |
1423 |
1413 |
1424 diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c |
|
1425 --- a/src/lib/apputils/net-server.c |
1414 --- a/src/lib/apputils/net-server.c |
1426 +++ b/src/lib/apputils/net-server.c |
1415 +++ b/src/lib/apputils/net-server.c |
1427 @@ -32,7 +32,7 @@ |
1416 @@ -32,7 +32,7 @@ |
1428 #include "port-sockets.h" |
1417 #include "port-sockets.h" |
1429 #include "socket-utils.h" |
1418 #include "socket-utils.h" |
1744 + endnetconfig(handlep); |
1733 + endnetconfig(handlep); |
1745 + return ret; |
1734 + return ret; |
1746 } |
1735 } |
1747 |
1736 |
1748 #if defined(CMSG_SPACE) && defined(HAVE_STRUCT_CMSGHDR) && \ |
1737 #if defined(CMSG_SPACE) && defined(HAVE_STRUCT_CMSGHDR) && \ |
1749 diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in |
|
1750 --- a/src/lib/kadm5/Makefile.in |
1738 --- a/src/lib/kadm5/Makefile.in |
1751 +++ b/src/lib/kadm5/Makefile.in |
1739 +++ b/src/lib/kadm5/Makefile.in |
1752 @@ -21,6 +21,7 @@ SRCS = kadm_err.c \ |
1740 @@ -21,6 +21,7 @@ SRCS = kadm_err.c \ |
1753 $(srcdir)/chpass_util.c \ |
1741 $(srcdir)/chpass_util.c \ |
1754 $(srcdir)/alt_prof.c \ |
1742 $(srcdir)/alt_prof.c \ |
1771 str_conv.o \ |
1759 str_conv.o \ |
1772 + kadm_host_srv_names.o \ |
1760 + kadm_host_srv_names.o \ |
1773 logger.o |
1761 logger.o |
1774 |
1762 |
1775 HDRDIR=$(BUILDTOP)/include/kadm5 |
1763 HDRDIR=$(BUILDTOP)/include/kadm5 |
1776 diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h |
|
1777 --- a/src/lib/kadm5/admin.h |
1764 --- a/src/lib/kadm5/admin.h |
1778 +++ b/src/lib/kadm5/admin.h |
1765 +++ b/src/lib/kadm5/admin.h |
1779 @@ -42,7 +42,7 @@ |
1766 @@ -42,7 +42,7 @@ |
1780 #define __KADM5_ADMIN_H__ |
1767 #define __KADM5_ADMIN_H__ |
1781 |
1768 |
1813 +free_srv_names(char **srv_names); |
1800 +free_srv_names(char **srv_names); |
1814 + |
1801 + |
1815 krb5_error_code kadm5_init_krb5_context (krb5_context *); |
1802 krb5_error_code kadm5_init_krb5_context (krb5_context *); |
1816 |
1803 |
1817 krb5_error_code kadm5_init_iprop(void *server_handle, char **db_args); |
1804 krb5_error_code kadm5_init_iprop(void *server_handle, char **db_args); |
1818 diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c |
|
1819 --- a/src/lib/kadm5/alt_prof.c |
1805 --- a/src/lib/kadm5/alt_prof.c |
1820 +++ b/src/lib/kadm5/alt_prof.c |
1806 +++ b/src/lib/kadm5/alt_prof.c |
1821 @@ -746,10 +746,17 @@ krb5_error_code kadm5_get_config_params(krb5_context context, |
1807 @@ -746,10 +746,17 @@ krb5_error_code kadm5_get_config_params(krb5_context context, |
1822 params.mask |= KADM5_CONFIG_IPROP_ENABLED; |
1808 params.mask |= KADM5_CONFIG_IPROP_ENABLED; |
1823 params.iprop_enabled = params_in->iprop_enabled; |
1809 params.iprop_enabled = params_in->iprop_enabled; |
1877 + GET_DELTAT_PARAM(iprop_poll_time, KADM5_CONFIG_POLL_TIME, |
1863 + GET_DELTAT_PARAM(iprop_poll_time, KADM5_CONFIG_POLL_TIME, |
1878 + KRB5_CONF_IPROP_SLAVE_POLL, params.iprop_poll_time); |
1864 + KRB5_CONF_IPROP_SLAVE_POLL, params.iprop_poll_time); |
1879 |
1865 |
1880 *params_out = params; |
1866 *params_out = params; |
1881 |
1867 |
1882 diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in |
|
1883 --- a/src/lib/kadm5/clnt/Makefile.in |
1868 --- a/src/lib/kadm5/clnt/Makefile.in |
1884 +++ b/src/lib/kadm5/clnt/Makefile.in |
1869 +++ b/src/lib/kadm5/clnt/Makefile.in |
1885 @@ -7,12 +7,11 @@ LIBMAJOR=10 |
1870 @@ -7,12 +7,11 @@ LIBMAJOR=10 |
1886 LIBMINOR=0 |
1871 LIBMINOR=0 |
1887 STOBJLISTS=../OBJS.ST OBJS.ST |
1872 STOBJLISTS=../OBJS.ST OBJS.ST |
1894 -SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS) |
1879 -SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS) |
1895 +SHLIB_EXPLIBS= -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS) |
1880 +SHLIB_EXPLIBS= -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS) |
1896 RELDIR=kadm5/clnt |
1881 RELDIR=kadm5/clnt |
1897 |
1882 |
1898 ##DOSBUILDTOP = ..\..\.. |
1883 ##DOSBUILDTOP = ..\..\.. |
1899 diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c |
|
1900 --- a/src/lib/kadm5/clnt/client_init.c |
1884 --- a/src/lib/kadm5/clnt/client_init.c |
1901 +++ b/src/lib/kadm5/clnt/client_init.c |
1885 +++ b/src/lib/kadm5/clnt/client_init.c |
1902 @@ -44,12 +44,12 @@ |
1886 @@ -44,12 +44,12 @@ |
1903 #include <iprop_hdr.h> |
1887 #include <iprop_hdr.h> |
1904 #include "iprop.h" |
1888 #include "iprop.h" |
2529 -#include <gssrpc/rpc.h> |
2512 -#include <gssrpc/rpc.h> |
2530 +#include <rpc/rpc.h> |
2513 +#include <rpc/rpc.h> |
2531 #include <kadm5/admin.h> |
2514 #include <kadm5/admin.h> |
2532 #include <kadm5/kadm_rpc.h> |
2515 #include <kadm5/kadm_rpc.h> |
2533 #ifdef HAVE_MEMORY_H |
2516 #ifdef HAVE_MEMORY_H |
2534 diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c |
|
2535 --- a/src/lib/kadm5/clnt/client_rpc.c |
2517 --- a/src/lib/kadm5/clnt/client_rpc.c |
2536 +++ b/src/lib/kadm5/clnt/client_rpc.c |
2518 +++ b/src/lib/kadm5/clnt/client_rpc.c |
2537 @@ -1,5 +1,5 @@ |
2519 @@ -1,5 +1,5 @@ |
2538 /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */ |
2520 /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */ |
2539 -#include <gssrpc/rpc.h> |
2521 -#include <gssrpc/rpc.h> |
2540 +#include <rpc/rpc.h> |
2522 +#include <rpc/rpc.h> |
2541 #include <kadm5/kadm_rpc.h> |
2523 #include <kadm5/kadm_rpc.h> |
2542 #include <krb5.h> |
2524 #include <krb5.h> |
2543 #include <kadm5/admin.h> |
2525 #include <kadm5/admin.h> |
2544 diff --git a/src/lib/kadm5/clnt/clnt_policy.c b/src/lib/kadm5/clnt/clnt_policy.c |
|
2545 --- a/src/lib/kadm5/clnt/clnt_policy.c |
2526 --- a/src/lib/kadm5/clnt/clnt_policy.c |
2546 +++ b/src/lib/kadm5/clnt/clnt_policy.c |
2527 +++ b/src/lib/kadm5/clnt/clnt_policy.c |
2547 @@ -5,7 +5,7 @@ |
2528 @@ -5,7 +5,7 @@ |
2548 * $Header$ |
2529 * $Header$ |
2549 */ |
2530 */ |
2551 -#include <gssrpc/rpc.h> |
2532 -#include <gssrpc/rpc.h> |
2552 +#include <rpc/rpc.h> |
2533 +#include <rpc/rpc.h> |
2553 #include <kadm5/admin.h> |
2534 #include <kadm5/admin.h> |
2554 #include <kadm5/kadm_rpc.h> |
2535 #include <kadm5/kadm_rpc.h> |
2555 #include "client_internal.h" |
2536 #include "client_internal.h" |
2556 diff --git a/src/lib/kadm5/clnt/clnt_privs.c b/src/lib/kadm5/clnt/clnt_privs.c |
|
2557 --- a/src/lib/kadm5/clnt/clnt_privs.c |
2537 --- a/src/lib/kadm5/clnt/clnt_privs.c |
2558 +++ b/src/lib/kadm5/clnt/clnt_privs.c |
2538 +++ b/src/lib/kadm5/clnt/clnt_privs.c |
2559 @@ -7,7 +7,7 @@ |
2539 @@ -7,7 +7,7 @@ |
2560 * |
2540 * |
2561 */ |
2541 */ |
2563 -#include <gssrpc/rpc.h> |
2543 -#include <gssrpc/rpc.h> |
2564 +#include <rpc/rpc.h> |
2544 +#include <rpc/rpc.h> |
2565 #include <kadm5/admin.h> |
2545 #include <kadm5/admin.h> |
2566 #include <kadm5/kadm_rpc.h> |
2546 #include <kadm5/kadm_rpc.h> |
2567 #include "client_internal.h" |
2547 #include "client_internal.h" |
2568 diff --git a/src/lib/kadm5/deps b/src/lib/kadm5/deps |
|
2569 --- a/src/lib/kadm5/deps |
2548 --- a/src/lib/kadm5/deps |
2570 +++ b/src/lib/kadm5/deps |
2549 +++ b/src/lib/kadm5/deps |
2571 @@ -90,6 +90,20 @@ str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ |
2550 @@ -90,6 +90,20 @@ str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ |
2572 $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \ |
2551 $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \ |
2573 $(top_srcdir)/include/socket-utils.h admin_internal.h \ |
2552 $(top_srcdir)/include/socket-utils.h admin_internal.h \ |
2587 + $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \ |
2566 + $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \ |
2588 + $(top_srcdir)/include/socket-utils.h admin.h kadm_host_srv_names.c |
2567 + $(top_srcdir)/include/socket-utils.h admin.h kadm_host_srv_names.c |
2589 logger.so logger.po $(OUTPRE)logger.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ |
2568 logger.so logger.po $(OUTPRE)logger.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ |
2590 $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ |
2569 $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ |
2591 $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/adm_proto.h \ |
2570 $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/adm_proto.h \ |
2592 diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h |
|
2593 --- a/src/lib/kadm5/kadm_rpc.h |
2571 --- a/src/lib/kadm5/kadm_rpc.h |
2594 +++ b/src/lib/kadm5/kadm_rpc.h |
2572 +++ b/src/lib/kadm5/kadm_rpc.h |
2595 @@ -2,7 +2,7 @@ |
2573 @@ -2,7 +2,7 @@ |
2596 #ifndef __KADM_RPC_H__ |
2574 #ifndef __KADM_RPC_H__ |
2597 #define __KADM_RPC_H__ |
2575 #define __KADM_RPC_H__ |
2608 +/* Solaris libc doesn't define 32 bit version of xdr_int and xdr_u_int */ |
2586 +/* Solaris libc doesn't define 32 bit version of xdr_int and xdr_u_int */ |
2609 +#define xdr_int32 xdr_int |
2587 +#define xdr_int32 xdr_int |
2610 +#define xdr_u_int32 xdr_u_int |
2588 +#define xdr_u_int32 xdr_u_int |
2611 |
2589 |
2612 #endif /* __KADM_RPC_H__ */ |
2590 #endif /* __KADM_RPC_H__ */ |
2613 diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c |
|
2614 --- a/src/lib/kadm5/kadm_rpc_xdr.c |
2591 --- a/src/lib/kadm5/kadm_rpc_xdr.c |
2615 +++ b/src/lib/kadm5/kadm_rpc_xdr.c |
2592 +++ b/src/lib/kadm5/kadm_rpc_xdr.c |
2616 @@ -3,7 +3,7 @@ |
2593 @@ -3,7 +3,7 @@ |
2617 * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved |
2594 * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved |
2618 */ |
2595 */ |
2620 -#include <gssrpc/rpc.h> |
2597 -#include <gssrpc/rpc.h> |
2621 +#include <rpc/rpc.h> |
2598 +#include <rpc/rpc.h> |
2622 #include <krb5.h> |
2599 #include <krb5.h> |
2623 #include <errno.h> |
2600 #include <errno.h> |
2624 #include <kadm5/admin.h> |
2601 #include <kadm5/admin.h> |
2625 diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h |
|
2626 --- a/src/lib/kadm5/server_internal.h |
2602 --- a/src/lib/kadm5/server_internal.h |
2627 +++ b/src/lib/kadm5/server_internal.h |
2603 +++ b/src/lib/kadm5/server_internal.h |
2628 @@ -264,4 +264,8 @@ k5_kadm5_hook_rename (krb5_context context, |
2604 @@ -264,4 +264,8 @@ k5_kadm5_hook_rename (krb5_context context, |
2629 |
2605 |
2630 /** @}*/ |
2606 /** @}*/ |
2632 +/* Solaris Kerberos: symbols available in libkadm5srv_mit */ |
2608 +/* Solaris Kerberos: symbols available in libkadm5srv_mit */ |
2633 +extern void xdralloc_create(XDR *xdrs, enum xdr_op op); |
2609 +extern void xdralloc_create(XDR *xdrs, enum xdr_op op); |
2634 +extern caddr_t xdralloc_getdata(XDR *xdrs); |
2610 +extern caddr_t xdralloc_getdata(XDR *xdrs); |
2635 + |
2611 + |
2636 #endif /* __KADM5_SERVER_INTERNAL_H__ */ |
2612 #endif /* __KADM5_SERVER_INTERNAL_H__ */ |
2637 diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in |
|
2638 --- a/src/lib/kadm5/srv/Makefile.in |
2613 --- a/src/lib/kadm5/srv/Makefile.in |
2639 +++ b/src/lib/kadm5/srv/Makefile.in |
2614 +++ b/src/lib/kadm5/srv/Makefile.in |
2640 @@ -14,13 +14,12 @@ LIBMINOR=0 |
2615 @@ -14,13 +14,12 @@ LIBMINOR=0 |
2641 STOBJLISTS=../OBJS.ST OBJS.ST |
2616 STOBJLISTS=../OBJS.ST OBJS.ST |
2642 |
2617 |
2689 -#include <gssrpc/rpc.h> |
2663 -#include <gssrpc/rpc.h> |
2690 +#include <rpc/rpc.h> |
2664 +#include <rpc/rpc.h> |
2691 #include "server_internal.h" |
2665 #include "server_internal.h" |
2692 #include "admin_xdr.h" |
2666 #include "admin_xdr.h" |
2693 #ifdef HAVE_MEMORY_H |
2667 #ifdef HAVE_MEMORY_H |
2694 diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c |
|
2695 --- a/src/lib/kadm5/srv/server_init.c |
2668 --- a/src/lib/kadm5/srv/server_init.c |
2696 +++ b/src/lib/kadm5/srv/server_init.c |
2669 +++ b/src/lib/kadm5/srv/server_init.c |
2697 @@ -233,8 +233,7 @@ kadm5_ret_t kadm5_init(krb5_context context, char *client_name, char *pass, |
2670 @@ -233,8 +233,7 @@ kadm5_ret_t kadm5_init(krb5_context context, char *client_name, char *pass, |
2698 |
2671 |
2699 #define IPROP_REQUIRED_PARAMS \ |
2672 #define IPROP_REQUIRED_PARAMS \ |
2701 - KADM5_CONFIG_IPROP_LOGFILE | \ |
2674 - KADM5_CONFIG_IPROP_LOGFILE | \ |
2702 - KADM5_CONFIG_IPROP_PORT) |
2675 - KADM5_CONFIG_IPROP_PORT) |
2703 + KADM5_CONFIG_IPROP_LOGFILE) |
2676 + KADM5_CONFIG_IPROP_LOGFILE) |
2704 |
2677 |
2705 if ((handle->params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) { |
2678 if ((handle->params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) { |
2706 free_db_args(handle); |
2679 kadm5_free_config_params(handle->context, &handle->params); |
2707 diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in |
|
2708 --- a/src/lib/kdb/Makefile.in |
2680 --- a/src/lib/kdb/Makefile.in |
2709 +++ b/src/lib/kdb/Makefile.in |
2681 +++ b/src/lib/kdb/Makefile.in |
2710 @@ -14,9 +14,8 @@ RELDIR=kdb |
2682 @@ -14,9 +14,8 @@ RELDIR=kdb |
2711 |
2683 |
2712 SHLIB_EXPDEPS = \ |
2684 SHLIB_EXPDEPS = \ |
2716 -SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS) |
2688 -SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS) |
2717 +SHLIB_EXPLIBS= -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS) |
2689 +SHLIB_EXPLIBS= -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS) |
2718 |
2690 |
2719 adb_err.$(OBJEXT): adb_err.c |
2691 adb_err.$(OBJEXT): adb_err.c |
2720 adb_err.c adb_err.h: $(srcdir)/adb_err.et |
2692 adb_err.c adb_err.h: $(srcdir)/adb_err.et |
2721 diff --git a/src/lib/kdb/iprop_xdr.c b/src/lib/kdb/iprop_xdr.c |
|
2722 --- a/src/lib/kdb/iprop_xdr.c |
2693 --- a/src/lib/kdb/iprop_xdr.c |
2723 +++ b/src/lib/kdb/iprop_xdr.c |
2694 +++ b/src/lib/kdb/iprop_xdr.c |
2724 @@ -9,6 +9,7 @@ |
2695 @@ -9,6 +9,7 @@ |
2725 #pragma GCC diagnostic ignored "-Wunused-variable" |
2696 #pragma GCC diagnostic ignored "-Wunused-variable" |
2726 #endif |
2697 #endif |
2735 } |
2706 } |
2736 +#endif |
2707 +#endif |
2737 |
2708 |
2738 bool_t |
2709 bool_t |
2739 xdr_utf8str_t (XDR *xdrs, utf8str_t *objp) |
2710 xdr_utf8str_t (XDR *xdrs, utf8str_t *objp) |
2740 diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c |
|
2741 --- a/src/lib/krb5/os/changepw.c |
2711 --- a/src/lib/krb5/os/changepw.c |
2742 +++ b/src/lib/krb5/os/changepw.c |
2712 +++ b/src/lib/krb5/os/changepw.c |
2743 @@ -57,7 +57,7 @@ struct sendto_callback_context { |
2713 @@ -57,7 +57,7 @@ struct sendto_callback_context { |
2744 * Wrapper function for the two backends |
2714 * Wrapper function for the two backends |
2745 */ |
2715 */ |
2747 -static krb5_error_code |
2717 -static krb5_error_code |
2748 +krb5_error_code |
2718 +krb5_error_code |
2749 locate_kpasswd(krb5_context context, const krb5_data *realm, |
2719 locate_kpasswd(krb5_context context, const krb5_data *realm, |
2750 struct serverlist *serverlist, krb5_boolean no_udp) |
2720 struct serverlist *serverlist, krb5_boolean no_udp) |
2751 { |
2721 { |
2752 diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c |
|
2753 --- a/src/lib/krb5/os/locate_kdc.c |
2722 --- a/src/lib/krb5/os/locate_kdc.c |
2754 +++ b/src/lib/krb5/os/locate_kdc.c |
2723 +++ b/src/lib/krb5/os/locate_kdc.c |
2755 @@ -675,6 +675,14 @@ k5_locate_kdc(krb5_context context, const krb5_data *realm, |
2724 @@ -675,6 +675,14 @@ k5_locate_kdc(krb5_context context, const krb5_data *realm, |
2756 return k5_locate_server(context, realm, serverlist, stype, no_udp); |
2725 return k5_locate_server(context, realm, serverlist, stype, no_udp); |
2757 } |
2726 } |
2765 +} |
2734 +} |
2766 + |
2735 + |
2767 krb5_boolean |
2736 krb5_boolean |
2768 k5_kdc_is_master(krb5_context context, const krb5_data *realm, |
2737 k5_kdc_is_master(krb5_context context, const krb5_data *realm, |
2769 struct server_entry *server) |
2738 struct server_entry *server) |
2770 diff --git a/src/lib/rpc/xdr_alloc.c b/src/lib/rpc/xdr_alloc.c |
|
2771 --- a/src/lib/rpc/xdr_alloc.c |
2739 --- a/src/lib/rpc/xdr_alloc.c |
2772 +++ b/src/lib/rpc/xdr_alloc.c |
2740 +++ b/src/lib/rpc/xdr_alloc.c |
2773 @@ -35,18 +35,23 @@ |
2741 @@ -35,18 +35,23 @@ |
2774 * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved. |
2742 * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved. |
2775 */ |
2743 */ |
2890 +extern void xdralloc_create(XDR *, enum xdr_op); |
2857 +extern void xdralloc_create(XDR *, enum xdr_op); |
2891 +extern caddr_t xdralloc_getdata(XDR *); |
2858 +extern caddr_t xdralloc_getdata(XDR *); |
2892 |
2859 |
2893 /* |
2860 /* |
2894 * Function: osa_adb_create_policy |
2861 * Function: osa_adb_create_policy |
2895 diff --git a/src/plugins/kdb/db2/pol_xdr.c b/src/plugins/kdb/db2/pol_xdr.c |
|
2896 --- a/src/plugins/kdb/db2/pol_xdr.c |
2862 --- a/src/plugins/kdb/db2/pol_xdr.c |
2897 +++ b/src/plugins/kdb/db2/pol_xdr.c |
2863 +++ b/src/plugins/kdb/db2/pol_xdr.c |
2898 @@ -1,6 +1,6 @@ |
2864 @@ -1,6 +1,6 @@ |
2899 #include <sys/types.h> |
2865 #include <sys/types.h> |
2900 #include <krb5.h> |
2866 #include <krb5.h> |
2901 -#include <gssrpc/rpc.h> |
2867 -#include <gssrpc/rpc.h> |
2902 +#include <rpc/rpc.h> |
2868 +#include <rpc/rpc.h> |
2903 #include <kdb.h> |
2869 #include <kdb.h> |
2904 #include <kadm5/admin_xdr.h> |
2870 #include <kadm5/admin_xdr.h> |
2905 #include "policy_db.h" |
2871 #include "policy_db.h" |
2906 diff --git a/src/plugins/kdb/db2/policy_db.h b/src/plugins/kdb/db2/policy_db.h |
|
2907 --- a/src/plugins/kdb/db2/policy_db.h |
2872 --- a/src/plugins/kdb/db2/policy_db.h |
2908 +++ b/src/plugins/kdb/db2/policy_db.h |
2873 +++ b/src/plugins/kdb/db2/policy_db.h |
2909 @@ -28,8 +28,8 @@ |
2874 @@ -28,8 +28,8 @@ |
2910 |
2875 |
2911 A better fix might be for db.h to include netinet/in.h if that's |
2876 A better fix might be for db.h to include netinet/in.h if that's |
2915 +#include <rpc/types.h> |
2880 +#include <rpc/types.h> |
2916 +#include <rpc/xdr.h> |
2881 +#include <rpc/xdr.h> |
2917 #include <db.h> |
2882 #include <db.h> |
2918 #include "adb_err.h" |
2883 #include "adb_err.h" |
2919 #include <com_err.h> |
2884 #include <com_err.h> |
2920 diff --git a/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.c b/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.c |
|
2921 --- a/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.c |
2885 --- a/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.c |
2922 +++ b/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.c |
2886 +++ b/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.c |
2923 @@ -3,6 +3,10 @@ |
2887 @@ -3,6 +3,10 @@ |
2924 #include "princ_xdr.h" |
2888 #include "princ_xdr.h" |
2925 #include <kadm5/admin.h> |
2889 #include <kadm5/admin.h> |
2929 +extern caddr_t xdralloc_getdata(XDR *); |
2893 +extern caddr_t xdralloc_getdata(XDR *); |
2930 + |
2894 + |
2931 bool_t |
2895 bool_t |
2932 ldap_xdr_krb5_ui_2(XDR *xdrs, krb5_ui_2 *objp) |
2896 ldap_xdr_krb5_ui_2(XDR *xdrs, krb5_ui_2 *objp) |
2933 { |
2897 { |
2934 diff --git a/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.h b/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.h |
|
2935 --- a/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.h |
2898 --- a/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.h |
2936 +++ b/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.h |
2899 +++ b/src/plugins/kdb/ldap/libkdb_ldap/princ_xdr.h |
2937 @@ -4,7 +4,7 @@ |
2900 @@ -4,7 +4,7 @@ |
2938 #include <sys/types.h> |
2901 #include <sys/types.h> |
2939 #include <krb5.h> |
2902 #include <krb5.h> |
2941 -#include <gssrpc/rpc.h> |
2904 -#include <gssrpc/rpc.h> |
2942 +#include <rpc/rpc.h> |
2905 +#include <rpc/rpc.h> |
2943 |
2906 |
2944 #ifdef HAVE_MEMORY_H |
2907 #ifdef HAVE_MEMORY_H |
2945 #include <memory.h> |
2908 #include <memory.h> |
2946 diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c |
|
2947 --- a/src/slave/kpropd.c |
2909 --- a/src/slave/kpropd.c |
2948 +++ b/src/slave/kpropd.c |
2910 +++ b/src/slave/kpropd.c |
2949 @@ -588,7 +588,7 @@ full_resync(CLIENT *clnt) |
2911 @@ -588,7 +588,7 @@ full_resync(CLIENT *clnt) |
2950 |
2912 |
2951 memset(&clnt_res, 0, sizeof(clnt_res)); |
2913 memset(&clnt_res, 0, sizeof(clnt_res)); |
2953 - status = clnt_call(clnt, IPROP_FULL_RESYNC_EXT, (xdrproc_t)xdr_u_int32, |
2915 - status = clnt_call(clnt, IPROP_FULL_RESYNC_EXT, (xdrproc_t)xdr_u_int32, |
2954 + status = clnt_call(clnt, IPROP_FULL_RESYNC_EXT, (xdrproc_t)xdr_u_int, |
2916 + status = clnt_call(clnt, IPROP_FULL_RESYNC_EXT, (xdrproc_t)xdr_u_int, |
2955 (caddr_t)&vers, (xdrproc_t)xdr_kdb_fullresync_result_t, |
2917 (caddr_t)&vers, (xdrproc_t)xdr_kdb_fullresync_result_t, |
2956 (caddr_t)&clnt_res, full_resync_timeout); |
2918 (caddr_t)&clnt_res, full_resync_timeout); |
2957 if (status == RPC_PROCUNAVAIL) { |
2919 if (status == RPC_PROCUNAVAIL) { |
2958 diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in |
|
2959 --- a/src/tests/misc/Makefile.in |
2920 --- a/src/tests/misc/Makefile.in |
2960 +++ b/src/tests/misc/Makefile.in |
2921 +++ b/src/tests/misc/Makefile.in |
2961 @@ -12,18 +12,16 @@ SRCS=\ |
2922 @@ -12,18 +12,16 @@ SRCS=\ |
2962 $(srcdir)/test_cxx_krb5.cpp \ |
2923 $(srcdir)/test_cxx_krb5.cpp \ |
2963 $(srcdir)/test_cxx_k5int.cpp \ |
2924 $(srcdir)/test_cxx_k5int.cpp \ |
2996 |
2957 |
2997 clean:: |
2958 clean:: |
2998 - $(RM) test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_k5int test_cxx_rpc test_cxx_kadm5 *.o |
2959 - $(RM) test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_k5int test_cxx_rpc test_cxx_kadm5 *.o |
2999 + $(RM) test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_k5int test_cxx_kadm5 *.o |
2960 + $(RM) test_getpw test_chpw_message test_cxx_krb5 test_cxx_gss test_cxx_k5int test_cxx_kadm5 *.o |
3000 |
2961 |
3001 diff --git a/src/tests/t_ccache.py b/src/tests/t_ccache.py |
|
3002 --- a/src/tests/t_ccache.py |
2962 --- a/src/tests/t_ccache.py |
3003 +++ b/src/tests/t_ccache.py |
2963 +++ b/src/tests/t_ccache.py |
3004 @@ -51,7 +51,7 @@ realm.kinit(realm.user_princ, password('user')) |
2964 @@ -51,7 +51,7 @@ realm.kinit(realm.user_princ, password('user')) |
3005 realm.run([klist, '-s']) |
2965 realm.run([klist, '-s']) |
3006 realm.kinit(realm.user_princ, password('user'), ['-l', '-1s']) |
2966 realm.kinit(realm.user_princ, password('user'), ['-l', '-1s']) |
3008 -realm.kinit(realm.user_princ, password('user'), ['-S', 'kadmin/admin']) |
2968 -realm.kinit(realm.user_princ, password('user'), ['-S', 'kadmin/admin']) |
3009 +realm.kinit(realm.user_princ, password('user'), ['-S', 'kadmin/changepw']) |
2969 +realm.kinit(realm.user_princ, password('user'), ['-S', 'kadmin/changepw']) |
3010 realm.run([klist, '-s']) |
2970 realm.run([klist, '-s']) |
3011 realm.run([kdestroy]) |
2971 realm.run([kdestroy]) |
3012 realm.run([klist, '-s'], expected_code=1) |
2972 realm.run([klist, '-s'], expected_code=1) |
3013 diff --git a/src/tests/t_iprop.py b/src/tests/t_iprop.py |
|
3014 --- a/src/tests/t_iprop.py |
2973 --- a/src/tests/t_iprop.py |
3015 +++ b/src/tests/t_iprop.py |
2974 +++ b/src/tests/t_iprop.py |
3016 @@ -1,44 +1,35 @@ |
2975 @@ -1,44 +1,35 @@ |
3017 #!/usr/bin/python |
2976 #!/usr/bin/python |
3018 |
2977 |
3502 +wait_for_prop(kpropd, True) |
3461 +wait_for_prop(kpropd, True) |
3503 +check_serial(realm, 'None', slave) |
3462 +check_serial(realm, 'None', slave) |
3504 |
3463 |
3505 success('iprop tests') |
3464 success('iprop tests') |
3506 + |
3465 + |
3507 diff --git a/src/tests/t_kadmin_acl.py b/src/tests/t_kadmin_acl.py |
|
3508 --- a/src/tests/t_kadmin_acl.py |
3466 --- a/src/tests/t_kadmin_acl.py |
3509 +++ b/src/tests/t_kadmin_acl.py |
3467 +++ b/src/tests/t_kadmin_acl.py |
3510 @@ -9,7 +9,7 @@ def make_client(name): |
3468 @@ -9,7 +9,7 @@ def make_client(name): |
3511 ccache = os.path.join(realm.testdir, |
3469 ccache = os.path.join(realm.testdir, |
3512 'kadmin_ccache_' + name.replace('/', '_')) |
3470 'kadmin_ccache_' + name.replace('/', '_')) |
3514 - flags=['-S', 'kadmin/admin', '-c', ccache]) |
3472 - flags=['-S', 'kadmin/admin', '-c', ccache]) |
3515 + flags=['-S', 'kadmin/' + hostname, '-c', ccache]) |
3473 + flags=['-S', 'kadmin/' + hostname, '-c', ccache]) |
3516 return ccache |
3474 return ccache |
3517 |
3475 |
3518 def kadmin_as(client, query, **kwargs): |
3476 def kadmin_as(client, query, **kwargs): |
3519 diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in |
|
3520 --- a/src/util/gss-kernel-lib/Makefile.in |
3477 --- a/src/util/gss-kernel-lib/Makefile.in |
3521 +++ b/src/util/gss-kernel-lib/Makefile.in |
3478 +++ b/src/util/gss-kernel-lib/Makefile.in |
3522 @@ -7,7 +7,7 @@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi |
3479 @@ -7,7 +7,7 @@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi |
3523 SHLIB_EXPDEPS = \ |
3480 SHLIB_EXPDEPS = \ |
3524 $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ |
3481 $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ |
3526 -SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(LIBS) |
3483 -SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(LIBS) |
3527 +SHLIB_EXPLIBS= -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(LIBS) |
3484 +SHLIB_EXPLIBS= -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(LIBS) |
3528 |
3485 |
3529 SRCS= \ |
3486 SRCS= \ |
3530 k5seal.c \ |
3487 k5seal.c \ |
3531 diff --git a/src/util/k5test.py b/src/util/k5test.py |
|
3532 --- a/src/util/k5test.py |
3488 --- a/src/util/k5test.py |
3533 +++ b/src/util/k5test.py |
3489 +++ b/src/util/k5test.py |
3534 @@ -997,7 +997,7 @@ class K5Realm(object): |
3490 @@ -997,7 +997,7 @@ class K5Realm(object): |
3535 princname = self.admin_princ |
3491 princname = self.admin_princ |
3536 pw = password('admin') |
3492 pw = password('admin') |