Changeset 1069 for server/common

Timestamp:

Apr 8, 2009, 7:11:17 AM (15 years ago)

Author:

mitchb

Message:

Updates to the build system for krb5
Allow us to build with patches for CVE-2009-0844 through CVE-2009-0847

File:

• server/common/patches/krb5-kuserok-scripts.patch (modified) (5 diffs)

server/common/patches/krb5-kuserok-scripts.patch

@@ -18 +18 @@
 # See /COPYRIGHT in this repository for more information.
 #
---- krb5-1.4.3/src/lib/krb5/os/kuserok.c.old    2006-09-09 19:03:33.000000000 -0400
-+++ krb5-1.4.3/src/lib/krb5/os/kuserok.c        2006-09-09 19:50:48.000000000 -0400
+--- krb5-1.6.3/src/lib/krb5/os/kuserok.c.old    2009-04-08 06:17:06.000000000 -0400
++++ krb5-1.6.3/src/lib/krb5/os/kuserok.c        2009-04-08 06:17:18.000000000 -0400
 @@ -31,6 +31,7 @@
  #if !defined(_WIN32)           /* Not yet for Windows */
@@ -28 +28 @@
  #if defined(_AIX) && defined(_IBMR2)
  #include <sys/access.h>
-@@ -64,7 +65,6 @@
+@@ -71,7 +72,6 @@
  {
      struct stat sbuf;
@@ -36 +36 @@
      FILE *fp;
      char kuser[MAX_USERNAME];
-@@ -72,70 +72,35 @@
+@@ -79,70 +79,35 @@
      char linebuf[BUFSIZ];
      char *newline;
@@ -80 +80 @@
 -       free(princname);
 -       return(FALSE);
--    }
++    if ((pid = fork()) == -1) {
++       free(princname);
++       return(FALSE);
+     }
 -    if (sbuf.st_uid != pwd->pw_uid && !FILE_OWNER_OK(sbuf.st_uid)) {
 -       fclose(fp);
 -       free(princname);
 -       return(FALSE);
--    }
++    if (pid == 0) {
++       char *args[4];
++#define ADMOF_PATH "/usr/local/sbin/ssh-admof"
++       args[0] = ADMOF_PATH;
++       args[1] = (char *) luser;
++       args[2] = princname;
++       args[3] = NULL;
++       execv(ADMOF_PATH, args);
++       exit(1);
+     }
 -
 -    /* check each line */
@@ -102 +114 @@
 -       if (!newline)
 -           while (((gobble = getc(fp)) != EOF) && gobble != '\n');
--    }
-+    if ((pid = fork()) == -1) {
-+       free(princname);
-+       return(FALSE);
-+    }
-+    if (pid == 0) {
-+       char *args[4];
-+#define ADMOF_PATH "/usr/local/sbin/ssh-admof"
-+       args[0] = ADMOF_PATH;
-+       args[1] = (char *) luser;
-+       args[2] = princname;
-+       args[3] = NULL;
-+       execv(ADMOF_PATH, args);
-+       exit(1);
-+    }
 +    if (waitpid(pid, &status, 0) > 0 && WIFEXITED(status) && WEXITSTATUS(status) == 33) {
 +       isok=TRUE;
-+    }
+     }
 +    
      free(princname);