git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iotlab driver: wip fixing Timur's bug when a user already has an account in LDAP...
[sfa.git]
/
sfa
/
iotlab
/
LDAPapi.py
diff --git
a/sfa/iotlab/LDAPapi.py
b/sfa/iotlab/LDAPapi.py
index
7c3deb6
..
94565b8
100644
(file)
--- a/
sfa/iotlab/LDAPapi.py
+++ b/
sfa/iotlab/LDAPapi.py
@@
-960,6
+960,10
@@
class LDAPapi:
#then the login is different from the one found in its hrn
if tmpname != hrn.split('.')[1]:
hrn = None
#then the login is different from the one found in its hrn
if tmpname != hrn.split('.')[1]:
hrn = None
+ else:
+ hrn = None
+
+ if hrn is None:
results = {
'type': 'user',
'pkey': ldapentry['sshPublicKey'],
results = {
'type': 'user',
'pkey': ldapentry['sshPublicKey'],
@@
-974,7
+978,6
@@
class LDAPapi:
'authority': parent_hrn,
'peer_authority': peer_authority,
'pointer': -1,
'authority': parent_hrn,
'peer_authority': peer_authority,
'pointer': -1,
- 'hrn': hrn,
}
else:
#hrn = None
}
else:
#hrn = None
@@
-992,6
+995,7
@@
class LDAPapi:
'authority': parent_hrn,
'peer_authority': peer_authority,
'pointer': -1,
'authority': parent_hrn,
'peer_authority': peer_authority,
'pointer': -1,
+ 'hrn': hrn,
}
return results
}
return results