Imported Debian patch 1.1.0-2

diff --git a/debian/changelog b/debian/changelog
index a4751d653c2dc555f09b294c3b5cafdddd3b3a82..56808d67d4d736c45cd7ed50e9c0b4c0eae9715d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:1.1.0-2) unstable; urgency=low
+
+  * Make sure rpcsec_gss_krb5 is loaded if needed in nfs-kernel-server. It
+    used not to be when NEED_SVCGSSD=true and NEED_GSSD=false. Per bug report
+    from Ubuntu. (LP: #104923)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri, 11 May 2007 16:51:31 +0200
+
 nfs-utils (1:1.1.0-1) unstable; urgency=low
 
   * 01-fix-hostent-memory-leak.diff: New patch, fixes a memory leak related to

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 3922c1a07031bc9a164d82e7cb9a62e4a10e0349..b677acaf1964f88e1ff1123179208c85f8e40f13 100644 (file)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -104,6 +104,7 @@ case "$1" in
                [ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
        
                if [ "$NEED_SVCGSSD" = "yes" ]; then
+                       do_modprobe rpcsec_gss_krb5
                        log_progress_msg "svcgssd"
                        start-stop-daemon --start --oknodo --quiet \
                            --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS