From 2f0f681b8005cbb37c8a8ce936536378c73178a9 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 18 May 2008 13:37:40 +0200 Subject: [PATCH] Uncommit a change from aba after a little discussion on irc --- debian/changelog | 3 --- ud-replicate | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c12898..23693bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,6 @@ userdir-ldap (0.3.25+common1) unstable; urgency=low [ Martin Zobel-Helas ] * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP) - [ Andreas Barth ] - * Disable GSSAPIAuthentication in ud-replicate (safes time) - [ Joerg Jaspert ] * User sync_keyrings from config file in ud-generate instead of a hardcoded list diff --git a/ud-replicate b/ud-replicate index 93fb3a7..d2a065f 100755 --- a/ud-replicate +++ b/ud-replicate @@ -5,7 +5,6 @@ # Copyright (c) 2004-2005 Joey Schulze # Copyright (c) 2008 Peter Palfrader # Copyright (c) 2008 Stephen Gran -# Copyright (c) 2008 Andreas Barth # # 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 @@ -59,7 +58,7 @@ $LOCALSYNCON) ;; esac -rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey -o GSSAPIAuthentication=no' -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" ] -- 2.20.1