[Da-tools-commits] ./da-tools/userdir-ldap-common r400: Make ud-useradd also not use hardcoded path

[Joerg Jaspert]

------------------------------------------------------------
revno: 400
committer: Joerg Jaspert <joerg at debian.org>
branch nick: userdir-ldap-common
timestamp: Sun 2008-05-18 13:45:59 +0200
message:
  Make ud-useradd also not use hardcoded path
modified:
  debian/changelog
  ud-useradd
  userdir-ldap.conf
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-18 11:37:40 +0000
+++ b/debian/changelog	2008-05-18 11:45:59 +0000
@@ -4,7 +4,9 @@
   * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
 
   [ Joerg Jaspert ]
-  * User sync_keyrings from config file in ud-generate instead of a
+  * 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 at debian.org>  Sun, 18 May 2008 13:32:01 +0200

=== modified file 'ud-useradd'
--- a/ud-useradd	2007-12-26 20:49:42 +0000
+++ b/ud-useradd	2008-05-18 11:45:59 +0000
@@ -70,7 +70,7 @@
 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 == "":

=== modified file 'userdir-ldap.conf'
--- a/userdir-ldap.conf	2008-05-18 11:32:27 +0000
+++ b/userdir-ldap.conf	2008-05-18 11:45:59 +0000
@@ -42,8 +42,12 @@
 
 # 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";