[packages/openssh.git] / openssh-heimdal.patch

--- openssh-5.7p1/configure.ac.orig	2011-01-22 00:37:05.000000000 +0200
+++ openssh-5.7p1/configure.ac	2011-01-24 16:21:01.711393457 +0200
@@ -3572,14 +3572,14 @@
 				       [ AC_MSG_RESULT(yes)
 					 AC_DEFINE(HEIMDAL)
 					 K5LIBS="-lkrb5"
-					 K5LIBS="$K5LIBS -lcom_err -lasn1"
+					 K5LIBS="$K5LIBS -lasn1"
 					 AC_CHECK_LIB(roken, net_write,
 					   [K5LIBS="$K5LIBS -lroken"])
 					 AC_CHECK_LIB(des, des_cbc_encrypt,
 					   [K5LIBS="$K5LIBS -ldes"])
 				       ],
 				       [ AC_MSG_RESULT(no)
-					 K5LIBS="-lkrb5 -lk5crypto -lcom_err"
+					 K5LIBS="-lkrb5 -lk5crypto"
 				       ]
 			)
 			AC_SEARCH_LIBS(dn_expand, resolv)
diff -ur openssh-5.8p1-orig/auth-krb5.c openssh-5.8p1/auth-krb5.c
--- openssh-5.8p1-orig/auth-krb5.c	2011-04-20 00:30:23.632652510 +0200
+++ openssh-5.8p1/auth-krb5.c	2011-04-20 00:34:06.218117429 +0200
@@ -88,6 +88,8 @@
 #ifndef HEIMDAL
 	krb5_creds creds;
 	krb5_principal server;
+#else
+	const char *ccache_type, *ccache_name;
 #endif
 	krb5_error_code problem;
 	krb5_ccache ccache = NULL;
@@ -129,7 +131,11 @@
 	if (problem)
 		goto out;
 
-	problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_fcc_ops,
+	problem = krb5_cc_set_default_name(authctxt->krb5_ctx, NULL);
+	if (problem)
+		goto out;
+	problem = krb5_cc_new_unique(authctxt->krb5_ctx,
+	    krb5_cc_default_name(authctxt->krb5_ctx), NULL,
 	    &authctxt->krb5_fwd_ccache);
 	if (problem)
 		goto out;
@@ -180,12 +186,23 @@
 		goto out;
 #endif
 
