Imported Upstream version 111

diff --git a/configure b/configure
index f0999f4..4995a51 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ecryptfs-utils 110.
+# Generated by GNU Autoconf 2.69 for ecryptfs-utils 111.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ecryptfs-utils'
 PACKAGE_TARNAME='ecryptfs-utils'
-PACKAGE_VERSION='110'
-PACKAGE_STRING='ecryptfs-utils 110'
+PACKAGE_VERSION='111'
+PACKAGE_STRING='ecryptfs-utils 111'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1486,7 +1486,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ecryptfs-utils 110 to adapt to many kinds of systems.
+\`configure' configures ecryptfs-utils 111 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1558,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ecryptfs-utils 110:";;
+     short | recursive ) echo "Configuration of ecryptfs-utils 111:";;
    esac
   cat <<\_ACEOF
 
@@ -1716,7 +1716,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ecryptfs-utils configure 110
+ecryptfs-utils configure 111
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2081,7 +2081,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ecryptfs-utils $as_me 110, which was
+It was created by ecryptfs-utils $as_me 111, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -17657,7 +17657,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ecryptfs-utils $as_me 110, which was
+This file was extended by ecryptfs-utils $as_me 111, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17723,7 +17723,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ecryptfs-utils config.status 110
+ecryptfs-utils config.status 111
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index b452a45..bbc6ffc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 
 AC_PREREQ(2.59)
-AC_INIT([ecryptfs-utils],[110])
+AC_INIT([ecryptfs-utils],[111])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])

diff --git a/src/utils/ecryptfs-setup-private b/src/utils/ecryptfs-setup-private
index 3d9f046..e90d1d0 100755 (executable)
--- a/src/utils/ecryptfs-setup-private
+++ b/src/utils/ecryptfs-setup-private
@@ -409,6 +409,8 @@ echo
 echo "$(gettext 'Done configuring.')"
 echo
 
+# Link the user and session keyrings
+keyctl link @u @s
 # Skip the tests if we're in bootstrap mode, but exit with the encrypted
 # homedir mounted
 if [ "$BOOTSTRAP" = "1" ]; then