voipPassword -> rtcPassword

diff --git a/debian/changelog b/debian/changelog
index 19ad5af..e9280f8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-userdir-ldap (0.3.80) UNRELEASED; urgency=low
+userdir-ldap (0.3.80+nmu1) UNRELEASED; urgency=low
 
   [ Peter Palfrader ]
   * some ud-echelon fixes,
@@ -82,7 +82,11 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
   [ Tollef Fog Heen ]
   * Export SSH host keys for gitolite, subject to a regex filter.
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 14 May 2012 18:45:07 +0200
+  [ Luca Filipozzi ]
+  * rename voipPassword to rtcPassword in schema
+  * update code to match
+
+ -- Luca Filipozzi <lfilipoz@emyr.net>  Thu, 16 Jan 2014 22:52:47 +0000
 
 userdir-ldap (0.3.79) unstable; urgency=low
 

diff --git a/ud-generate b/ud-generate
index fa15b3a..e9c4753 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -413,8 +413,8 @@ def GenWebPassword(accounts, File):
       Die(File, None, F)
       raise
 
-# Generate the voipPassword list
-def GenVoipPassword(accounts, File):
+# Generate the rtcPassword list
+def GenRtcPassword(accounts, File):
    F = None
    try:
       OldMask = os.umask(0077)
@@ -422,10 +422,10 @@ def GenVoipPassword(accounts, File):
       os.umask(OldMask)
 
       for a in accounts:
-         if not 'voipPassword' in a: continue
+         if not 'rtcPassword' in a: continue
          if not a.pw_active(): continue
 
-         Line = "%s@debian.org:%s:sip.debian.org:AUTHORIZED" % (a['uid'], str(a['voipPassword']))
+         Line = "%s@debian.org:%s:rtc.debian.org:AUTHORIZED" % (a['uid'], str(a['rtcPassword']))
          Line = Sanitize(Line) + "\n"
          F.write("%s" % (Line))
 
@@ -1105,7 +1105,7 @@ def get_accounts(ldap_conn):
                     "keyFingerPrint", "privateSub", "mailDisableMessage",\
                     "mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
                     "mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
-                    "mailContentInspectionAction", "webPassword", "voipPassword"])
+                    "mailContentInspectionAction", "webPassword", "rtcPassword"])
 
    if passwd_attrs is None:
       raise UDEmptyList, "No Users"
@@ -1193,7 +1193,7 @@ def generate_all(global_dir, ldap_conn):
    GenMailList(accounts, global_dir + "mail-rhsbl", "mailRHSBL")
    GenMailList(accounts, global_dir + "mail-whitelist", "mailWhitelist")
    GenWebPassword(accounts, global_dir + "web-passwords")
-   GenVoipPassword(accounts, global_dir + "voip-passwords")
+   GenRtcPassword(accounts, global_dir + "rtc-passwords")
    GenKeyrings(global_dir)
 
    # Compatibility.
@@ -1313,8 +1313,8 @@ def generate_host(host, global_dir, all_accounts, all_hosts, ssh_userkeys):
    if 'WEB-PASSWORDS' in ExtraList:
       DoLink(global_dir, OutDir, "web-passwords")
 
-   if 'VOIP-PASSWORDS' in ExtraList:
-      DoLink(global_dir, OutDir, "voip-passwords")
+   if 'RTC-PASSWORDS' in ExtraList:
+      DoLink(global_dir, OutDir, "rtc-passwords")
 
    if 'KEYRING' in ExtraList:
       for k in Keyrings:

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index 67b6016..63ccf7f 100644 (file)
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -54,7 +54,7 @@ access to attrs=privateSub
        by * break
 
 # allow users write access to an explicit subset of their fields
-access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions,facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,latitude,longitude,VoIP,userPassword,sudoPassword,webPassword,voipPassword,bATVToken
+access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions,facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,latitude,longitude,VoIP,userPassword,sudoPassword,webPassword,rtcPassword,bATVToken
        by self write
        by * break
 
@@ -64,7 +64,7 @@ access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,bi
 ##
 
 # allow authn/z by anyone
-access to attrs=userPassword,sudoPassword,webPassword,voipPassword,bATVToken
+access to attrs=userPassword,sudoPassword,webPassword,rtcPassword,bATVToken
        by * compare
 
 # readable only by self

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index b45f6c7..ac3c1cf 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -109,7 +109,7 @@
 #   .41 - sshdistAuthKeysHost
 #   .42 - dnsTTL
 #   .43 - webPassword
-#   .44 - voipPassword
+#   .44 - rtcPassword
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -409,8 +409,8 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.43
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
 
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.44
-       NAME 'voipPassword'
-       DESC 'password for voip.debian.org'
+       NAME 'rtcPassword'
+       DESC 'rtc password for SIP/XMPP'
        EQUALITY octetStringMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )