From 0e01dba9a83ed653e39c8510c5b043a8e4a8fd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Thu, 17 Apr 2014 23:06:33 +0200
Subject: [PATCH] =?UTF-8?q?[ldap=5Fcrans]=20On=20stocke=20l'utilisateur=20?=
 =?UTF-8?q?courant=20en=20m=C3=A9moire=20de=20CransLdap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gestion/ldap_crans.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py
index c25573e4..604b3e99 100755
--- a/gestion/ldap_crans.py
+++ b/gestion/ldap_crans.py
@@ -28,6 +28,8 @@ from unicodedata import normalize
 import secrets_new as secrets
 import ridtools
 from user_tests import isadm
+import getpass
+cur_user = os.getenv("SUDO_USER") or os.getenv("USER") or os.getenv("LOGNAME") or getpass.getuser()
 
 date_format = '%d/%m/%Y %H:%M'
 date_format_new = '%d/%m/%Y %H:%M:%S'
@@ -41,8 +43,6 @@ random.seed() # On initialise le générateur aléatoire
 
 test_hosts = tuple()
 
-cur_user = os.getenv('SUDO_USER') or pwd.getpwuid(os.getuid())[0]
-
 if __name__ == 'ldap_crans_test' or os.environ.get('crans_ldap', '') == 'test':
     if hostname != "vo":
         raise ImportError, coul("La base de test n'est accessible que depuis vo !", "rouge")
@@ -392,6 +392,7 @@ class CransLdap:
     search_champs = {}
     for i in auto_search_champs.keys():
         search_champs[i] = auto_search_champs[i] + non_auto_search_champs[i]
+    del i
 
     # Profondeur des différentes recherches (scope)
     scope = { 'adherent': 1,
@@ -403,6 +404,7 @@ class CransLdap:
               'facture': 2}
 
     def __init__(self, readonly=False):
+        self.cur_user = cur_user
         self.connect(readonly)
 
     def __del__(self):