[Da-tools-commits] ./da-tools/userdir-ldap-common r399: Uncommit a change from aba after a little discussion on irc

[Joerg Jaspert]

------------------------------------------------------------
revno: 399
committer: Joerg Jaspert <joerg at debian.org>
branch nick: userdir-ldap-common
timestamp: Sun 2008-05-18 13:37:40 +0200
message:
  Uncommit a change from aba after a little discussion on irc
modified:
  debian/changelog
  ud-replicate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-18 11:32:27 +0000
+++ b/debian/changelog	2008-05-18 11:37:40 +0000
@@ -3,9 +3,6 @@
   [ 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

=== modified file 'ud-replicate'
--- a/ud-replicate	2008-05-18 11:26:17 +0000
+++ b/ud-replicate	2008-05-18 11:37:40 +0000
@@ -5,7 +5,6 @@
 #   Copyright (c) 2004-2005  Joey Schulze <joey at infodrom.org>
 #   Copyright (c) 2008 Peter Palfrader <peter at palfrader.org>
 #   Copyright (c) 2008 Stephen Gran <sgran at debian.org>
-#   Copyright (c) 2008 Andreas Barth <aba at not.so.argh.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
@@ -59,7 +58,7 @@
     ;;
 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" ]