Index: branches/fc13-dev/server/common/patches/openssh-5.0p1-multihomed.patch
===================================================================
--- branches/fc13-dev/server/common/patches/openssh-5.0p1-multihomed.patch	(revision 1613)
+++ branches/fc13-dev/server/common/patches/openssh-5.0p1-multihomed.patch	(revision 1626)
@@ -6,5 +6,5 @@
 --- openssh-5.0p1.orig/gss-serv.c	2008-05-20 00:00:00.000000000 -0400
 +++ openssh-5.0p1/gss-serv.c	2008-05-20 00:00:00.000000000 -0400
-@@ -77,22 +77,11 @@
+@@ -83,23 +83,12 @@
  ssh_gssapi_acquire_cred(Gssctxt *ctx)
  {
@@ -13,20 +13,21 @@
  	gss_OID_set oidset;
  
- 	gss_create_empty_oid_set(&status, &oidset);
- 	gss_add_oid_set_member(&status, ctx->oid, &oidset);
+ 	if (options.gss_strict_acceptor) {
+ 		gss_create_empty_oid_set(&status, &oidset);
+ 		gss_add_oid_set_member(&status, ctx->oid, &oidset);
  
--	if (gethostname(lname, MAXHOSTNAMELEN)) {
--		gss_release_oid_set(&status, &oidset);
--		return (-1);
--	}
+-		if (gethostname(lname, MAXHOSTNAMELEN)) {
+-			gss_release_oid_set(&status, &oidset);
+-			return (-1);
+-		}
 -
--	if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
--		gss_release_oid_set(&status, &oidset);
--		return (ctx->major);
--	}
+-		if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
+-			gss_release_oid_set(&status, &oidset);
+-			return (ctx->major);
+-		}
 -
- 	if ((ctx->major = gss_acquire_cred(&ctx->minor,
- 	    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
- 		ssh_gssapi_error(ctx);
+ 		if ((ctx->major = gss_acquire_cred(&ctx->minor,
+ 		    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, 
+ 		    NULL, NULL)))
 @@ -102,6 +102,8 @@
  {