Merge from Debian

diff --git a/debian/changelog b/debian/changelog
index 765fe93..9cd0018 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,19 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
 
  -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 13:40:04 +0200
 
+userdir-ldap (0.3.25+common1) unstable; urgency=low
+
+  [ Martin Zobel-Helas ]
+  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
+
+  [ Joerg Jaspert ]
+  * Use sync_keyrings from config file in ud-generate instead of a
+  hardcoded list
+  * Use add_keyrings from config file in ud-useradd instead of a
+  hardcoded list
+
+ -- Joerg Jaspert <joerg@debian.org>  Sun, 18 May 2008 13:32:01 +0200
+
 userdir-ldap (0.3.25) unstable; urgency=low
 
   * Make ssh-keys.tar.gz readable only by the user.

diff --git a/ud-generate b/ud-generate
index 6103fa8..10a124d 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -38,8 +38,7 @@ CurrentHost = "";
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
 BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
 DNSZone = ".debian.net"
-Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg",
-             "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ]
+Keyrings = ConfModule.sync_keyrings.split(":")
 
 def safe_makedirs(dir):
     try:

diff --git a/ud-useradd b/ud-useradd
index 494c348..f5c1fbc 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -70,7 +70,7 @@ for (switch, val) in options:
 l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
 
 # Locate the key of the user we are adding
-SetKeyrings(["/org/keyring.debian.org/keyrings/debian-keyring.gpg"])
+SetKeyrings(ConfModule.add_keyrings.split(":"))
 while (1):
    Foo = raw_input("Who are you going to add (for a GPG search)? ");
    if Foo == "":

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 98a4c28..090ac5a 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -42,7 +42,12 @@ passdir = "/etc/userdir-ldap/";
 
 # GPG Things
 gpg = "/usr/bin/gpg";
+# The whole set of all keyrings
 keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/home/jgg/keys/extrakeys.gpg:/home/jgg/keys/guest-keys.gpg";
+# Keyrings synced to other machines, if they need them
+sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp";
+# Keyrings used to search in when new developers get added
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
 
 # For the WEB interface
 webloginhtml = "login.html";

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index d31d0e7..3f64e90 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -474,7 +474,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
              jabberJID $ keyFingerPrint $ latitude $ longitude $ mn $
              onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
              access $ gender $ birthDate $ mailCallout $ mailGreylisting $
-              mailRBL $ mailRHSBL $ mailWhitelist
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP
        ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2