Changeset 1693 for trunk/server/common

Timestamp:

Oct 23, 2010, 8:07:08 AM (14 years ago)

Author:

ezyang

Message:

Merge Fedora 13 development back to trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/common/oursrc/accountadm (modified) (1 prop)
• server/common/oursrc/accountadm/Makefile.in (modified) (1 diff)
• server/common/oursrc/accountadm/admof.c (modified) (2 diffs)
• server/common/oursrc/athrun (modified) (1 prop)
• server/common/oursrc/execsys (modified) (1 prop)
• server/common/oursrc/execsys/execsys-binfmt (modified) (1 prop)
• server/common/oursrc/httpdmods (modified) (1 prop)
• server/common/oursrc/logview (modified) (1 prop)
• server/common/oursrc/php_scripts/php_scripts-config.m4 (modified) (1 prop)
• server/common/oursrc/tokensys (modified) (1 prop)
• server/common/oursrc/whoisd (modified) (1 prop)
• server/common/patches/ghostscript-CVE-2010-1628.patch (deleted)
• server/common/patches/krb5-kuserok-scripts.patch (modified) (2 diffs)
• server/common/patches/openafs-release-glock.patch (deleted)
• server/common/patches/openafs-scripts.patch (modified) (3 diffs)
• server/common/patches/openssh-4.5p1-multihomed.patch (deleted)
• server/common/patches/openssh-5.0p1-multihomed.patch (deleted)

trunk/server/common/oursrc/accountadm/Makefile.in

@@ -11 +11 @@
 
 admof: admof.c
-        $(CC) $(CPPFLAGS) $(CFLAGS) $< -L/usr/lib/afs -L/usr/lib64/afs -lprot -lauth -lrxkad -lubik -laudit -lsys -lrx -llwp -lsys -lafsutil -lcom_err -lresolv -lkrb5 -ldes -lkrb4 -o $@
+        $(CC) $(CPPFLAGS) $(CFLAGS) $< -L/usr/lib/afs -L/usr/lib64/afs -lprot -lauth -lrxkad -lubik -laudit -lsys -lrx -llwp -lsys -lafsutil -lcom_err -lresolv -lkrb5 -ldes -o $@
 
 install:

trunk/server/common/oursrc/accountadm/admof.c

@@ -30 +30 @@
 #include <afs/afsutil.h>
 #include <krb5.h>
-#include <kerberosIV/krb.h>
 #include <stdbool.h>
 #include <syslog.h>
+
+#define ANAME_SZ 40
+#define REALM_SZ 40
+#define INST_SZ 40
+#define MAX_K_NAME_SZ (ANAME_SZ + INST_SZ + REALM_SZ + 2)
 
 extern int pioctl(char *, afs_int32, struct ViceIoctl *, afs_int32);
@@ -117 +121 @@
     if (krb5_524_conv_principal(context, principal, pname, pinst, prealm) != 0)
         die("internal error: krb5_524_conv_principal failed\n");
-    if (kname_unparse(user, pname, pinst,
-                      strcmp(prealm, realm_list[0]) == 0 ? NULL : prealm) != 0)
-        die("internal error: kname_unparse failed\n");
+
+    krb5_data realm = *krb5_princ_realm(context, principal);
+    if (realm.length > REALM_SZ - 1)
+        realm.length = REALM_SZ - 1;
+    if (strlen(realm_list[0]) == realm.length &&
+        memcmp(realm.data, realm_list[0], realm.length) == 0)
+        snprintf(user, MAX_K_NAME_SZ, "%s%s%s",
+                 pname, pinst[0] ? "." : "", pinst);
+    else
+        snprintf(user, MAX_K_NAME_SZ, "%s%s%s@%.*s",
+                 pname, pinst[0] ? "." : "", pinst, realm.length, realm.data);
 
     krb5_free_principal(context, principal);

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

@@ -36 +36 @@
      FILE *fp;
      char kuser[MAX_USERNAME];
-@@ -79,70 +79,35 @@
+@@ -79,71 +79,35 @@
      char linebuf[BUFSIZ];
      char *newline;
@@ -72 +72 @@
 -       return(FALSE);
 -    }
+-    set_cloexec_file(fp);
 -    /*
 -     * For security reasons, the .k5login file must be owned either by

trunk/server/common/patches/openafs-scripts.patch

@@ -134 +134 @@
 --- openafs-1.4/src/afs/afs_osi_pag.c
 +++ openafs-1.4+scripts/src/afs/afs_osi_pag.c
-@@ -51,6 +51,8 @@
+@@ -49,6 +49,8 @@
  #endif
  /* Local variables */
@@ -143 +143 @@
   * Pags are implemented as follows: the set of groups whose long
   * representation is '41XXXXXX' hex are used to represent the pags.
-@@ -458,6 +460,15 @@
+@@ -449,6 +451,15 @@
         av->uid = acred->cr_ruid;       /* default when no pag is set */
  #endif
@@ -156 +156 @@
 +    }
 +
-     av->initd = 0;
      return 0;
  }
+ 
 diff -ur openafs-1.4/src/afs/afs_pioctl.c openafs-1.4+scripts/src/afs/afs_pioctl.c
 --- openafs-1.4/src/afs/afs_pioctl.c