Changeset 1810 for branches


Ignore:
Timestamp:
Apr 18, 2011, 6:27:00 PM (11 years ago)
Author:
achernya
Message:
Updated krb5 patch to get rid of now-unused variables.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/common/patches/krb5-kuserok-scripts.patch

    r1807 r1810  
    2929 #if defined(_AIX) && defined(_IBMR2)
    3030 #include <sys/access.h>
    31 @@ -100,6 +101,7 @@
    32      struct stat sbuf;
     31@@ -93,13 +94,12 @@
     32 static enum result
     33 k5login_ok(krb5_context context, krb5_principal principal, const char *luser)
     34 {
     35-    int authoritative = TRUE, gobble;
     36+    int authoritative = TRUE;
     37     enum result result = REJECT;
     38     char *filename = NULL, *princname = NULL;
     39-    char *newline, linebuf[BUFSIZ], pwbuf[BUFSIZ];
     40-    struct stat sbuf;
     41+    char pwbuf[BUFSIZ];
    3342     struct passwd pwx, *pwd;
    34      FILE *fp = NULL;
     43-    FILE *fp = NULL;
    3544+    int pid, status;
    3645 
    3746     if (profile_get_boolean(context->profile, KRB5_CONF_LIBDEFAULTS,
    3847                             KRB5_CONF_K5LOGIN_AUTHORITATIVE, NULL, TRUE,
    39 @@ -110,41 +112,27 @@
     48@@ -110,46 +110,30 @@
    4049     if (k5_getpwnam_r(luser, &pwx, pwbuf, sizeof(pwbuf), &pwd) != 0)
    4150         goto cleanup;
     
    94103     free(princname);
    95104     free(filename);
     105-    if (fp != NULL)
     106-        fclose(fp);
     107     /* If k5login files are non-authoritative, never reject. */
     108     return (!authoritative && result == REJECT) ? PASS : result;
     109 }
Note: See TracChangeset for help on using the changeset viewer.