Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap:
  fix
  userdir-ldap-slapd.conf.in: explicitly list readable attributes.  End with 'by * none'.
  ud-generate: Also rebuild if one of our keyrings has changed, even if ldap has not.
  ud-lock: support supplying a status to set instead of 'retiring'

diff --cc debian/changelog
index 6931ccb,a0e969c..d62afbb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -50,6 -50,9 +50,12 @@@ userdir-ldap (0.3.80) UNRELEASED; urgen
    * ud-generate: The ssh authorized_keys file for the sshdist user now wraps
      the rsync call in an flock wrapper that acquires a shared lock on
      ud-generate's lock.  This prevents syncing while ud-generate runs.
+   * ud-lock: support supplying a status to set instead of 'retiring'.
+   * ud-generate: Also rebuild if one of our keyrings has changed, even if
+     ldap has not.
++  * userdir-ldap-slapd.conf.in: explicitly list readable attributes.
++    End with 'by * none'.
++
  
    [ Stephen Gran ]
    * Fix deprecation warnings for sha module by using hashlib module instead
@@@ -59,13 -62,17 +65,17 @@@
  
    [ Martin Zobel-Helas ]
    * ud-generate: generate webPasswords
++  * ud-generate: generate voipPasswords
    * ud-replicate: set correct permissions for web-passwords
++  * ud-replicate: set correct permissions for voip-passwords
    * add freecdb to depends
    * userdir-ldap.schema
      - add webPasswords
      - add mailPreserveSuffixSeperator
 -  [ Peter Palfrader ]
 -  * userdir-ldap-slapd.conf.in: explicitly list readable attributes.
 -    End with 'by * none'.
++    - add voipPasswords
+ 
  
-  -- Martin Zobel-Helas <zobel@debian.org>  Fri, 23 Mar 2012 19:19:16 +0100
+  -- Peter Palfrader <weasel@debian.org>  Mon, 14 May 2012 18:45:07 +0200
  
  userdir-ldap (0.3.79) unstable; urgency=low
  

diff --cc ud-generate
index 9bad07a,0f6b5ae..21d8baa
--- 1/ud-generate
--- 2/ud-generate
+++ b/ud-generate
@@@ -32,6 -32,6 +32,9 @@@ import string, re, time, ldap, optparse
  from userdir_ldap import *
  from userdir_exceptions import *
  import UDLdap
++from xml.etree.ElementTree import Element, SubElement, Comment
++from xml.etree import ElementTree
++from xml.dom import minidom
  try:
     from cStringIO import StringIO
  except ImportError:
@@@ -69,6 -69,6 +72,12 @@@ DNSZone = ".debian.net
  Keyrings = ConfModule.sync_keyrings.split(":")
  GitoliteSSHRestrictions = getattr(ConfModule, "gitolitesshrestrictions", None)
  
++def prettify(elem):
++   """Return a pretty-printed XML string for the Element.
++   """
++   rough_string = ElementTree.tostring(elem, 'utf-8')
++   reparsed = minidom.parseString(rough_string)
++   return reparsed.toprettyxml(indent="  ")
  
  def safe_makedirs(dir):
     try:
@@@ -390,27 -390,6 +399,39 @@@ def GenWebPassword(accounts, File)
        Die(File, None, F)
        raise
  
-          Line = "<user id=\"%s\">\n <params>\n  <param name=\"password\" value=\"%s\"/>\n <params />\n</user>" % (a['uid'], Pass)
-          Line = Sanitize(Line) + "\n"
-          F.write("%s" % (Line))
 +# Generate the voipPassword list
 +def GenVoipPassword(accounts, File):
 +   F = None
 +   try:
 +      OldMask = os.umask(0077)
 +      F = open(File, "w", 0600)
 +      os.umask(OldMask)
 +
++      root = Element('domain')
++      root.attrib['name'] = "$${sip_profile}"
++
 +      for a in accounts:
 +         if not 'voipPassword' in a: continue
 +         if not a.pw_active(): continue
 +
 +         Pass = str(a['voipPassword'])
++         user = Element('user')
++         user.attrib['id'] = "%s" % (a['uid'])
++         root.append(user)
++         params = Element('params')
++         user.append(params)
++         param = Element('param')
++         params.append(param)
++         param.attrib['name'] = "a1-hash"
++         param.attrib['value'] = "%s" % (Pass)
++
++      F.write("%s" % (prettify(root)))
++
 +
 +   except:
 +      Die(File, None, F)
 +      raise
 +
  def GenSSHtarballs(global_dir, userlist, ssh_userkeys, grouprevmap, target, current_host):
     OldMask = os.umask(0077)
     tf = tarfile.open(name=os.path.join(global_dir, 'ssh-keys-%s.tar.gz' % current_host), mode='w:gz')
@@@ -1236,6 -1214,6 +1257,9 @@@ def generate_host(host, global_dir, acc
     if 'WEB-PASSWORDS' in ExtraList:
        DoLink(global_dir, OutDir, "web-passwords")
  
++   if 'VOIP-PASSWORDS' in ExtraList:
++      DoLink(global_dir, OutDir, "voip-passwords")
++
     if 'KEYRING' in ExtraList:
        for k in Keyrings:
           bn = os.path.basename(k)

diff --cc userdir-ldap-slapd.conf.in
Simple merge