Changeset 1626


Ignore:
Timestamp:
Sep 8, 2010, 9:34:53 PM (11 years ago)
Author:
ezyang
Message:
Update SSH multihomed patch for F13, remove old 4.5p1 multihomed patch.
Location:
branches/fc13-dev/server/common/patches
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev/server/common/patches/openssh-5.0p1-multihomed.patch

    r760 r1626  
    66--- openssh-5.0p1.orig/gss-serv.c       2008-05-20 00:00:00.000000000 -0400
    77+++ openssh-5.0p1/gss-serv.c    2008-05-20 00:00:00.000000000 -0400
    8 @@ -77,22 +77,11 @@
     8@@ -83,23 +83,12 @@
    99 ssh_gssapi_acquire_cred(Gssctxt *ctx)
    1010 {
     
    1313        gss_OID_set oidset;
    1414 
    15         gss_create_empty_oid_set(&status, &oidset);
    16         gss_add_oid_set_member(&status, ctx->oid, &oidset);
     15        if (options.gss_strict_acceptor) {
     16                gss_create_empty_oid_set(&status, &oidset);
     17                gss_add_oid_set_member(&status, ctx->oid, &oidset);
    1718 
    18 -       if (gethostname(lname, MAXHOSTNAMELEN)) {
    19 -               gss_release_oid_set(&status, &oidset);
    20 -               return (-1);
    21 -       }
     19-               if (gethostname(lname, MAXHOSTNAMELEN)) {
     20-                       gss_release_oid_set(&status, &oidset);
     21-                       return (-1);
     22-               }
    2223-
    23 -       if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
    24 -               gss_release_oid_set(&status, &oidset);
    25 -               return (ctx->major);
    26 -       }
     24-               if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
     25-                       gss_release_oid_set(&status, &oidset);
     26-                       return (ctx->major);
     27-               }
    2728-
    28         if ((ctx->major = gss_acquire_cred(&ctx->minor,
    29             ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
    30                 ssh_gssapi_error(ctx);
     29                if ((ctx->major = gss_acquire_cred(&ctx->minor,
     30                    ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds,
     31                    NULL, NULL)))
    3132@@ -102,6 +102,8 @@
    3233 {
Note: See TracChangeset for help on using the changeset viewer.