+#ifdef HEIMDAL
+	ccache_type = krb5_cc_get_type(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
+	ccache_name = krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
+	if (strncmp(ccache_type, "FILE", 4) == 0) {
+		authctxt->krb5_ticket_file = (char *)ccache_name;
+	}
+	len = strlen(ccache_type) + strlen(ccache_name) + 2;
+	authctxt->krb5_ccname = xmalloc(len);
+	snprintf(authctxt->krb5_ccname, len, "%s:%s", ccache_type, ccache_name);
+#else
 	authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
 
 	len = strlen(authctxt->krb5_ticket_file) + 6;
 	authctxt->krb5_ccname = xmalloc(len);
 	snprintf(authctxt->krb5_ccname, len, "FILE:%s",
 	    authctxt->krb5_ticket_file);
+#endif
 
 #ifdef USE_PAM
 	if (options.use_pam)
diff -ur openssh-5.8p1-orig/gss-serv-krb5.c openssh-5.8p1/gss-serv-krb5.c
--- openssh-5.8p1-orig/gss-serv-krb5.c	2011-04-20 00:30:23.632652510 +0200
+++ openssh-5.8p1/gss-serv-krb5.c	2011-04-20 00:34:06.218117429 +0200
@@ -121,6 +121,9 @@
 	krb5_principal princ;
 	OM_uint32 maj_status, min_status;
 	int len;
+#ifdef HEIMDAL
+	const char *ccache_type, *ccache_name;
+#endif
 
 	if (client->creds == NULL) {
 		debug("No credentials stored");
@@ -131,8 +134,14 @@
 		return;
 
 #ifdef HEIMDAL
-	if ((problem = krb5_cc_gen_new(krb_context, &krb5_fcc_ops, &ccache))) {
-		logit("krb5_cc_gen_new(): %.100s",
+	if ((problem = krb5_cc_set_default_name(krb_context, NULL))) {
+		logit("krb5_cc_set_default_name(): %.100s",
+		    krb5_get_err_text(krb_context, problem));
+		return;
+	}
+	if ((problem = krb5_cc_new_unique(krb_context,
+			krb5_cc_default_name(krb_context), NULL, &ccache))) {
+		logit("krb5_cc_new_unique(): %.100s",
 		    krb5_get_err_text(krb_context, problem));
 		return;
 	}
@@ -169,11 +178,23 @@
 		return;
 	}
 
+#ifdef HEIMDAL
+	ccache_type = krb5_cc_get_type(krb_context, ccache);
+	ccache_name = krb5_cc_get_name(krb_context, ccache);
+	if (strncmp(ccache_type, "FILE", 4) == 0) {
+		client->store.filename = xstrdup(ccache_name);
+	}
+	client->store.envvar = "KRB5CCNAME";
+	len = strlen(ccache_type) + strlen(ccache_name) + 2;
+	client->store.envval = xmalloc(len);
+	snprintf(client->store.envval, len, "%s:%s", ccache_type, ccache_name);
+#else
 	client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
 	client->store.envvar = "KRB5CCNAME";
 	len = strlen(client->store.filename) + 6;
 	client->store.envval = xmalloc(len);
 	snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
+#endif
 
 #ifdef USE_PAM
 	if (options.use_pam)
Commit	Line	Data
f1344723 CM	1	--- openssh-5.7p1/configure.ac.orig 2011-01-22 00:37:05.000000000 +0200
	2	+++ openssh-5.7p1/configure.ac 2011-01-24 16:21:01.711393457 +0200
	3	@@ -3572,14 +3572,14 @@
c5fa450a ER	4	[ AC_MSG_RESULT(yes)
c5fa450a ER	5	AC_DEFINE(HEIMDAL)
f1344723	6	K5LIBS="-lkrb5"
c5fa450a	7	- K5LIBS="$K5LIBS -lcom_err -lasn1"
c5fa450a ER	8	+ K5LIBS="$K5LIBS -lasn1"
	9	AC_CHECK_LIB(roken, net_write,
	10	[K5LIBS="$K5LIBS -lroken"])
f1344723 CM	11	AC_CHECK_LIB(des, des_cbc_encrypt,
f1344723 CM	12	[K5LIBS="$K5LIBS -ldes"])
c5fa450a ER	13	],
	14	[ AC_MSG_RESULT(no)
	15	- K5LIBS="-lkrb5 -lk5crypto -lcom_err"
	16	+ K5LIBS="-lkrb5 -lk5crypto"
	17	]
	18	)
	19	AC_SEARCH_LIBS(dn_expand, resolv)
f618603b JR	20	diff -ur openssh-5.8p1-orig/auth-krb5.c openssh-5.8p1/auth-krb5.c
	21	--- openssh-5.8p1-orig/auth-krb5.c 2011-04-20 00:30:23.632652510 +0200
	22	+++ openssh-5.8p1/auth-krb5.c 2011-04-20 00:34:06.218117429 +0200
	23	@@ -88,6 +88,8 @@
	24	#ifndef HEIMDAL
	25	krb5_creds creds;
	26	krb5_principal server;
	27	+#else
	28	+ const char ccache_type, ccache_name;
	29	#endif
	30	krb5_error_code problem;
	31	krb5_ccache ccache = NULL;
	32	@@ -129,7 +131,11 @@
	33	if (problem)
	34	goto out;
	35
	36	- problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_fcc_ops,
	37	+ problem = krb5_cc_set_default_name(authctxt->krb5_ctx, NULL);
	38	+ if (problem)
	39	+ goto out;
	40	+ problem = krb5_cc_new_unique(authctxt->krb5_ctx,
	41	+ krb5_cc_default_name(authctxt->krb5_ctx), NULL,
	42	&authctxt->krb5_fwd_ccache);
	43	if (problem)
	44	goto out;
	45	@@ -180,12 +186,23 @@
	46	goto out;
	47	#endif
	48
	49	+#ifdef HEIMDAL
	50	+ ccache_type = krb5_cc_get_type(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
	51	+ ccache_name = krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
	52	+ if (strncmp(ccache_type, "FILE", 4) == 0) {
	53	+ authctxt->krb5_ticket_file = (char *)ccache_name;
	54	+ }
	55	+ len = strlen(ccache_type) + strlen(ccache_name) + 2;
	56	+ authctxt->krb5_ccname = xmalloc(len);
	57	+ snprintf(authctxt->krb5_ccname, len, "%s:%s", ccache_type, ccache_name);
	58	+#else
	59	authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
	60
	61	len = strlen(authctxt->krb5_ticket_file) + 6;
	62	authctxt->krb5_ccname = xmalloc(len);
	63	snprintf(authctxt->krb5_ccname, len, "FILE:%s",
	64	authctxt->krb5_ticket_file);
	65	+#endif
	66
	67	#ifdef USE_PAM
	68	if (options.use_pam)
	69	diff -ur openssh-5.8p1-orig/gss-serv-krb5.c openssh-5.8p1/gss-serv-krb5.c
	70	--- openssh-5.8p1-orig/gss-serv-krb5.c 2011-04-20 00:30:23.632652510 +0200
	71	+++ openssh-5.8p1/gss-serv-krb5.c 2011-04-20 00:34:06.218117429 +0200
fe7f01a3 JR	72	@@ -121,6 +121,9 @@
	73	krb5_principal princ;
	74	OM_uint32 maj_status, min_status;
	75	int len;
	76	+#ifdef HEIMDAL
	77	+ const char ccache_type, ccache_name;
ace6f67b	78	+#endif
fe7f01a3 JR	79
	80	if (client->creds == NULL) {
	81	debug("No credentials stored");
f618603b	82	@@ -131,8 +134,14 @@
fe7f01a3 JR	83	return;
	84
	85	#ifdef HEIMDAL
	86	- if ((problem = krb5_cc_gen_new(krb_context, &krb5_fcc_ops, &ccache))) {
	87	- logit("krb5_cc_gen_new(): %.100s",
f618603b JR	88	+ if ((problem = krb5_cc_set_default_name(krb_context, NULL))) {
	89	+ logit("krb5_cc_set_default_name(): %.100s",
	90	+ krb5_get_err_text(krb_context, problem));
	91	+ return;
	92	+ }
	93	+ if ((problem = krb5_cc_new_unique(krb_context,
	94	+ krb5_cc_default_name(krb_context), NULL, &ccache))) {
fe7f01a3 JR	95	+ logit("krb5_cc_new_unique(): %.100s",
	96	krb5_get_err_text(krb_context, problem));
	97	return;
	98	}
f618603b	99	@@ -169,11 +178,23 @@
fe7f01a3 JR	100	return;
	101	}
	102
	103	+#ifdef HEIMDAL
	104	+ ccache_type = krb5_cc_get_type(krb_context, ccache);
	105	+ ccache_name = krb5_cc_get_name(krb_context, ccache);
	106	+ if (strncmp(ccache_type, "FILE", 4) == 0) {
	107	+ client->store.filename = xstrdup(ccache_name);
	108	+ }
	109	+ client->store.envvar = "KRB5CCNAME";
4bff6dce	110	+ len = strlen(ccache_type) + strlen(ccache_name) + 2;
fe7f01a3 JR	111	+ client->store.envval = xmalloc(len);
	112	+ snprintf(client->store.envval, len, "%s:%s", ccache_type, ccache_name);
	113	+#else
	114	client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
	115	client->store.envvar = "KRB5CCNAME";
	116	len = strlen(client->store.filename) + 6;
	117	client->store.envval = xmalloc(len);
	118	snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
	119	+#endif
	120
	121	#ifdef USE_PAM
	122	if (options.use_pam)