[Gforge-commits] gforge-plugin-ldapextauth login.diff, 1.2, 1.3 session.diff, 1.1, 1.2

[tperdue]

Update of /cvsroot/gforge/gforge-plugin-ldapextauth
In directory 
db.perdue.net:/home/tperdue/share/dev.gforge.org/plugins/gforge-plugin-ldapextauth

Modified Files:
        login.diff session.diff 
Log Message:


Index: login.diff
===================================================================
RCS file: /cvsroot/gforge/gforge-plugin-ldapextauth/login.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- login.diff  15 Dec 2004 20:09:16 -0000      1.2
+++ login.diff  15 Dec 2004 20:10:28 -0000      1.3
@@ -28,4 +28,3 @@
                }
        }
  }
-

Index: session.diff
===================================================================
RCS file: /cvsroot/gforge/gforge-plugin-ldapextauth/session.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- session.diff        30 Sep 2004 03:17:39 -0000      1.1
+++ session.diff        15 Dec 2004 20:10:28 -0000      1.2
@@ -1,20 +1,10 @@
---- /home/tperdue/share/dev.gforge.org/common/include/session.php      
2004-09-29 16:49:31.000000000 -0500
-+++ common/include/session.php 2004-09-29 22:04:27.000000000 -0500
-@@ -4,7 +4,7 @@
-  *
-  * Copyright 1999-2001 (c) VA Linux Systems
-  *
-- * @version   $Id$
-+ * @version   $Id$
-  *
-  * This file is part of GForge.
-  *
-@@ -132,8 +132,19 @@
-       $hook_params['loginname'] = $loginname ;
+--- session.php.orig   2004-12-15 10:11:37.000000000 -0800
++++ session.php        2004-12-15 11:52:55.000000000 -0800
+@@ -133,7 +133,19 @@
        $hook_params['passwd'] = $passwd ;
        plugin_hook ("session_before_login", $hook_params) ;
--
--      return session_login_valid_dbonly ($loginname, $passwd, $allowpending) 
;}
+ 
+-      return session_login_valid_dbonly ($loginname, $passwd, $allowpending) ;
 +      if ($GLOBALS['ldap_auth_failed']) {
 +              return false;
 +      } elseif ($GLOBALS['ldap_first_login']) {
@@ -27,7 +17,7 @@
 +      } else {
 +              return session_login_valid_dbonly ($loginname, $passwd, 
$allowpending) ;
 +      }
-+}
++
+ }
  
  function session_login_valid_dbonly ($loginname, $passwd, $allowpending) {
-       global $feedback,$userstatus,$Language;