[Da-tools-commits] ./debian/userdir-ldap r418: merge from alioth:

[Peter Palfrader]

------------------------------------------------------------
revno: 418
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Fri 2008-05-23 10:00:32 +0200
message:
  merge from alioth:
  Make ud-useradd also not use hardcoded path
  Use sync_keyrings from config instead of hardcoded list
modified:
  debian/changelog
  ud-generate
  ud-useradd
  userdir-ldap.conf
    ------------------------------------------------------------
    revno: 349.2.48
    committer: Andreas Barth <aba at not.so.argh.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 11:26:17 +0000
    message:
      Disable GSSAPIAuthentication in ud-replicate
    modified:
      debian/changelog
      ud-replicate
    ------------------------------------------------------------
    revno: 349.2.49
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 13:32:27 +0200
    message:
      Use sync_keyrings from config instead of hardcoded list
    modified:
      debian/changelog
      ud-generate
      userdir-ldap.conf
    ------------------------------------------------------------
    revno: 349.2.50
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 13:37:40 +0200
    message:
      Uncommit a change from aba after a little discussion on irc
    modified:
      debian/changelog
      ud-replicate
    ------------------------------------------------------------
    revno: 349.2.51
    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-22 20:41:25 +0000
+++ b/debian/changelog	2008-05-23 08:00:32 +0000
@@ -1,3 +1,13 @@
+userdir-ldap (0.3.XX) Xnstable; urgency=low
+
+  [ 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
+
+ -- Peter Palfrader <weasel at debian.org>  Fri, 23 May 2008 09:59:15 +0200
+
 userdir-ldap (0.3.30) unstable; urgency=low
 
   * When we touch usePassword in ud-info or ud-mailgate we now also

=== modified file 'ud-generate'
--- a/ud-generate	2008-05-22 20:41:25 +0000
+++ b/ud-generate	2008-05-23 08:00:32 +0000
@@ -38,8 +38,7 @@
 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:

=== 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-14 18:55:18 +0000
+++ b/userdir-ldap.conf	2008-05-18 11:45:59 +0000
@@ -42,7 +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";