Merge from alioth

But fix ud-replicate to use `$LOCALSYNCON' instead of `*$LOCALSYNCON*' in the case statement.

diff --combined debian/changelog
index 0459844,67ec0e9..7ad7d5a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -11,20 -11,6 +11,20 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
    * Change the build dependency on python-support to be versioned >= 0.3.
    * ud-roleadd: Do not try to make role accounts of objectClass
      inetOrgPerson, that doesn't work.
 +  * ud-fingerserv: implement daemonize() for non-inetd mode [sgran].
 +  * ud-useradd: support usergroups [HE].
 +  * ud-host/userdir-ldap.schema: Add 'purpose', 'physicalHost' to
 +    debianServer schema and teach ud-host about [HE].
 +  * ud-host: cleanup: Replace local copy HBaseDn of the centrally
 +    configured HostBaseDn [HE].
 +  * Add myself to uploaders.
 +  * ud-generate: Set shadow expiry to 1 for locked accounts [mhy].
 +  * update doc/slapd-config.txt: labeledURL was removed from the schema but
 +    not the slapd.conf example.  Do that now [mhy].
 +  * ud-generate: Mark that no passwords are exported also in the
 +    generated passwd file, not only in the shadow file (by using a "*"
 +    as password (meaning "no password"), instead of "x" (meaning "do I
 +    look like a passwd from the nineties? Look into /etc/shadow!")) [HE].
  
    [ Mark Hymers ]
    * ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:
@@@ -34,10 -20,15 +34,17 @@@
      filename
    * Remove use of deprecated functions from the string module
    * ud-arbimport: os.exit -> sys.exit
 +  * add simple ud-config script for use in shell scripts.  This allows
 +    querying config values.
  
-  -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:34:46 +0100
+   [ Marc 'HE' Brockschmidt ]
+   * Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
+     instead of hardcoding it into the script. Also introduce a variable
+     containing a shell glob on which no remote sync is needed, so that
+     the db host doesn't need to have a key in the authorized_keys file
+     for the sshdist user
+ 
+  -- Marc 'HE' Brockschmidt <he@debian.org>  Thu, 27 Dec 2007 17:14:51 +0100
  
  userdir-ldap (0.3.15) unstable; urgency=low
  

diff --combined ud-replicate
index 1a0ca55,26818ed..0c17297
--- 1/ud-replicate
--- 2/ud-replicate
+++ b/ud-replicate
@@@ -31,17 -31,19 +31,19 @@@ f
  PATH=/sbin:/usr/sbin:/bin:/usr/bin
  export PATH
  HOST=`hostname -f`
+ SYNCHOST=`ud-config synchost`;
+ LOCALSYNCON=`ud-config localsyncon`;
  cd /tmp/
  cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
  lockfile -r 1 -l 3600 lock
  trap "rm -f lock" exit
  
  case $HOST in
- *samosa*)
 -*$LOCALSYNCON*)
++$LOCALSYNCON)
      udhost=
      ;;
  *)
-     udhost="sshdist@db:"
+     udhost="sshdist@$SYNCHOST:"
      ;;
  esac