Merge from alioth

diff --git a/debian/changelog b/debian/changelog
index 64a6dcd..c6fc647 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
   * ud-generate: Set shadow expiry to 1 for locked accounts.
   * update doc/slapd-config.txt: labeledURL was removed from the schema but
     not the slapd.conf example.  Do that now.
+  * add simple ud-config script for use in shell scripts.  This allows
+    querying config values.
 
   [ Marc 'HE' Brockschmidt ]
   * Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
@@ -36,6 +38,10 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
     debianServer schema and teach ud-host about it
   * ud-host: cleanup: Replace local copy HBaseDn of the centrally
     configured HostBaseDn.
+  * 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!")).
 
   [ Joerg Jaspert ]
   * Enhance copyright file a bit, also adding a pointer to our repository

diff --git a/debian/install b/debian/install
index 50577ee..9758639 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -22,5 +22,5 @@ ud-roleadd usr/bin
 sigcheck usr/bin
 userdir-ldap.conf etc/userdir-ldap/
 generate.conf etc/userdir-ldap/
-templates/ etc/userdir-ldap/templates/
+templates/ etc/userdir-ldap/
 userdir-ldap.schema etc/ldap/schema/

diff --git a/ud-replicate b/ud-replicate
index 26818ed..0c17297 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -39,7 +39,7 @@ lockfile -r 1 -l 3600 lock
 trap "rm -f lock" exit
 
 case $HOST in
-*$LOCALSYNCON*)
+$LOCALSYNCON)
     udhost=
     ;;
 *)