Current autofs patch queue

From: Lan Yixun (dlan) <[email protected]>

this patch instroduce a compatible layer between Heimdal and MTT Krb5. And I slightly rework the original patch to make it more readable.

Upstream Discussion:
http://thread.gmane.org/gmane.linux.kernel.autofs/4203

Gentoo Bugs:
https://bugs.gentoo.org/show_bug.cgi?id=210762

Edited by: Ian Kent <[email protected]>
- fix code indentation.
- update configure to include change.

Signed-off-by Lan Yixun (dlan) <[email protected]>

---
 CHANGELOG            |    1 +
 aclocal.m4           |    7 ++++
 configure            |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/config.h.in  |    3 ++
 modules/cyrus-sasl.c |   39 ++++++++++++++++++++---
 5 files changed, 129 insertions(+), 5 deletions(-)

CHANGELOG +1 -0

index fe232f4..c77be18 100644
@@ -58,6 +58,7 @@
 - add after sssd dependency to unit file.
 - dont start readmap unless ready.
 - fix crash due to thread unsafe use of libldap.
+- fix compile error with heimdal support enabled.
 
 25/07/2012 autofs-5.0.7
 =======================

aclocal.m4 +7 -0

index c5de159..7a8b03c 100644
@@ -299,6 +299,13 @@ else
   HAVE_KRB5=1
   KRB5_LIBS=`$KRB5_CONFIG --libs`
   KRB5_FLAGS=`$KRB5_CONFIG --cflags`
+
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_LIBS=$LIBS
+  CFLAGS="$CFLAGS $KRB5_FLAGS"
+  LIBS="$LIBS $KRB5_LIBS"
+
+  AC_CHECK_FUNCS([krb5_principal_get_realm])
 fi])
 
 dnl --------------------------------------------------------------------------

configure +84 -0

index 08b7ccc..1086eba 100755
@@ -1559,6 +1559,73 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.

@@ -4039,6 +4106,23 @@ $as_echo "yes" >&6; }
   HAVE_KRB5=1
   KRB5_LIBS=`$KRB5_CONFIG --libs`
   KRB5_FLAGS=`$KRB5_CONFIG --cflags`
+
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_LIBS=$LIBS
+  CFLAGS="$CFLAGS $KRB5_FLAGS"
+  LIBS="$LIBS $KRB5_LIBS"
+
+  for ac_func in krb5_principal_get_realm
+do :
+  ac_fn_c_check_func "$LINENO" "krb5_principal_get_realm" "ac_cv_func_krb5_principal_get_realm"
+if test "x$ac_cv_func_krb5_principal_get_realm" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_KRB5_PRINCIPAL_GET_REALM 1
+_ACEOF
+
+fi
+done
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing versionsort" >&5

include/config.h.in +3 -0

index a2a05a8..8a52080 100644
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `krb5_principal_get_realm' function. */
+#undef HAVE_KRB5_PRINCIPAL_GET_REALM
+
 /* Define to 1 if you have the `ldap_create_page_control' function. */
 #undef HAVE_LDAP_CREATE_PAGE_CONTROL
 

modules/cyrus-sasl.c +0 -0

index 68f9242..b9c16f3 100644
@@ -64,6 +64,35 @@
 #endif
 #endif
 

modules/cyrus-sasl.c +24 -5

+#else
+void _krb5_princ_realm(krb5_context context, krb5_const_principal princ,
+                          const char **realm, int *len)
+{
+       const krb5_data *data;
+
+       data = krb5_princ_realm(context, princ);
+       if (data) {
+               *realm = data->data;
+               *len = data->length;
+       } else {
+               *realm = NULL;
+               *len = 0;
+       }
+       return;
+}
+#endif
+
+
 /*
  *  Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
  *  environment variable so that the library knows where to find it.

@@ -379,7 +408,8 @@ sasl_do_kinit(unsigned logopt, struct lookup_context *ctxt)
        krb5_principal tgs_princ, krb5_client_princ;
        krb5_creds my_creds;
        char *tgs_name;
-       int status;
+       const char *realm_name;
+       int status, realm_length;
 
        if (ctxt->kinit_done)
                return 0;

@@ -450,12 +480,11 @@ sasl_do_kinit(unsigned logopt, struct lookup_context *ctxt)
        }
 
        /* setup a principal for the ticket granting service */
