| Index: trunk/extensions/OpenStackManager/OpenStackNovaUser.php |
| — | — | @@ -489,10 +489,9 @@ |
| 490 | 490 | * @return bool |
| 491 | 491 | */ |
| 492 | 492 | static function LDAPSetNovaInfo( $auth ) { |
| 493 | | - $this->userInfo = $auth->userInfo; |
| 494 | | - if ( !$this->exists() ) { |
| 495 | | - if ( !in_array( 'novauser', $this->userInfo[0]['objectclass'] ) ) { |
| 496 | | - $values['objectclass'] = $this->userInfo[0]['objectclass']; |
| | 493 | + if ( !isset( $auth->userInfo[0]['accesskey'] ) or !isset( $auth->userInfo[0]['secretkey'] ) ) { |
| | 494 | + if ( !in_array( 'novauser', $auth->userInfo[0]['objectclass'] ) ) { |
| | 495 | + $values['objectclass'] = $auth->userInfo[0]['objectclass']; |
| 497 | 496 | $values['objectclass'][] = 'novauser'; |
| 498 | 497 | } |
| 499 | 498 | $values['accesskey'] = OpenStackNovaUser::uuid4(); |