X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=0f98f8b0c2e4f05a38eae59743c101d06944017a;hb=8d94eef3f64954d53032af209748e4be25609a8c;hp=0c17297f3328cf285b303e8b30e646742829da12;hpb=9301e72abff959ad084a72d50169a31c898c304b;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 0c17297..0f98f8b 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,8 +1,9 @@
-#! /bin/sh
+#! /bin/bash
 
 #   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
 #   Copyright (c) 2002-2003,2006  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
+#   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@ set -e
 if [ -z "$TERM" -o "$TERM" = "dumb" ]
 then
     exec > /dev/null 2>&1
+    sleep $(( $RANDOM % 120 ))
 else
     verbose=-v
 fi
@@ -47,7 +49,7 @@ $LOCALSYNCON)
     ;;
 esac
 
-rsync ${verbose} -e ssh -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
@@ -66,6 +68,15 @@ done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
+find $HOST -name "ssh-rsa-shadow-*" -type f | while read f
+do
+       user=$(echo $f | sed s@.*-@@)
+       id ${user} 2>/dev/null >/dev/null
+       if [ $? -eq 0 ]; then 
+               chown $user $f
+       fi
+done
+
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
 	for c in $CHROOTS; do