+       _krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ, &realm_name, &realm_length);
        ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
-               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
-               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
+               realm_length, realm_name,
                strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
-               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
-               krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
+               realm_length, realm_name,
                0);
        if (ret) {
                error(logopt,

Quoted 178 lines · Ian Kent

From: Lan Yixun (dlan) <[email protected]>

this patch instroduce a compatible layer between Heimdal and MTT Krb5. And I slightly rework the original patch to make it more readable.

Upstream Discussion:
http://thread.gmane.org/gmane.linux.kernel.autofs/4203

Gentoo Bugs:
https://bugs.gentoo.org/show_bug.cgi?id=210762

Edited by: Ian Kent <[email protected]>
- fix code indentation.
- update configure to include change.

Signed-off-by Lan Yixun (dlan) <[email protected]>

---
 CHANGELOG            |    1 +
 aclocal.m4           |    7 ++++
 configure            |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/config.h.in  |    3 ++
 modules/cyrus-sasl.c |   39 ++++++++++++++++++++---
 5 files changed, 129 insertions(+), 5 deletions(-)

CHANGELOG +1 -0

index fe232f4..c77be18 100644
@@ -58,6 +58,7 @@
 - add after sssd dependency to unit file.
 - dont start readmap unless ready.
 - fix crash due to thread unsafe use of libldap.
+- fix compile error with heimdal support enabled.
 
 25/07/2012 autofs-5.0.7
 =======================

aclocal.m4 +7 -0

index c5de159..7a8b03c 100644
@@ -299,6 +299,13 @@ else
   HAVE_KRB5=1
   KRB5_LIBS=`$KRB5_CONFIG --libs`
   KRB5_FLAGS=`$KRB5_CONFIG --cflags`
+
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_LIBS=$LIBS
+  CFLAGS="$CFLAGS $KRB5_FLAGS"
+  LIBS="$LIBS $KRB5_LIBS"
+
+  AC_CHECK_FUNCS([krb5_principal_get_realm])
 fi])
 
 dnl --------------------------------------------------------------------------

configure +84 -0

index 08b7ccc..1086eba 100755
@@ -1559,6 +1559,73 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.

@@ -4039,6 +4106,23 @@ $as_echo "yes" >&6; }
   HAVE_KRB5=1
   KRB5_LIBS=`$KRB5_CONFIG --libs`
   KRB5_FLAGS=`$KRB5_CONFIG --cflags`
+
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_LIBS=$LIBS
+  CFLAGS="$CFLAGS $KRB5_FLAGS"
+  LIBS="$LIBS $KRB5_LIBS"
+
+  for ac_func in krb5_principal_get_realm
+do :
+  ac_fn_c_check_func "$LINENO" "krb5_principal_get_realm" "ac_cv_func_krb5_principal_get_realm"
+if test "x$ac_cv_func_krb5_principal_get_realm" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_KRB5_PRINCIPAL_GET_REALM 1
+_ACEOF
+
+fi
+done
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing versionsort" >&5

include/config.h.in +3 -0

index a2a05a8..8a52080 100644
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `krb5_principal_get_realm' function. */
+#undef HAVE_KRB5_PRINCIPAL_GET_REALM
+
 /* Define to 1 if you have the `ldap_create_page_control' function. */
 #undef HAVE_LDAP_CREATE_PAGE_CONTROL
 

modules/cyrus-sasl.c +0 -0

index 68f9242..b9c16f3 100644
@@ -64,6 +64,35 @@
 #endif
 #endif
 

modules/cyrus-sasl.c line 76

Quoted 10 lines

modules/cyrus-sasl.c +10 -0

