Advertisement
yaneurabeya

Untitled

Dec 30th, 2011
55
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.06 KB | None | 0 0
  1. Index: gui/common/freenasldap.py
  2. ===================================================================
  3. --- gui/common/freenasldap.py (revision 9359)
  4. +++ gui/common/freenasldap.py (working copy)
  5. @@ -862,7 +862,7 @@
  6. if d:
  7. d = d[0]
  8. args['host'] = d['dnsRoot']
  9. - self.netbiosname = d['nETBIOSName']
  10. + self.netbiosname = d['cn']
  11. super(FreeNAS_ActiveDirectory_Base, self).__init__(**args)
  12.  
  13. syslog(LOG_DEBUG, "FreeNAS_ActiveDirectory_Base.__init__: leave")
  14. @@ -943,7 +943,7 @@
  15. netbios_name = None
  16. results = self._search(config, ldap.SCOPE_SUBTREE, filter)
  17. try:
  18. - netbios_name = results[0][1]['nETBIOSName'][0]
  19. + netbios_name = results[0][1]['cn'][0]
  20. except:
  21. netbios_name = None
  22.  
  23. @@ -1407,7 +1407,7 @@
  24. self.__dgcache = {}
  25.  
  26. for d in self.__domains:
  27. - n = d['nETBIOSName']
  28. + n = d['cn']
  29. self.__ducache[n] = FreeNAS_Directory_UserCache(dir=n)
  30. self.__dgcache[n] = FreeNAS_Directory_GroupCache(dir=n)
  31.  
  32. @@ -1434,7 +1434,7 @@
  33.  
  34. self._save()
  35. for d in self.__domains:
  36. - n = d['nETBIOSName']
  37. + n = d['cn']
  38.  
  39. self.host = d['dnsRoot']
  40. self.basedn = d['nCName']
  41. @@ -1489,7 +1489,7 @@
  42.  
  43. self._save()
  44. for d in self.__domains:
  45. - n = d['nETBIOSName']
  46. + n = d['cn']
  47.  
  48. self.host = d['dnsRoot']
  49. self.basedn = d['nCName']
  50. @@ -1630,7 +1630,7 @@
  51.  
  52. self.__dgcache = {}
  53. for d in self.__domains:
  54. - n = d['nETBIOSName']
  55. + n = d['cn']
  56. self.__dgcache[n] = FreeNAS_Directory_GroupCache(dir=n)
  57.  
  58. self.__get_groups()
  59. @@ -1655,7 +1655,7 @@
  60.  
  61. self._save()
  62. for d in self.__domains:
  63. - n = d['nETBIOSName']
  64. + n = d['cn']
  65.  
  66. self.host = d['dnsRoot']
  67. self.basedn = d['nCName']
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement