X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=53867e76bac12de3797288fd01070f25b5330481;hb=28c3209e235e0d637172a1c5acd1e4142a58f8da;hp=26158b975ebd8a73202beaed282a2e9261ba2278;hpb=d50247bd0ac0bf193b1f65a097e16af7b0ac87fa;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 26158b9..53867e7 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -37,7 +37,6 @@ tempfile2=''
 
 cleanup ()
 {
-  rm -f lock
   rm -rf $tempdir
   rm -f  $tempfile
   rm -f  $tempfile2
@@ -49,9 +48,13 @@ HOST=`hostname -f`
 SYNCHOST=`ud-config synchost`;
 LOCALSYNCON=`ud-config localsyncon`;
 EMAILAPPEND=`ud-config emailappend`;
-cd /tmp/
-cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
-lockfile -r 1 -l 3600 lock
+cd /var/lib/misc
+exec 200< "."
+if ! flock -w 60 -e 200; then
+    log "Cannot acquire lock on `pwd`"
+    exit 1
+fi
+
 trap cleanup exit
 
 case $HOST in
@@ -76,14 +79,17 @@ fi
 
 rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o ControlPath=/var/run/.ud-replicate.ssh.socket -o ControlMaster=auto -o ControlPersist=2h -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
+rm -f __db.passwd.db.t
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
 then
+    rm -f __db.shadow.db.t
     (umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
     chown root.shadow shadow.db.t
     chmod 0640 shadow.db.t
     mv -f shadow.db.t shadow.db
 fi
+rm -f __db.group.db.t
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
 mv -f group.db.t group.db