Make app pkinit options prefixed with pkinit_
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19068 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		| @@ -1411,7 +1411,7 @@ _kdc_pk_initialize(krb5_context context, | |||||||
| 				       NULL, | 				       NULL, | ||||||
| 				       FALSE, | 				       FALSE, | ||||||
| 				       "kdc", | 				       "kdc", | ||||||
| 				       "pki-allow-proxy-certificate", | 				       "pkinit_allow_proxy_certificate", | ||||||
| 				       NULL); | 				       NULL); | ||||||
|     _krb5_pk_allow_proxy_certificate(kdc_identity, ret); |     _krb5_pk_allow_proxy_certificate(kdc_identity, ret); | ||||||
|  |  | ||||||
| @@ -1419,7 +1419,7 @@ _kdc_pk_initialize(krb5_context context, | |||||||
| 					  NULL, | 					  NULL, | ||||||
| 					  HDB_DB_DIR "/pki-mapping", | 					  HDB_DB_DIR "/pki-mapping", | ||||||
| 					  "kdc", | 					  "kdc", | ||||||
| 					  "pki-mappings-file", | 					  "pkinit_mappings_file", | ||||||
| 					  NULL); | 					  NULL); | ||||||
|     f = fopen(file, "r"); |     f = fopen(file, "r"); | ||||||
|     if (f == NULL) { |     if (f == NULL) { | ||||||
|   | |||||||
| @@ -607,7 +607,7 @@ _krb5_pk_mk_padata(krb5_context context, | |||||||
| 						FALSE, | 						FALSE, | ||||||
| 						"realms", | 						"realms", | ||||||
| 						req_body->realm, | 						req_body->realm, | ||||||
| 						"win2k_pkinit", | 						"pkinit_win2k", | ||||||
| 						NULL); | 						NULL); | ||||||
|     if (context->pkinit_flags & KRB5_PKINIT_WIN2K) |     if (context->pkinit_flags & KRB5_PKINIT_WIN2K) | ||||||
| 	win2k_compat = 1; | 	win2k_compat = 1; | ||||||
| @@ -618,7 +618,7 @@ _krb5_pk_mk_padata(krb5_context context, | |||||||
| 					 FALSE, | 					 FALSE, | ||||||
| 					 "realms", | 					 "realms", | ||||||
| 					 req_body->realm, | 					 req_body->realm, | ||||||
| 					 "win2k_pkinit_require_binding", | 					 "pkinit_win2k_require_binding", | ||||||
| 					 NULL); | 					 NULL); | ||||||
| 	type = COMPAT_WIN2K; | 	type = COMPAT_WIN2K; | ||||||
|     } else |     } else | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Love Hörnquist Åstrand
					Love Hörnquist Åstrand