[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / lond

[raeburn]

raeburn		Sun Jun 29 03:23:13 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	lond 
  Log:
  - For 2.11
    - Backport 1.511
  
  
Index: loncom/lond
diff -u loncom/lond:1.489.2.15 loncom/lond:1.489.2.16
--- loncom/lond:1.489.2.15	Mon Jun  9 19:47:51 2014
+++ loncom/lond	Sun Jun 29 03:23:11 2014
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.15 2014/06/09 19:47:51 raeburn Exp $
+# $Id: lond,v 1.489.2.16 2014/06/29 03:23:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.15 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.16 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -6573,12 +6573,24 @@
 #        my $tmpsnum=0;            # Now global
 #---------------------------------------------------- kerberos 5 initialization
         &Authen::Krb5::init_context();
-	unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||  
-		($dist eq 'fedora6') || ($dist eq 'suse9.3') ||
-                ($dist eq 'suse12.2') || ($dist eq 'suse12.3') ||
-                ($dist eq 'suse13.1')) {
-	    &Authen::Krb5::init_ets();
-	}
+
+        my $no_ets;
+        if ($dist =~ /^(?:centos|rhes)(\d+)$/) {
+            if ($1 >= 7) {
+                $no_ets = 1;
+            }
+        } elsif ($dist =~ /^suse(\d+\.\d+)$/) {
+            if (($1 eq '9.3') || ($1 >= 12.2)) {
+                $no_ets = 1;
+            }
+        } elsif ($dist =~ /^fedora(\d+)$/) {
+            if ($1 < 7) {
+                $no_ets = 1;
+            }
+        }
+        unless ($no_ets) {
+            &Authen::Krb5::init_ets();
+        }
 
 	&status('Accepted connection');
 # =============================================================================