Stuff

diff --git a/doc/makefile b/doc/makefile
index 4e314b3..9dcefb4 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -1,7 +1,7 @@
 .SILENT:
 
 MANPAGES = ud-generate.8 ud-gpgimport.8 ud-info.1 ud-xearth.1 ud-useradd.8 \
-           ud-userimport.8
+           ud-userimport.8 ud-mailgate.8
 
 all: $(MANPAGES)
 

diff --git a/ud-mailgate b/ud-mailgate
index a93d7cc..1e42f4f 100755 (executable)
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -190,8 +190,8 @@ def HandleChange(Reply,DnRecord,Key):
            Show = 1;
           Res = "OK";
          else:
-            Res = DoPosition(Line,Attrs) or DoSSH(Line,Attrs) or \
-                  DoDNS(Line,Attrs,DnRecord) or DoArbChange(Line,Attrs);
+            Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \ 
+                  DoArbChange(Line,Attrs) or DoSSH(Line,Attrs);
       except:
          Res = None;
          Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);

diff --git a/ud-replicate b/ud-replicate
index 3aa20be..371416d 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -5,7 +5,7 @@ set -e
 HOST=`hostname -f`
 cd /tmp/
 cd /var/lib/misc > /dev/null 2>&1 || cd /var/state/glibc/ > /dev/null 2>&1 || cd /var/db/ > /dev/null 2>&1
-lockfile -r 1 -l 3600 lock
+lockfile -r 1 -l 3600 lock > /dev/null 2>&1
 trap "rm -f lock > /dev/null 2>&1" exit
 rsync -e ssh -rp sshdist@samosa:/var/cache/userdir-ldap/hosts/$HOST . > /dev/null 2>&1
 makedb $HOST/passwd.tdb -o passwd.db > /dev/null 2>&1

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 41316b1..8b1cc52 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -3,6 +3,7 @@
 # Basic LDAP configuration
 ldaphost = "db.debian.org";
 basedn   = "ou=users,dc=debian,dc=org";
+hostbasedn = "ou=hosts,dc=debian,dc=org";
 adminuser = "admin";
 
 # Printable email addresses are shown as: 'cn mn sn <uid@emailappend>'
@@ -36,6 +37,7 @@ webloginhtml = "login.html";
 websearchhtml = "searchform.html";
 websearchresulthtml = "searchresults.html";
 webupdatehtml = "update.html";
+hosthtml = "hostinfo.html";
 
 webloginurl = "login.cgi";
 websearchurl = "search.cgi";