5 # Note: Given that the changes are dependent upon Solaris' version of RPC it |
5 # Note: Given that the changes are dependent upon Solaris' version of RPC it |
6 # is not possible to contribute these changes to MIT unless RPC is also |
6 # is not possible to contribute these changes to MIT unless RPC is also |
7 # donated. |
7 # donated. |
8 # Patch source: in-house |
8 # Patch source: in-house |
9 # |
9 # |
10 diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db |
|
11 --- a/src/kadmin/testing/scripts/init_db |
10 --- a/src/kadmin/testing/scripts/init_db |
12 +++ b/src/kadmin/testing/scripts/init_db |
11 +++ b/src/kadmin/testing/scripts/init_db |
13 @@ -215,7 +215,7 @@ changepw/kerberos@$REALM cil |
12 @@ -215,7 +215,7 @@ changepw/kerberos@$REALM cil |
14 |
13 |
15 EOF |
14 EOF |
17 -eval $LOCAL_MAKE_KEYTAB -princ kadmin/admin -princ kadmin/changepw -princ ovsec_adm/admin -princ ovsec_adm/changepw $K5ROOT/ovsec_adm.srvtab $REDIRECT |
16 -eval $LOCAL_MAKE_KEYTAB -princ kadmin/admin -princ kadmin/changepw -princ ovsec_adm/admin -princ ovsec_adm/changepw $K5ROOT/ovsec_adm.srvtab $REDIRECT |
18 +eval $LOCAL_MAKE_KEYTAB -princ kadmin/$qualname -princ changepw/$qualname -princ ovsec_adm/admin -princ ovsec_adm/changepw $K5ROOT/ovsec_adm.srvtab $REDIRECT |
17 +eval $LOCAL_MAKE_KEYTAB -princ kadmin/$qualname -princ changepw/$qualname -princ ovsec_adm/admin -princ ovsec_adm/changepw $K5ROOT/ovsec_adm.srvtab $REDIRECT |
19 |
18 |
20 # Create $K5ROOT/setup.csh to make it easy to run other programs against |
19 # Create $K5ROOT/setup.csh to make it easy to run other programs against |
21 # the test db |
20 # the test db |
22 diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c |
|
23 --- a/src/kadmin/testing/util/tcl_kadm5.c |
21 --- a/src/kadmin/testing/util/tcl_kadm5.c |
24 +++ b/src/kadmin/testing/util/tcl_kadm5.c |
22 +++ b/src/kadmin/testing/util/tcl_kadm5.c |
25 @@ -13,8 +13,11 @@ |
23 @@ -13,8 +13,11 @@ |
26 #include <errno.h> |
24 #include <errno.h> |
27 #include <stdlib.h> |
25 #include <stdlib.h> |
52 + (void) sprintf(buf, "%s@%s", KADM5_CHANGEPW_HOST_SERVICE, localname); |
50 + (void) sprintf(buf, "%s@%s", KADM5_CHANGEPW_HOST_SERVICE, localname); |
53 + Tcl_SetVar(interp, "KADM5_CHANGEPW_SERVICE", buf, TCL_GLOBAL_ONLY); |
51 + Tcl_SetVar(interp, "KADM5_CHANGEPW_SERVICE", buf, TCL_GLOBAL_ONLY); |
54 (void) sprintf(buf, "%d", KADM5_STRUCT_VERSION); |
52 (void) sprintf(buf, "%d", KADM5_STRUCT_VERSION); |
55 Tcl_SetVar(interp, "KADM5_STRUCT_VERSION", buf, TCL_GLOBAL_ONLY); |
53 Tcl_SetVar(interp, "KADM5_STRUCT_VERSION", buf, TCL_GLOBAL_ONLY); |
56 (void) sprintf(buf, "%d", KADM5_API_VERSION_2); |
54 (void) sprintf(buf, "%d", KADM5_API_VERSION_2); |
57 diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in |
|
58 --- a/src/lib/kadm5/unit-test/Makefile.in |
55 --- a/src/lib/kadm5/unit-test/Makefile.in |
59 +++ b/src/lib/kadm5/unit-test/Makefile.in |
56 +++ b/src/lib/kadm5/unit-test/Makefile.in |
60 @@ -103,7 +103,7 @@ unit-test-server-setup:: |
57 @@ -103,7 +103,7 @@ unit-test-server-setup:: |
61 unit-test-server-cleanup:: |
58 unit-test-server-cleanup:: |
62 $(ENV_SETUP) $(STOP_SERVERS_LOCAL) |
59 $(ENV_SETUP) $(STOP_SERVERS_LOCAL) |
64 -unit-test-client-body: site.exp test-noauth test-destroy test-handle-client |
61 -unit-test-client-body: site.exp test-noauth test-destroy test-handle-client |
65 +unit-test-client-body: site.exp test-destroy test-handle-client |
62 +unit-test-client-body: site.exp test-destroy test-handle-client |
66 $(ENV_SETUP) $(RUNTEST) --tool api RPC=1 API=$(CLNTTCL) \ |
63 $(ENV_SETUP) $(RUNTEST) --tool api RPC=1 API=$(CLNTTCL) \ |
67 KINIT=$(BUILDTOP)/clients/kinit/kinit \ |
64 KINIT=$(BUILDTOP)/clients/kinit/kinit \ |
68 KDESTROY=$(BUILDTOP)/clients/kdestroy/kdestroy \ |
65 KDESTROY=$(BUILDTOP)/clients/kdestroy/kdestroy \ |
69 diff --git a/src/lib/kadm5/unit-test/api.current/init-v2.exp b/src/lib/kadm5/unit-test/api.current/init-v2.exp |
|
70 --- a/src/lib/kadm5/unit-test/api.current/init-v2.exp |
66 --- a/src/lib/kadm5/unit-test/api.current/init-v2.exp |
71 +++ b/src/lib/kadm5/unit-test/api.current/init-v2.exp |
67 +++ b/src/lib/kadm5/unit-test/api.current/init-v2.exp |
72 @@ -70,7 +70,7 @@ proc test102 {} { |
68 @@ -70,7 +70,7 @@ proc test102 {} { |
73 [config_params {KADM5_CONFIG_ADMIN_SERVER} does.not.exist] \ |
69 [config_params {KADM5_CONFIG_ADMIN_SERVER} does.not.exist] \ |
74 $KADM5_STRUCT_VERSION $KADM5_API_VERSION_3 \ |
70 $KADM5_STRUCT_VERSION $KADM5_API_VERSION_3 \ |
104 - kinit testuser notathena "-S $KADM5_CHANGEPW_SERVICE" |
100 - kinit testuser notathena "-S $KADM5_CHANGEPW_SERVICE" |
105 + kinit testuser notathena "-S changepw/$hostname" |
101 + kinit testuser notathena "-S changepw/$hostname" |
106 one_line_succeed_test { |
102 one_line_succeed_test { |
107 kadm5_init_with_creds testuser null $KADM5_CHANGEPW_SERVICE \ |
103 kadm5_init_with_creds testuser null $KADM5_CHANGEPW_SERVICE \ |
108 null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_3 \ |
104 null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_3 \ |
109 diff --git a/src/lib/kadm5/unit-test/api.current/init.exp b/src/lib/kadm5/unit-test/api.current/init.exp |
|
110 --- a/src/lib/kadm5/unit-test/api.current/init.exp |
105 --- a/src/lib/kadm5/unit-test/api.current/init.exp |
111 +++ b/src/lib/kadm5/unit-test/api.current/init.exp |
106 +++ b/src/lib/kadm5/unit-test/api.current/init.exp |
112 @@ -697,8 +697,8 @@ if {$RPC} { |
107 @@ -697,8 +697,8 @@ if {$RPC} { |
113 # re-extract the keytab so it is right |
108 # re-extract the keytab so it is right |
114 exec rm $env(K5ROOT)/ovsec_adm.srvtab |
109 exec rm $env(K5ROOT)/ovsec_adm.srvtab |
118 + -princ kadmin/[exec $env(QUALNAME)] \ |
113 + -princ kadmin/[exec $env(QUALNAME)] \ |
119 + -princ changepw/[exec $env(QUALNAME)] $env(K5ROOT)/ovsec_adm.srvtab |
114 + -princ changepw/[exec $env(QUALNAME)] $env(K5ROOT)/ovsec_adm.srvtab |
120 } |
115 } |
121 |
116 |
122 return "" |
117 return "" |
123 diff --git a/src/lib/kadm5/unit-test/destroy-test.c b/src/lib/kadm5/unit-test/destroy-test.c |
|
124 --- a/src/lib/kadm5/unit-test/destroy-test.c |
118 --- a/src/lib/kadm5/unit-test/destroy-test.c |
125 +++ b/src/lib/kadm5/unit-test/destroy-test.c |
119 +++ b/src/lib/kadm5/unit-test/destroy-test.c |
126 @@ -27,7 +27,7 @@ int main() |
120 @@ -27,7 +27,7 @@ int main() |
127 exit(2); |
121 exit(2); |
128 } |
122 } |
130 - ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, 0, |
124 - ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, 0, |
131 + ret = kadm5_init(context, "admin", "admin", NULL, 0, |
125 + ret = kadm5_init(context, "admin", "admin", NULL, 0, |
132 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
126 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
133 &server_handle); |
127 &server_handle); |
134 if(ret != KADM5_OK) { |
128 if(ret != KADM5_OK) { |
135 diff --git a/src/lib/kadm5/unit-test/handle-test.c b/src/lib/kadm5/unit-test/handle-test.c |
|
136 --- a/src/lib/kadm5/unit-test/handle-test.c |
129 --- a/src/lib/kadm5/unit-test/handle-test.c |
137 +++ b/src/lib/kadm5/unit-test/handle-test.c |
130 +++ b/src/lib/kadm5/unit-test/handle-test.c |
138 @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) |
131 @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) |
139 |
132 |
140 kadm5_init_krb5_context(&context); |
133 kadm5_init_krb5_context(&context); |
142 - ret = kadm5_init(context, "admin/none", "admin", KADM5_ADMIN_SERVICE, NULL, |
135 - ret = kadm5_init(context, "admin/none", "admin", KADM5_ADMIN_SERVICE, NULL, |
143 + ret = kadm5_init(context, "admin/none", "admin", NULL, NULL, |
136 + ret = kadm5_init(context, "admin/none", "admin", NULL, NULL, |
144 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
137 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
145 &server_handle); |
138 &server_handle); |
146 if(ret != KADM5_OK) { |
139 if(ret != KADM5_OK) { |
147 diff --git a/src/lib/kadm5/unit-test/iter-test.c b/src/lib/kadm5/unit-test/iter-test.c |
|
148 --- a/src/lib/kadm5/unit-test/iter-test.c |
140 --- a/src/lib/kadm5/unit-test/iter-test.c |
149 +++ b/src/lib/kadm5/unit-test/iter-test.c |
141 +++ b/src/lib/kadm5/unit-test/iter-test.c |
150 @@ -22,7 +22,7 @@ int main(int argc, char **argv) |
142 @@ -22,7 +22,7 @@ int main(int argc, char **argv) |
151 com_err("iter-test", ret, "while initializing context"); |
143 com_err("iter-test", ret, "while initializing context"); |
152 exit(1); |
144 exit(1); |
154 - ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0, |
146 - ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0, |
155 + ret = kadm5_init("admin", "admin", NULL, 0, |
147 + ret = kadm5_init("admin", "admin", NULL, 0, |
156 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
148 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
157 &server_handle); |
149 &server_handle); |
158 if (ret != KADM5_OK) { |
150 if (ret != KADM5_OK) { |
159 diff --git a/src/lib/kadm5/unit-test/randkey-test.c b/src/lib/kadm5/unit-test/randkey-test.c |
|
160 --- a/src/lib/kadm5/unit-test/randkey-test.c |
151 --- a/src/lib/kadm5/unit-test/randkey-test.c |
161 +++ b/src/lib/kadm5/unit-test/randkey-test.c |
152 +++ b/src/lib/kadm5/unit-test/randkey-test.c |
162 @@ -23,7 +23,7 @@ int main() |
153 @@ -23,7 +23,7 @@ int main() |
163 kadm5_init_krb5_context(&context); |
154 kadm5_init_krb5_context(&context); |
164 |
155 |
166 - ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, NULL, |
157 - ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, NULL, |
167 + ret = kadm5_init(context, "admin", "admin", NULL, NULL, |
158 + ret = kadm5_init(context, "admin", "admin", NULL, NULL, |
168 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
159 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
169 &server_handle); |
160 &server_handle); |
170 if(ret != KADM5_OK) { |
161 if(ret != KADM5_OK) { |
171 diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/unit-test/setkey-test.c |
|
172 --- a/src/lib/kadm5/unit-test/setkey-test.c |
162 --- a/src/lib/kadm5/unit-test/setkey-test.c |
173 +++ b/src/lib/kadm5/unit-test/setkey-test.c |
163 +++ b/src/lib/kadm5/unit-test/setkey-test.c |
174 @@ -119,7 +119,7 @@ main(int argc, char **argv) |
164 @@ -119,7 +119,7 @@ main(int argc, char **argv) |
175 exit(1); |
165 exit(1); |
176 } |
166 } |
178 - ret = kadm5_init(context, authprinc, NULL, KADM5_ADMIN_SERVICE, NULL, |
168 - ret = kadm5_init(context, authprinc, NULL, KADM5_ADMIN_SERVICE, NULL, |
179 + ret = kadm5_init(context, authprinc, NULL, NULL, NULL, |
169 + ret = kadm5_init(context, authprinc, NULL, NULL, NULL, |
180 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
170 KADM5_STRUCT_VERSION, KADM5_API_VERSION_4, NULL, |
181 &handle); |
171 &handle); |
182 if (ret) { |
172 if (ret) { |
183 diff --git a/src/tests/dejagnu/krb-standalone/kadmin.exp b/src/tests/dejagnu/krb-standalone/kadmin.exp |
|
184 --- a/src/tests/dejagnu/krb-standalone/kadmin.exp |
173 --- a/src/tests/dejagnu/krb-standalone/kadmin.exp |
185 +++ b/src/tests/dejagnu/krb-standalone/kadmin.exp |
174 +++ b/src/tests/dejagnu/krb-standalone/kadmin.exp |
186 @@ -1050,13 +1050,16 @@ proc kadmin_test { } { |
175 @@ -1050,13 +1050,16 @@ proc kadmin_test { } { |
187 return |
176 return |
188 } |
177 } |