+#ifdef HAVE_KRB5_PRINCIPAL_GET_REALM
+void _krb5_princ_realm(krb5_context context, krb5_const_principal princ,
+                          const char **realm, int *len)
+{
+       *realm = krb5_principal_get_realm(context, princ);
+       if (*realm)
+               *len = strlen(*realm);
+       else
+               *len = 0;
+       return;

missed '}' here

Reported by Gordon Lack (gordon[dot]m[dot]lack[at]gsk[dot]com).

If the automount daemon needs to create a directory (hierarchy) for an automount and it is started up with a umask of 027 (or similar) then it creates unusable directories (permission == 550).

---
 CHANGELOG          |    1 +
 daemon/automount.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

CHANGELOG +1 -0

index 2499f1c..3a3fec1 100644
@@ -75,6 +75,7 @@
 - fix fix wildcard multi map regression.
 - improve timeout option description.
 - only probe specific nfs version if requested.
+- fix bad mkdir permission on create.
 
 25/07/2012 autofs-5.0.7
 =======================

daemon/automount.c +0 -0

index 97c726a..6b55103 100644

daemon/automount.c +1 -1

+		if (ret == -1) {
 			errno = EACCES;
 			return 0;
 		}
 
--

To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

There are patches from several contributors I plan on committing so I thought posting them to the list for final review would be sensible.

I'm not sure when I'll commit the changes but I hope in the next couple of days.

---

Dustin Polke (1):
autofs-5.0.7 - fix compilation of lookup_ldap.c without sasl

Ian Kent (13):
autofs-5.0.7 - don't override LDFLAGS in make rules autofs-5.0.7 - fix a couple of compiler warnings autofs-5.0.7 - add after sssd dependency to unit file autofs-5.0.7 - dont start readmap unless ready autofs-5.0.7 - fix dumpmaps multi output autofs-5.0.7 - try and cleanup after dumpmaps autofs-5.0.7 - teach dumpmaps to output simple key value pairs autofs-5.0.7 - fix syncronize handle_mounts() shutdown autofs-5.0.7 - fix fix wildcard multi map regression autofs-5.0.7 - improve timeout option description autofs-5.0.7 - only probe specific nfs version when requested autofs-5.0.7 - fix bad mkdir permission on create autofs-5.0.7 - setup program map env from macro table

Lan Yixun (dlan) (10):
autofs-5.0.7 - fix compile error with heimdal support enabled autofs-5.0.7 - fix typo forced-shutdown should be force-shutdown autofs-5.0.7 - fix hesiod check error and use correct $(LIBS) setting autofs-5.0.7 - fix dead LDAP symbolic link when LDAP support is disabled autofs-5.0.7 - add missing libtirpc lib to mount_nfs.so when TIRPC enabled autofs-5.0.7 - use compiler determined by configure instead of hard-coded ones autofs-5.0.7 - remove hard-coded STRIP variable
autofs-5.0.7 - use LIBS for link libraries
autofs-5.0.7 - unbundle NOTSTRIP from DEBUG so they dont depend on each other autofs-5.0.7 - fix occasional build error when enable parallel compiling

Leonardo Chiquitto (1):
autofs-5.0.7 - fix crash due to thread unsafe use of libldap

 CHANGELOG                      |   23 ++++
 Makefile.conf.in               |    3
 Makefile.rules                 |   34 +++--
 aclocal.m4                     |   19 ++-
 autofs.spec                    |    3
 configure                      |  104 +++++++++++++++--
 configure.in                   |    2
 daemon/Makefile                |    2
 daemon/automount.c             |   71 +++++++++--
 daemon/state.c                 |   15 +-
 include/config.h.in            |    3
 include/lookup_ldap.h          |    4 -
 include/macros.h               |    1
 include/master.h               |    1
 lib/Makefile                   |    6 +
 lib/macros.c                   |   28 ++++
 lib/master.c                   |  250 ++++++++++++++++++++++++++++++++++++++--
 man/auto.master.5.in           |    5 +
 man/automount.8                |   23 +++-
 modules/Makefile               |   20 ++-
 modules/cyrus-sasl.c           |   39 +++++-
 modules/lookup_file.c          |   25 +++-
 modules/lookup_ldap.c          |   76 +++++++++++-
 modules/lookup_nisplus.c       |   26 +++-
 modules/lookup_program.c       |   20 +++
 modules/lookup_sss.c           |   22 +++-
 modules/lookup_yp.c            |   23 +++-
 modules/mount_bind.c           |    2
 modules/mount_nfs.c            |   14 ++
 redhat/autofs.sysconfig.in     |    5 +
 samples/autofs.conf.default.in |    5 +
 samples/autofs.service.in      |    2
 32 files changed, 753 insertions(+), 123 deletions(-)

--
Ian

Quoted 77 lines · Ian Kent

There are patches from several contributors I plan on committing so I thought posting them to the list for final review would be sensible.

I'm not sure when I'll commit the changes but I hope in the next couple of days.

---

Dustin Polke (1):
autofs-5.0.7 - fix compilation of lookup_ldap.c without sasl

Ian Kent (13):
autofs-5.0.7 - don't override LDFLAGS in make rules autofs-5.0.7 - fix a couple of compiler warnings autofs-5.0.7 - add after sssd dependency to unit file autofs-5.0.7 - dont start readmap unless ready autofs-5.0.7 - fix dumpmaps multi output autofs-5.0.7 - try and cleanup after dumpmaps autofs-5.0.7 - teach dumpmaps to output simple key value pairs autofs-5.0.7 - fix syncronize handle_mounts() shutdown autofs-5.0.7 - fix fix wildcard multi map regression autofs-5.0.7 - improve timeout option description autofs-5.0.7 - only probe specific nfs version when requested autofs-5.0.7 - fix bad mkdir permission on create autofs-5.0.7 - setup program map env from macro table

Lan Yixun (dlan) (10):
autofs-5.0.7 - fix compile error with heimdal support enabled autofs-5.0.7 - fix typo forced-shutdown should be force-shutdown autofs-5.0.7 - fix hesiod check error and use correct $(LIBS) setting autofs-5.0.7 - fix dead LDAP symbolic link when LDAP support is disabled autofs-5.0.7 - add missing libtirpc lib to mount_nfs.so when TIRPC enabled autofs-5.0.7 - use compiler determined by configure instead of hard-coded ones autofs-5.0.7 - remove hard-coded STRIP variable
autofs-5.0.7 - use LIBS for link libraries
autofs-5.0.7 - unbundle NOTSTRIP from DEBUG so they dont depend on each other autofs-5.0.7 - fix occasional build error when enable parallel compiling

Leonardo Chiquitto (1):
autofs-5.0.7 - fix crash due to thread unsafe use of libldap

 CHANGELOG                      |   23 ++++
 Makefile.conf.in               |    3
 Makefile.rules                 |   34 +++--
 aclocal.m4                     |   19 ++-
 autofs.spec                    |    3
 configure                      |  104 +++++++++++++++--
 configure.in                   |    2
 daemon/Makefile                |    2
 daemon/automount.c             |   71 +++++++++--
 daemon/state.c                 |   15 +-
 include/config.h.in            |    3
 include/lookup_ldap.h          |    4 -
 include/macros.h               |    1
 include/master.h               |    1
 lib/Makefile                   |    6 +
 lib/macros.c                   |   28 ++++
 lib/master.c                   |  250 ++++++++++++++++++++++++++++++++++++++--
 man/auto.master.5.in           |    5 +
 man/automount.8                |   23 +++-
 modules/Makefile               |   20 ++-
 modules/cyrus-sasl.c           |   39 +++++-
 modules/lookup_file.c          |   25 +++-
 modules/lookup_ldap.c          |   76 +++++++++++-
 modules/lookup_nisplus.c       |   26 +++-
 modules/lookup_program.c       |   20 +++
 modules/lookup_sss.c           |   22 +++-
 modules/lookup_yp.c            |   23 +++-
 modules/mount_bind.c           |    2
 modules/mount_nfs.c            |   14 ++
 redhat/autofs.sysconfig.in     |    5 +
 samples/autofs.conf.default.in |    5 +
 samples/autofs.service.in      |    2
 32 files changed, 753 insertions(+), 123 deletions(-)

Quoted 2 lines

--
Ian

HI Ian:
May I suggest you pushing this patch serials to one test branch
(for-next?) in the public repository?
I find this much more convenient for me to test (instead of fetch all the patches and apply myself).
Since this branch is experimental, you can delete it later or rebase to master branch.

Quoted 82 lines · Dennis Lan (dlan)

Quoted 77 lines · Ian Kent

There are patches from several contributors I plan on committing so I thought posting them to the list for final review would be sensible.

I'm not sure when I'll commit the changes but I hope in the next couple of days.

---

Dustin Polke (1):
autofs-5.0.7 - fix compilation of lookup_ldap.c without sasl

Ian Kent (13):
autofs-5.0.7 - don't override LDFLAGS in make rules autofs-5.0.7 - fix a couple of compiler warnings autofs-5.0.7 - add after sssd dependency to unit file autofs-5.0.7 - dont start readmap unless ready autofs-5.0.7 - fix dumpmaps multi output autofs-5.0.7 - try and cleanup after dumpmaps autofs-5.0.7 - teach dumpmaps to output simple key value pairs autofs-5.0.7 - fix syncronize handle_mounts() shutdown autofs-5.0.7 - fix fix wildcard multi map regression autofs-5.0.7 - improve timeout option description autofs-5.0.7 - only probe specific nfs version when requested autofs-5.0.7 - fix bad mkdir permission on create autofs-5.0.7 - setup program map env from macro table

Lan Yixun (dlan) (10):
autofs-5.0.7 - fix compile error with heimdal support enabled autofs-5.0.7 - fix typo forced-shutdown should be force-shutdown autofs-5.0.7 - fix hesiod check error and use correct $(LIBS) setting autofs-5.0.7 - fix dead LDAP symbolic link when LDAP support is disabled autofs-5.0.7 - add missing libtirpc lib to mount_nfs.so when TIRPC enabled autofs-5.0.7 - use compiler determined by configure instead of hard-coded ones autofs-5.0.7 - remove hard-coded STRIP variable
autofs-5.0.7 - use LIBS for link libraries
autofs-5.0.7 - unbundle NOTSTRIP from DEBUG so they dont depend on each other autofs-5.0.7 - fix occasional build error when enable parallel compiling

Leonardo Chiquitto (1):
autofs-5.0.7 - fix crash due to thread unsafe use of libldap

 CHANGELOG                      |   23 ++++
 Makefile.conf.in               |    3
 Makefile.rules                 |   34 +++--
 aclocal.m4                     |   19 ++-
 autofs.spec                    |    3
 configure                      |  104 +++++++++++++++--
 configure.in                   |    2
 daemon/Makefile                |    2
 daemon/automount.c             |   71 +++++++++--
 daemon/state.c                 |   15 +-
 include/config.h.in            |    3
 include/lookup_ldap.h          |    4 -
 include/macros.h               |    1
 include/master.h               |    1
 lib/Makefile                   |    6 +
 lib/macros.c                   |   28 ++++
 lib/master.c                   |  250 ++++++++++++++++++++++++++++++++++++++--
 man/auto.master.5.in           |    5 +
 man/automount.8                |   23 +++-
 modules/Makefile               |   20 ++-
 modules/cyrus-sasl.c           |   39 +++++-
 modules/lookup_file.c          |   25 +++-
 modules/lookup_ldap.c          |   76 +++++++++++-
 modules/lookup_nisplus.c       |   26 +++-
 modules/lookup_program.c       |   20 +++
 modules/lookup_sss.c           |   22 +++-
 modules/lookup_yp.c            |   23 +++-
 modules/mount_bind.c           |    2
 modules/mount_nfs.c            |   14 ++
 redhat/autofs.sysconfig.in     |    5 +
 samples/autofs.conf.default.in |    5 +
 samples/autofs.service.in      |    2
 32 files changed, 753 insertions(+), 123 deletions(-)

Quoted 2 lines

--
Ian

Quoted 7 lines

HI Ian:
May I suggest you pushing this patch serials to one test branch
(for-next?) in the public repository?
I find this much more convenient for me to test (instead of fetch all the patches and apply myself).
Since this branch is experimental, you can delete it later or rebase to master branch.

Not sure I've done this correctly but try updating and checkout branch pending-temp-v0.

Ian

There are patches from several contributors I plan on committing so I thought posting them to the list for final review would be sensible.

All I'm really saying is that, the program map returns a string that is then used as the map entry, so when it is parsed the variables $UID, $GID, etc. will be present in the macro lookup table as ${UID} (and $UID etc. works) ... so maybe these same variables should be provided in the environment of the program.

It isn't entirely clear if that is needed since those macro values may be returned in the map entry text with things like echo "/some/string \ ... ${UID} ..." etc. for later translation.

Really, a revised patch depends on this question being answered first.

Quoted 2 lines

OTOH, setting the uid to
the caller is definitely what should be done, IMHO.

I am wondering about my auto.smb patch (see http://www.spinics.net/lists/autofs/msg00402.html).

I can add a comment about that link...

Quoted 2 lines

Quoted 2 lines

OTOH, setting the uid to
the caller is definitely what should be done, IMHO.

That only makes sense if the result is only going to be visible to that one individual.

Linux is a multi-user system, so having automounts that depend on who made the request to do the mount makes no sense if the result is going to be visible to everyone. I've not seen a system whereby different people have different views
of what is mounted.

________________________________

This e-mail was sent by GlaxoSmithKline Services Unlimited (registered in England and Wales No. 1047315), which is a member of the GlaxoSmithKline group of companies. The registered address of GlaxoSmithKline Services Unlimited is 980 Great West Road, Brentford, Middlesex TW8 9GS.

Quoted 1 line

I'm not sure what you mean.

Quoted 2 lines

Users can create user-specific CIFS mounts today with "sudo mount -t cifs -o sec=krb5,cruid=$UID,...". The intention of my patch is just to enable autofs to create such mounts.

Quoted 4 lines

P.S.: You are correct that there is an issue with autofs caching the list of mount points if the list of mountable shares returned by a server depends on the credentials provided. AFAICS that can be fixed by configuring the such that all users can see the same shares (but not necessarily access/mount them all).

Quoted 1 line

Quoted 1 line

I'm not sure what you mean.

Just that I've not seen it, so thanks for the example.

Quoted 2 lines

Quoted 2 lines

Users can create user-specific CIFS mounts today with "sudo mount -t cifs -o sec=krb5,cruid=$UID,...". The intention of my patch is just to enable autofs to create such mounts.

But that leaves the mount permission dependent on who make the first call.

Quoted 4 lines

Quoted 4 lines

P.S.: You are correct that there is an issue with autofs caching the list of mount points if the list of mountable shares returned by a server depends on the credentials provided. AFAICS that can be fixed by configuring the such that all users can see the same shares (but not necessarily access/mount them all).

And once you've done that the UID that needs to be used for each of these mounts is mount-specific, not "who caused the mount"-specific. Which is why I see a problem with it.

________________________________

This e-mail was sent by GlaxoSmithKline Services Unlimited (registered in England and Wales No. 1047315), which is a member of the GlaxoSmithKline group of companies. The registered address of GlaxoSmithKline Services Unlimited is 980 Great West Road, Brentford, Middlesex TW8 9GS.

Quoted 1 line

But that leaves the mount permission dependent on who make the first call.

True. But that holds in the manual "mount -t cifs ..." case as well.

Quoted 2 lines

And once you've done that the UID that needs to be used for each of
these mounts is mount-specific, not "who caused the mount"-specific. Which is why I see a problem with it.

Do you have security concerns, or is it just that you don't consider it useful?

But I admit I have been using it mostly on my workstation, where I am the only user.

Quoted 3 lines

Quoted 1 line

But that leaves the mount permission dependent on who make the first call.

True. But that holds in the manual "mount -t cifs ..." case as well.

The manual mount will be done by a specific individual who (hopefully) knows what they are doing.

An automount can be done by a non-determined account and so have a non-determinate outcome once you put per-caller variables into the rule.

Quoted 4 lines

Quoted 2 lines

And once you've done that the UID that needs to be used for each of
these mounts is mount-specific, not "who caused the mount"-specific. Which is why I see a problem with it.

Do you have security concerns, or is it just that you don't consider it useful?

Both.
Its presence would encourage its use.
You will then find users who set it up for themselves and then get confused when another account has made the mount and access is wrong, but everything "looks" correct. Mind you - the security issue is about using cifs mounts on a system which has the potential for >1 concurrent user anyway.

Quoted 1 line

But I admit I have been using it mostly on my workstation, where I am the only user.

So you can set-up the rules so that they contain just your id. And make sure you lock-out all other users once you have anything mounted.

Quoted 2 lines

What my patch does is to run the map script under the UID of the user requesting the mount, rather than root. That is actually an improvement of the security situation, AFAICS.

Quoted 2 lines

Please check the "multiuser" option of mount.cifs ("With this option, the client ... creates a new session with the server using the user's credentials whenever a new user accesses the mount").

Quoted 3 lines

With that option, I see no major difference between CIFS and NFS automounts, security-wise. IMO combining autofs and "multiuser" is exactly the desired behavior in an AD environment. It lets the server decide access rights based on the credentials provided.

Quoted 1 line

It's a (sad) fact in life that many of us have to work in Windows-dominated IT environments.

Quoted 2 lines

Quoted 2 lines

What my patch does is to run the map script under the UID of the user requesting the mount, rather than root. That is actually an improvement of the security situation, AFAICS.

Possibly not.

Quoted 2 lines

Quoted 2 lines

Please check the "multiuser" option of mount.cifs ("With this option, the client ... creates a new session with the server using the user's credentials whenever a new user accesses the mount").

It also says:

Furthermore, when unix extensions aren't in use and the administrator has not overriden ownership using the uid= or gid= options, ownership of files is presented as the current user accessing the share.

Which I take to mean that if you are specifying $UID in the mount options then you've just foiled this bit, the bit that you actually want.

Quoted 4 lines

Quoted 2 lines

Quoted 2 lines

What my patch does is to run the map script under the UID of the user requesting the mount, rather than root. That is actually an improvement of the security situation, AFAICS.

Possibly not.

Can you explain?

Quoted 1 line

Which I take to mean that if you are specifying $UID in the mount options then you've just foiled this bit, the bit that you actually want.

Permission checks are done on the server.

On the client, without unix extensions, the user/group IDs of files may be displayed wrongly. That may confuse users because they may not be able to open files listed as owned by themselves, but it's not a security problem.

Quoted 6 lines

Quoted 4 lines

Quoted 2 lines

Quoted 2 lines

What my patch does is to run the map script under the UID of the user requesting the mount, rather than root. That is actually an improvement of the security situation, AFAICS.

Possibly not.

Can you explain?

It won't be an improvement if it enables something that is inherently insecure.

Quoted 3 lines

Quoted 1 line

Which I take to mean that if you are specifying $UID in the mount options then you've just foiled this bit, the bit that you actually want.

Permission checks are done on the server.

Then why do you need to specify a specific UID at mount time?

Quoted 3 lines

On the client, without unix extensions, the user/group IDs of files may be displayed wrongly. That may confuse users because they may not be able to open files listed as owned by themselves, but it's not a security problem.

OK - so now I'm confused. you mentioned the multiuser option to mount.cifs as something that enables individual users to get their own individual access permissions. But you're also saying (above) that they won't.

Quoted 2 lines

UID/GID mapping between client and server and permission control is a general security challenge for Network file systems. That's not specific to CIFS, NFS has similar problems.

Quoted 1 line

Yet aufofs has had the "-hosts" map for a long time.

Quoted 2 lines

Depending on configuration, CIFS won't let you mount anything without credentials. You may have to be authorized just to see the list of shares.

Quoted 2 lines

Quoted 2 lines

Depending on configuration, CIFS won't let you mount anything without credentials. You may have to be authorized just to see the list of shares.

So are you saying that the example you were giving, to use multiuser on a cifs mount, was so that the mount could take place under the user's Kerberos credentials (which might work) rather than root's (who might not have them)? But that once the mount was in place each user's access would be under their own credentials (assuming they have them)?

In which case I'd agree that this isn't a security issue.

________________________________

This e-mail was sent by GlaxoSmithKline Services Unlimited (registered in England and Wales No. 1047315), which is a member of the GlaxoSmithKline group of companies. The registered address of GlaxoSmithKline Services Unlimited is 980 Great West Road, Brentford, Middlesex TW8 9GS.

Quoted 1 line

In which case I'd agree that this isn't a security issue.

This is my understandning of how "multiuser" works, yes.

Quoted 3 lines · Ian Kent

There are patches from several contributors I plan on committing so I thought posting them to the list for final review would be sensible.

I am wondering about my auto.smb patch (see
http://www.spinics.net/lists/autofs/msg00402.html). Back then, you said

Quoted 11 lines

All I'm really saying is that, the program map returns a string that is then used as the map entry, so when it is parsed the variables $UID, $GID, etc. will be present in the macro lookup table as ${UID} (and $UID etc. works) ... so maybe these same variables should be provided in the environment of the program.

It isn't entirely clear if that is needed since those macro values may be returned in the map entry text with things like echo "/some/string \ ... ${UID} ..." etc. for later translation.

Quoted 1 line

Really, a revised patch depends on this question being answered first.

Nobody has spoken up on this list saying that additional environment variables would need to be set. I am wondering what else needs to be done in order to merge this (IMO very useful) functionality.

Martin