diff -Nru cifs-utils-6.14/autom4te.cache/output.0 cifs-utils-7.0/autom4te.cache/output.0 --- cifs-utils-6.14/autom4te.cache/output.0 2021-09-23 23:52:09.000000000 +0000 +++ cifs-utils-7.0/autom4te.cache/output.0 2022-08-11 20:56:04.000000000 +0000 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.14. +@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 7.0. @%:@ @%:@ Report bugs to . @%:@ @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='cifs-utils' PACKAGE_TARNAME='cifs-utils' -PACKAGE_VERSION='6.14' -PACKAGE_STRING='cifs-utils 6.14' +PACKAGE_VERSION='7.0' +PACKAGE_STRING='cifs-utils 7.0' PACKAGE_BUGREPORT='linux-cifs@vger.kernel.org' PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils' @@ -650,6 +650,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +GSSAPI_LDADD KRB5_LDADD RELRO_CFLAGS PIE_CFLAGS @@ -1338,7 +1339,7 @@ # 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 cifs-utils 6.14 to adapt to many kinds of systems. +\`configure' configures cifs-utils 7.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1410,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cifs-utils 6.14:";; + short | recursive ) echo "Configuration of cifs-utils 7.0:";; esac cat <<\_ACEOF @@ -1537,7 +1538,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cifs-utils configure 6.14 +cifs-utils configure 7.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2006,7 +2007,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cifs-utils $as_me 6.14, which was +It was created by cifs-utils $as_me 7.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2876,7 +2877,7 @@ # Define the identity of the package. PACKAGE='cifs-utils' - VERSION='6.14' + VERSION='7.0' cat >>confdefs.h <<_ACEOF @@ -5548,6 +5549,67 @@ fi + save_LIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 +$as_echo_n "checking for library containing gss_init_sec_context... " >&6; } +if ${ac_cv_search_gss_init_sec_context+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* 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 gss_init_sec_context (); +int +main () +{ +return gss_init_sec_context (); + ; + return 0; +} +_ACEOF +for ac_lib in '' gssapi_krb5 gssapi; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_gss_init_sec_context=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_gss_init_sec_context+:} false; then : + break +fi +done +if ${ac_cv_search_gss_init_sec_context+:} false; then : + +else + ac_cv_search_gss_init_sec_context=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 +$as_echo "$ac_cv_search_gss_init_sec_context" >&6; } +ac_res=$ac_cv_search_gss_init_sec_context +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + GSSAPI_LDADD="$ac_cv_search_gss_init_sec_context" +else + as_fn_error $? "no functioning gssapi library found!" "$LINENO" 5 +fi + + LIBS=$save_LIBS + fi # checks for wbclient.h and libwbclient.so library @@ -6018,6 +6080,21 @@ fi +# determine how to free a string allocated by a krb5 function +if test $enable_cifsupcall != "no"; then + for ac_func in krb5_free_string +do : + ac_fn_c_check_func "$LINENO" "krb5_free_string" "ac_cv_func_krb5_free_string" +if test "x$ac_cv_func_krb5_free_string" = xyes; then : + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_KRB5_FREE_STRING 1 +_ACEOF + +fi +done + +fi + if test $enable_systemd != "no"; then $as_echo "@%:@define ENABLE_SYSTEMD 1" >>confdefs.h @@ -6837,7 +6914,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cifs-utils $as_me 6.14, which was +This file was extended by cifs-utils $as_me 7.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6904,7 +6981,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cifs-utils config.status 6.14 +cifs-utils config.status 7.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru cifs-utils-6.14/autom4te.cache/output.1 cifs-utils-7.0/autom4te.cache/output.1 --- cifs-utils-6.14/autom4te.cache/output.1 2021-09-23 23:52:11.000000000 +0000 +++ cifs-utils-7.0/autom4te.cache/output.1 2022-08-11 20:56:06.000000000 +0000 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.14. +@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 7.0. @%:@ @%:@ Report bugs to . @%:@ @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='cifs-utils' PACKAGE_TARNAME='cifs-utils' -PACKAGE_VERSION='6.14' -PACKAGE_STRING='cifs-utils 6.14' +PACKAGE_VERSION='7.0' +PACKAGE_STRING='cifs-utils 7.0' PACKAGE_BUGREPORT='linux-cifs@vger.kernel.org' PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils' @@ -650,6 +650,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +GSSAPI_LDADD KRB5_LDADD RELRO_CFLAGS PIE_CFLAGS @@ -1338,7 +1339,7 @@ # 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 cifs-utils 6.14 to adapt to many kinds of systems. +\`configure' configures cifs-utils 7.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1410,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cifs-utils 6.14:";; + short | recursive ) echo "Configuration of cifs-utils 7.0:";; esac cat <<\_ACEOF @@ -1537,7 +1538,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cifs-utils configure 6.14 +cifs-utils configure 7.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2006,7 +2007,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cifs-utils $as_me 6.14, which was +It was created by cifs-utils $as_me 7.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2876,7 +2877,7 @@ # Define the identity of the package. PACKAGE='cifs-utils' - VERSION='6.14' + VERSION='7.0' cat >>confdefs.h <<_ACEOF @@ -5548,6 +5549,67 @@ fi + save_LIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 +$as_echo_n "checking for library containing gss_init_sec_context... " >&6; } +if ${ac_cv_search_gss_init_sec_context+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* 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 gss_init_sec_context (); +int +main () +{ +return gss_init_sec_context (); + ; + return 0; +} +_ACEOF +for ac_lib in '' gssapi_krb5 gssapi; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_gss_init_sec_context=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_gss_init_sec_context+:} false; then : + break +fi +done +if ${ac_cv_search_gss_init_sec_context+:} false; then : + +else + ac_cv_search_gss_init_sec_context=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 +$as_echo "$ac_cv_search_gss_init_sec_context" >&6; } +ac_res=$ac_cv_search_gss_init_sec_context +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + GSSAPI_LDADD="$ac_cv_search_gss_init_sec_context" +else + as_fn_error $? "no functioning gssapi library found!" "$LINENO" 5 +fi + + LIBS=$save_LIBS + fi # checks for wbclient.h and libwbclient.so library @@ -6018,6 +6080,21 @@ fi +# determine how to free a string allocated by a krb5 function +if test $enable_cifsupcall != "no"; then + for ac_func in krb5_free_string +do : + ac_fn_c_check_func "$LINENO" "krb5_free_string" "ac_cv_func_krb5_free_string" +if test "x$ac_cv_func_krb5_free_string" = xyes; then : + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_KRB5_FREE_STRING 1 +_ACEOF + +fi +done + +fi + if test $enable_systemd != "no"; then $as_echo "@%:@define ENABLE_SYSTEMD 1" >>confdefs.h @@ -6837,7 +6914,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cifs-utils $as_me 6.14, which was +This file was extended by cifs-utils $as_me 7.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6904,7 +6981,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cifs-utils config.status 6.14 +cifs-utils config.status 7.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru cifs-utils-6.14/autom4te.cache/requests cifs-utils-7.0/autom4te.cache/requests --- cifs-utils-6.14/autom4te.cache/requests 2021-09-23 23:52:11.000000000 +0000 +++ cifs-utils-7.0/autom4te.cache/requests 2022-08-11 20:56:06.000000000 +0000 @@ -37,58 +37,58 @@ 'configure.ac' ], { - '_AM_AUTOCONF_VERSION' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'include' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'AM_CONDITIONAL' => 1, - '_m4_warn' => 1, - 'm4_include' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_DEFUN' => 1, - 'AM_SANITY_CHECK' => 1, - 'AU_DEFUN' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_TEST_WBCHL' => 1, - 'm4_pattern_forbid' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'PKG_CHECK_MODULES' => 1, - '_AM_PROG_CC_C_O' => 1, 'AM_MAKE_INCLUDE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, + 'AM_DEP_TRACK' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, '_AM_CONFIG_MACRO_DIRS' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'PKG_CHECK_MODULES' => 1, + 'AM_SILENT_RULES' => 1, + 'include' => 1, + 'AC_DEFUN_ONCE' => 1, '_AM_SET_OPTIONS' => 1, - 'PKG_CHECK_MODULES_STATIC' => 1, - 'AM_SET_DEPDIR' => 1, + '_AM_DEPENDENCIES' => 1, + 'm4_pattern_allow' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'm4_pattern_forbid' => 1, + 'AM_SET_LEADING_DOT' => 1, 'PKG_NOARCH_INSTALLDIR' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_SANITY_CHECK' => 1, + 'AM_MISSING_PROG' => 1, + 'AC_DEFUN' => 1, + '_PKG_SHORT_ERRORS_SUPPORTED' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AM_SET_DEPDIR' => 1, + 'AM_PROG_CC_C_O' => 1, + 'PKG_CHECK_VAR' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_TEST_WBCHL' => 1, 'AM_SUBST_NOTMAKE' => 1, - 'PKG_CHECK_EXISTS' => 1, + 'AC_TEST_WBC_IDMAP_BOTH' => 1, + 'AC_LIBCAP' => 1, + 'm4_include' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + '_AM_PROG_TAR' => 1, + 'PKG_CHECK_MODULES_STATIC' => 1, '_AM_SET_OPTION' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AU_DEFUN' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'PKG_CHECK_EXISTS' => 1, 'PKG_INSTALLDIR' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - '_AM_PROG_TAR' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_DEP_TRACK' => 1, - 'AC_TEST_WBC_IDMAP_BOTH' => 1, + '_AM_PROG_CC_C_O' => 1, 'AM_RUN_LOG' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_AM_DEPENDENCIES' => 1, - 'm4_pattern_allow' => 1, - 'AC_LIBCAP' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AM_MISSING_PROG' => 1, - 'AM_PROG_INSTALL_SH' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'AC_DEFUN_ONCE' => 1, - 'PKG_CHECK_VAR' => 1, - '_AM_IF_OPTION' => 1 + '_m4_warn' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + '_AM_IF_OPTION' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_MISSING_HAS_RUN' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -103,66 +103,66 @@ 'configure.ac' ], { - 'AC_CANONICAL_TARGET' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_INIT' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'm4_pattern_allow' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_CONFIG_LINKS' => 1, - 'sinclude' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_FC_SRCEXT' => 1, - 'AH_OUTPUT' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_PATH_GUILE' => 1, 'AC_CONFIG_AUX_DIR' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_PROG_F77_C_O' => 1, 'AC_FC_FREEFORM' => 1, - '_AM_COND_ELSE' => 1, - 'm4_sinclude' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - '_AM_SUBST_NOTMAKE' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, - '_AM_COND_ENDIF' => 1, + 'include' => 1, 'AC_SUBST' => 1, + 'm4_pattern_allow' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AC_SUBST_TRACE' => 1, + 'AM_NLS' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CANONICAL_SYSTEM' => 1, 'AC_CANONICAL_HOST' => 1, + 'AC_CANONICAL_TARGET' => 1, + '_AM_COND_ELSE' => 1, + 'AH_OUTPUT' => 1, + 'AC_LIBSOURCE' => 1, 'AM_PROG_AR' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AM_GNU_GETTEXT' => 1, - 'm4_pattern_forbid' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AC_CONFIG_FILES' => 1, + 'AM_XGETTEXT_OPTION' => 1, 'AM_PROG_MKDIR_P' => 1, - 'AM_NLS' => 1, - 'AM_INIT_AUTOMAKE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'm4_pattern_forbid' => 1, + 'AC_CONFIG_LINKS' => 1, 'AM_AUTOMAKE_VERSION' => 1, - 'AM_PROG_FC_C_O' => 1, - 'LT_INIT' => 1, + 'AC_FC_PP_SRCEXT' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, '_AM_COND_IF' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'include' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_CONDITIONAL' => 1, + 'LT_INIT' => 1, 'm4_include' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AC_INIT' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AM_GNU_GETTEXT' => 1, + 'm4_sinclude' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_PATH_GUILE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_POT_TOOLS' => 1, + 'AM_PROG_FC_C_O' => 1, '_m4_warn' => 1, - 'AM_ENABLE_MULTILIB' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'sinclude' => 1, + 'AM_CONDITIONAL' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_CONFIG_FILES' => 1, 'AM_PROG_MOC' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_SUBST_TRACE' => 1 + 'AC_PROG_LIBTOOL' => 1, + '_AM_SUBST_NOTMAKE' => 1 } ], 'Autom4te::Request' ) ); diff -Nru cifs-utils-6.14/autom4te.cache/traces.0 cifs-utils-7.0/autom4te.cache/traces.0 --- cifs-utils-6.14/autom4te.cache/traces.0 2021-09-23 23:52:09.000000000 +0000 +++ cifs-utils-7.0/autom4te.cache/traces.0 2022-08-11 20:56:04.000000000 +0000 @@ -1209,8 +1209,9 @@ m4trace:configure.ac:181: -1- m4_pattern_allow([^HAVE_TALLOC_H$]) m4trace:configure.ac:191: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$]) m4trace:configure.ac:210: -1- m4_pattern_allow([^KRB5_LDADD$]) -m4trace:configure.ac:214: -1- AC_TEST_WBCHL -m4trace:configure.ac:214: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [ +m4trace:configure.ac:216: -1- m4_pattern_allow([^GSSAPI_LDADD$]) +m4trace:configure.ac:220: -1- AC_TEST_WBCHL +m4trace:configure.ac:220: -1- PKG_CHECK_MODULES([WBCLIENT], [wbclient], [], [ if test "$enable_cifsidmap" = "yes"; then AC_MSG_ERROR([wbclient.h not found, consider installing libwbclient-devel.]) else @@ -1224,86 +1225,87 @@ enable_cifsacl="no" fi ]) -m4trace:configure.ac:214: -1- PKG_PROG_PKG_CONFIG -m4trace:configure.ac:214: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^WBCLIENT_LIBS$]) -m4trace:configure.ac:214: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_CFLAGS=`$PKG_CONFIG --[]cflags "wbclient" 2>/dev/null` +m4trace:configure.ac:220: -1- PKG_PROG_PKG_CONFIG +m4trace:configure.ac:220: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^WBCLIENT_LIBS$]) +m4trace:configure.ac:220: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_CFLAGS=`$PKG_CONFIG --[]cflags "wbclient" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) -m4trace:configure.ac:214: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_LIBS=`$PKG_CONFIG --[]libs "wbclient" 2>/dev/null` +m4trace:configure.ac:220: -1- PKG_CHECK_EXISTS([wbclient], [pkg_cv_[]WBCLIENT_LIBS=`$PKG_CONFIG --[]libs "wbclient" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) -m4trace:configure.ac:214: -1- _PKG_SHORT_ERRORS_SUPPORTED -m4trace:configure.ac:214: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$]) -m4trace:configure.ac:217: -1- AC_TEST_WBC_IDMAP_BOTH -m4trace:configure.ac:217: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$]) -m4trace:configure.ac:220: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$]) -m4trace:configure.ac:233: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$]) -m4trace:configure.ac:250: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$]) -m4trace:configure.ac:260: -1- m4_pattern_allow([^ENABLE_SYSTEMD$]) -m4trace:configure.ac:265: -1- m4_pattern_allow([^have_rst2man$]) -m4trace:configure.ac:279: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$]) -m4trace:configure.ac:283: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"]) -m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$]) -m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$]) -m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE]) -m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE]) -m4trace:configure.ac:284: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"]) -m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$]) -m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$]) -m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE]) -m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE]) -m4trace:configure.ac:285: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"]) -m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$]) -m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$]) -m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE]) -m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE]) -m4trace:configure.ac:286: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"]) -m4trace:configure.ac:286: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$]) -m4trace:configure.ac:286: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$]) -m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE]) -m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE]) -m4trace:configure.ac:287: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"]) -m4trace:configure.ac:287: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$]) -m4trace:configure.ac:287: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$]) -m4trace:configure.ac:287: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE]) -m4trace:configure.ac:287: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE]) -m4trace:configure.ac:288: -1- AM_CONDITIONAL([CONFIG_SMBINFO], [test "$enable_smbinfo" != "no"]) -m4trace:configure.ac:288: -1- m4_pattern_allow([^CONFIG_SMBINFO_TRUE$]) -m4trace:configure.ac:288: -1- m4_pattern_allow([^CONFIG_SMBINFO_FALSE$]) -m4trace:configure.ac:288: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_TRUE]) -m4trace:configure.ac:288: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_FALSE]) -m4trace:configure.ac:289: -1- AM_CONDITIONAL([CONFIG_PYTHON_TOOLS], [test "$enable_pythontools" != "no"]) -m4trace:configure.ac:289: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_TRUE$]) -m4trace:configure.ac:289: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_FALSE$]) -m4trace:configure.ac:289: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_TRUE]) -m4trace:configure.ac:289: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_FALSE]) -m4trace:configure.ac:290: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"]) -m4trace:configure.ac:290: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$]) -m4trace:configure.ac:290: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$]) -m4trace:configure.ac:290: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE]) -m4trace:configure.ac:290: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE]) -m4trace:configure.ac:291: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"]) -m4trace:configure.ac:291: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$]) -m4trace:configure.ac:291: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$]) -m4trace:configure.ac:291: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE]) -m4trace:configure.ac:291: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE]) -m4trace:configure.ac:296: -1- AC_LIBCAP -m4trace:configure.ac:296: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$]) -m4trace:configure.ac:296: -1- m4_pattern_allow([^HAVE_LIBCAP$]) -m4trace:configure.ac:296: -1- m4_pattern_allow([^LIBCAP$]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:298: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.ac:298: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) -m4trace:configure.ac:298: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS +m4trace:configure.ac:220: -1- _PKG_SHORT_ERRORS_SUPPORTED +m4trace:configure.ac:220: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$]) +m4trace:configure.ac:223: -1- AC_TEST_WBC_IDMAP_BOTH +m4trace:configure.ac:223: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$]) +m4trace:configure.ac:226: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$]) +m4trace:configure.ac:239: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$]) +m4trace:configure.ac:256: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$]) +m4trace:configure.ac:267: -1- m4_pattern_allow([^HAVE_KRB5_FREE_STRING$]) +m4trace:configure.ac:271: -1- m4_pattern_allow([^ENABLE_SYSTEMD$]) +m4trace:configure.ac:276: -1- m4_pattern_allow([^have_rst2man$]) +m4trace:configure.ac:290: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$]) +m4trace:configure.ac:294: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"]) +m4trace:configure.ac:294: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$]) +m4trace:configure.ac:294: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$]) +m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE]) +m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE]) +m4trace:configure.ac:295: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"]) +m4trace:configure.ac:295: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$]) +m4trace:configure.ac:295: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$]) +m4trace:configure.ac:295: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE]) +m4trace:configure.ac:295: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE]) +m4trace:configure.ac:296: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"]) +m4trace:configure.ac:296: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$]) +m4trace:configure.ac:296: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$]) +m4trace:configure.ac:296: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE]) +m4trace:configure.ac:296: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE]) +m4trace:configure.ac:297: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"]) +m4trace:configure.ac:297: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$]) +m4trace:configure.ac:297: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$]) +m4trace:configure.ac:297: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE]) +m4trace:configure.ac:297: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE]) +m4trace:configure.ac:298: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"]) +m4trace:configure.ac:298: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$]) +m4trace:configure.ac:298: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$]) +m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE]) +m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE]) +m4trace:configure.ac:299: -1- AM_CONDITIONAL([CONFIG_SMBINFO], [test "$enable_smbinfo" != "no"]) +m4trace:configure.ac:299: -1- m4_pattern_allow([^CONFIG_SMBINFO_TRUE$]) +m4trace:configure.ac:299: -1- m4_pattern_allow([^CONFIG_SMBINFO_FALSE$]) +m4trace:configure.ac:299: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_TRUE]) +m4trace:configure.ac:299: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_FALSE]) +m4trace:configure.ac:300: -1- AM_CONDITIONAL([CONFIG_PYTHON_TOOLS], [test "$enable_pythontools" != "no"]) +m4trace:configure.ac:300: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_TRUE$]) +m4trace:configure.ac:300: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_FALSE$]) +m4trace:configure.ac:300: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_TRUE]) +m4trace:configure.ac:300: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_FALSE]) +m4trace:configure.ac:301: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"]) +m4trace:configure.ac:301: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$]) +m4trace:configure.ac:301: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$]) +m4trace:configure.ac:301: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE]) +m4trace:configure.ac:301: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE]) +m4trace:configure.ac:302: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"]) +m4trace:configure.ac:302: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$]) +m4trace:configure.ac:302: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$]) +m4trace:configure.ac:302: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE]) +m4trace:configure.ac:302: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE]) +m4trace:configure.ac:307: -1- AC_LIBCAP +m4trace:configure.ac:307: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$]) +m4trace:configure.ac:307: -1- m4_pattern_allow([^HAVE_LIBCAP$]) +m4trace:configure.ac:307: -1- m4_pattern_allow([^LIBCAP$]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:309: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.ac:309: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.ac:309: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.ac:309: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) +m4trace:configure.ac:309: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS diff -Nru cifs-utils-6.14/autom4te.cache/traces.1 cifs-utils-7.0/autom4te.cache/traces.1 --- cifs-utils-6.14/autom4te.cache/traces.1 2021-09-23 23:52:11.000000000 +0000 +++ cifs-utils-7.0/autom4te.cache/traces.1 2022-08-11 20:56:06.000000000 +0000 @@ -1,6 +1,6 @@ m4trace:aclocal.m4:1429: -1- m4_include([aclocal/idmap.m4]) m4trace:aclocal.m4:1430: -1- m4_include([aclocal/libcap.m4]) -m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [6.14], [linux-cifs@vger.kernel.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils]) +m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [7.0], [linux-cifs@vger.kernel.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils]) m4trace:configure.ac:4: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:4: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:4: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -690,186 +690,193 @@ m4trace:configure.ac:210: -1- AC_SUBST([KRB5_LDADD]) m4trace:configure.ac:210: -1- AC_SUBST_TRACE([KRB5_LDADD]) m4trace:configure.ac:210: -1- m4_pattern_allow([^KRB5_LDADD$]) -m4trace:configure.ac:214: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -m4trace:configure.ac:214: -1- AC_SUBST([PKG_CONFIG]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([PKG_CONFIG]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.ac:214: -1- AC_SUBST([PKG_CONFIG_PATH]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) -m4trace:configure.ac:214: -1- AC_SUBST([PKG_CONFIG_LIBDIR]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) -m4trace:configure.ac:214: -1- AC_SUBST([PKG_CONFIG]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([PKG_CONFIG]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^PKG_CONFIG$]) -m4trace:configure.ac:214: -1- AC_SUBST([WBCLIENT_CFLAGS]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([WBCLIENT_CFLAGS]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$]) -m4trace:configure.ac:214: -1- AC_SUBST([WBCLIENT_LIBS]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([WBCLIENT_LIBS]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^WBCLIENT_LIBS$]) -m4trace:configure.ac:214: -1- AH_OUTPUT([HAVE_LIBWBCLIENT], [/* Define to 1 if you have the `wbclient\' library (-lwbclient). */ +m4trace:configure.ac:216: -1- AC_SUBST([GSSAPI_LDADD]) +m4trace:configure.ac:216: -1- AC_SUBST_TRACE([GSSAPI_LDADD]) +m4trace:configure.ac:216: -1- m4_pattern_allow([^GSSAPI_LDADD$]) +m4trace:configure.ac:220: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +m4trace:configure.ac:220: -1- AC_SUBST([PKG_CONFIG]) +m4trace:configure.ac:220: -1- AC_SUBST_TRACE([PKG_CONFIG]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.ac:220: -1- AC_SUBST([PKG_CONFIG_PATH]) +m4trace:configure.ac:220: -1- AC_SUBST_TRACE([PKG_CONFIG_PATH]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG_PATH$]) +m4trace:configure.ac:220: -1- AC_SUBST([PKG_CONFIG_LIBDIR]) +m4trace:configure.ac:220: -1- AC_SUBST_TRACE([PKG_CONFIG_LIBDIR]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG_LIBDIR$]) +m4trace:configure.ac:220: -1- AC_SUBST([PKG_CONFIG]) +m4trace:configure.ac:220: -1- AC_SUBST_TRACE([PKG_CONFIG]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.ac:220: -1- AC_SUBST([WBCLIENT_CFLAGS]) +m4trace:configure.ac:220: -1- AC_SUBST_TRACE([WBCLIENT_CFLAGS]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^WBCLIENT_CFLAGS$]) +m4trace:configure.ac:220: -1- AC_SUBST([WBCLIENT_LIBS]) +m4trace:configure.ac:220: -1- AC_SUBST_TRACE([WBCLIENT_LIBS]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^WBCLIENT_LIBS$]) +m4trace:configure.ac:220: -1- AH_OUTPUT([HAVE_LIBWBCLIENT], [/* Define to 1 if you have the `wbclient\' library (-lwbclient). */ @%:@undef HAVE_LIBWBCLIENT]) -m4trace:configure.ac:214: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWBCLIENT]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$]) -m4trace:configure.ac:214: -1- AH_OUTPUT([HAVE_SYS_XATTR_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.ac:220: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWBCLIENT]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^HAVE_LIBWBCLIENT$]) +m4trace:configure.ac:220: -1- AH_OUTPUT([HAVE_SYS_XATTR_H], [/* Define to 1 if you have the header file. */ @%:@undef HAVE_SYS_XATTR_H]) -m4trace:configure.ac:214: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_XATTR_H]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$]) -m4trace:configure.ac:217: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WBC_ID_TYPE_BOTH]) -m4trace:configure.ac:217: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$]) -m4trace:configure.ac:217: -2- AH_OUTPUT([HAVE_WBC_ID_TYPE_BOTH], [/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */ +m4trace:configure.ac:220: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_XATTR_H]) +m4trace:configure.ac:220: -1- m4_pattern_allow([^HAVE_SYS_XATTR_H$]) +m4trace:configure.ac:223: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WBC_ID_TYPE_BOTH]) +m4trace:configure.ac:223: -2- m4_pattern_allow([^HAVE_WBC_ID_TYPE_BOTH$]) +m4trace:configure.ac:223: -2- AH_OUTPUT([HAVE_WBC_ID_TYPE_BOTH], [/* Does wbclient.h have a WBC_ID_TYPE_BOTH enum? */ @%:@undef HAVE_WBC_ID_TYPE_BOTH]) -m4trace:configure.ac:220: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.ac:226: -1- AH_OUTPUT([HAVE_KEYUTILS_H], [/* Define to 1 if you have the header file. */ @%:@undef HAVE_KEYUTILS_H]) -m4trace:configure.ac:220: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H]) -m4trace:configure.ac:220: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$]) -m4trace:configure.ac:233: -1- AH_OUTPUT([HAVE_SECURITY_PAM_APPL_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.ac:226: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KEYUTILS_H]) +m4trace:configure.ac:226: -1- m4_pattern_allow([^HAVE_KEYUTILS_H$]) +m4trace:configure.ac:239: -1- AH_OUTPUT([HAVE_SECURITY_PAM_APPL_H], [/* Define to 1 if you have the header file. */ @%:@undef HAVE_SECURITY_PAM_APPL_H]) -m4trace:configure.ac:233: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SECURITY_PAM_APPL_H]) -m4trace:configure.ac:233: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$]) -m4trace:configure.ac:250: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY], [/* Define to 1 if you have the `krb5_auth_con_getsendsubkey\' function. */ +m4trace:configure.ac:239: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SECURITY_PAM_APPL_H]) +m4trace:configure.ac:239: -1- m4_pattern_allow([^HAVE_SECURITY_PAM_APPL_H$]) +m4trace:configure.ac:256: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY], [/* Define to 1 if you have the `krb5_auth_con_getsendsubkey\' function. */ @%:@undef HAVE_KRB5_AUTH_CON_GETSENDSUBKEY]) -m4trace:configure.ac:250: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY]) -m4trace:configure.ac:250: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$]) -m4trace:configure.ac:255: -1- AH_OUTPUT([HAVE_KRB5_PRINCIPAL_GET_REALM], [/* Define to 1 if you have the `krb5_principal_get_realm\' function. */ +m4trace:configure.ac:256: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_AUTH_CON_GETSENDSUBKEY]) +m4trace:configure.ac:256: -1- m4_pattern_allow([^HAVE_KRB5_AUTH_CON_GETSENDSUBKEY$]) +m4trace:configure.ac:261: -1- AH_OUTPUT([HAVE_KRB5_PRINCIPAL_GET_REALM], [/* Define to 1 if you have the `krb5_principal_get_realm\' function. */ @%:@undef HAVE_KRB5_PRINCIPAL_GET_REALM]) -m4trace:configure.ac:255: -1- AH_OUTPUT([HAVE_KRB5_FREE_UNPARSED_NAME], [/* Define to 1 if you have the `krb5_free_unparsed_name\' function. */ +m4trace:configure.ac:261: -1- AH_OUTPUT([HAVE_KRB5_FREE_UNPARSED_NAME], [/* Define to 1 if you have the `krb5_free_unparsed_name\' function. */ @%:@undef HAVE_KRB5_FREE_UNPARSED_NAME]) -m4trace:configure.ac:256: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SETADDRS], [/* Define to 1 if you have the `krb5_auth_con_setaddrs\' function. */ +m4trace:configure.ac:262: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SETADDRS], [/* Define to 1 if you have the `krb5_auth_con_setaddrs\' function. */ @%:@undef HAVE_KRB5_AUTH_CON_SETADDRS]) -m4trace:configure.ac:256: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype\' function. */ +m4trace:configure.ac:262: -1- AH_OUTPUT([HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype\' function. */ @%:@undef HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE]) -m4trace:configure.ac:260: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_SYSTEMD]) -m4trace:configure.ac:260: -1- m4_pattern_allow([^ENABLE_SYSTEMD$]) -m4trace:configure.ac:260: -1- AH_OUTPUT([ENABLE_SYSTEMD], [/* Enable systemd specific behavior for mount.cifs */ +m4trace:configure.ac:267: -1- AH_OUTPUT([HAVE_KRB5_FREE_STRING], [/* Define to 1 if you have the `krb5_free_string\' function. */ +@%:@undef HAVE_KRB5_FREE_STRING]) +m4trace:configure.ac:267: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB5_FREE_STRING]) +m4trace:configure.ac:267: -1- m4_pattern_allow([^HAVE_KRB5_FREE_STRING$]) +m4trace:configure.ac:271: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_SYSTEMD]) +m4trace:configure.ac:271: -1- m4_pattern_allow([^ENABLE_SYSTEMD$]) +m4trace:configure.ac:271: -1- AH_OUTPUT([ENABLE_SYSTEMD], [/* Enable systemd specific behavior for mount.cifs */ @%:@undef ENABLE_SYSTEMD]) -m4trace:configure.ac:265: -1- AC_SUBST([have_rst2man]) -m4trace:configure.ac:265: -1- AC_SUBST_TRACE([have_rst2man]) -m4trace:configure.ac:265: -1- m4_pattern_allow([^have_rst2man$]) -m4trace:configure.ac:279: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE]) -m4trace:configure.ac:279: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$]) -m4trace:configure.ac:279: -1- AH_OUTPUT([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the declaration of +m4trace:configure.ac:276: -1- AC_SUBST([have_rst2man]) +m4trace:configure.ac:276: -1- AC_SUBST_TRACE([have_rst2man]) +m4trace:configure.ac:276: -1- m4_pattern_allow([^have_rst2man$]) +m4trace:configure.ac:290: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE]) +m4trace:configure.ac:290: -1- m4_pattern_allow([^HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE$]) +m4trace:configure.ac:290: -1- AH_OUTPUT([HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE], [/* Define to 1 if you have the declaration of `krb5_auth_con_set_req_cksumtype\', and to 0 if you don\'t. */ @%:@undef HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE]) -m4trace:configure.ac:283: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"]) -m4trace:configure.ac:283: -1- AC_SUBST([CONFIG_MAN_TRUE]) -m4trace:configure.ac:283: -1- AC_SUBST_TRACE([CONFIG_MAN_TRUE]) -m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$]) -m4trace:configure.ac:283: -1- AC_SUBST([CONFIG_MAN_FALSE]) -m4trace:configure.ac:283: -1- AC_SUBST_TRACE([CONFIG_MAN_FALSE]) -m4trace:configure.ac:283: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$]) -m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE]) -m4trace:configure.ac:283: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE]) -m4trace:configure.ac:284: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"]) -m4trace:configure.ac:284: -1- AC_SUBST([CONFIG_CIFSUPCALL_TRUE]) -m4trace:configure.ac:284: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_TRUE]) -m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$]) -m4trace:configure.ac:284: -1- AC_SUBST([CONFIG_CIFSUPCALL_FALSE]) -m4trace:configure.ac:284: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_FALSE]) -m4trace:configure.ac:284: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$]) -m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE]) -m4trace:configure.ac:284: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE]) -m4trace:configure.ac:285: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"]) -m4trace:configure.ac:285: -1- AC_SUBST([CONFIG_CIFSCREDS_TRUE]) -m4trace:configure.ac:285: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_TRUE]) -m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$]) -m4trace:configure.ac:285: -1- AC_SUBST([CONFIG_CIFSCREDS_FALSE]) -m4trace:configure.ac:285: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_FALSE]) -m4trace:configure.ac:285: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$]) -m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE]) -m4trace:configure.ac:285: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE]) -m4trace:configure.ac:286: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"]) -m4trace:configure.ac:286: -1- AC_SUBST([CONFIG_CIFSIDMAP_TRUE]) -m4trace:configure.ac:286: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_TRUE]) -m4trace:configure.ac:286: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$]) -m4trace:configure.ac:286: -1- AC_SUBST([CONFIG_CIFSIDMAP_FALSE]) -m4trace:configure.ac:286: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_FALSE]) -m4trace:configure.ac:286: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$]) -m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE]) -m4trace:configure.ac:286: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE]) -m4trace:configure.ac:287: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"]) -m4trace:configure.ac:287: -1- AC_SUBST([CONFIG_CIFSACL_TRUE]) -m4trace:configure.ac:287: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_TRUE]) -m4trace:configure.ac:287: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$]) -m4trace:configure.ac:287: -1- AC_SUBST([CONFIG_CIFSACL_FALSE]) -m4trace:configure.ac:287: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_FALSE]) -m4trace:configure.ac:287: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$]) -m4trace:configure.ac:287: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE]) -m4trace:configure.ac:287: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE]) -m4trace:configure.ac:288: -1- AM_CONDITIONAL([CONFIG_SMBINFO], [test "$enable_smbinfo" != "no"]) -m4trace:configure.ac:288: -1- AC_SUBST([CONFIG_SMBINFO_TRUE]) -m4trace:configure.ac:288: -1- AC_SUBST_TRACE([CONFIG_SMBINFO_TRUE]) -m4trace:configure.ac:288: -1- m4_pattern_allow([^CONFIG_SMBINFO_TRUE$]) -m4trace:configure.ac:288: -1- AC_SUBST([CONFIG_SMBINFO_FALSE]) -m4trace:configure.ac:288: -1- AC_SUBST_TRACE([CONFIG_SMBINFO_FALSE]) -m4trace:configure.ac:288: -1- m4_pattern_allow([^CONFIG_SMBINFO_FALSE$]) -m4trace:configure.ac:288: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_TRUE]) -m4trace:configure.ac:288: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_FALSE]) -m4trace:configure.ac:289: -1- AM_CONDITIONAL([CONFIG_PYTHON_TOOLS], [test "$enable_pythontools" != "no"]) -m4trace:configure.ac:289: -1- AC_SUBST([CONFIG_PYTHON_TOOLS_TRUE]) -m4trace:configure.ac:289: -1- AC_SUBST_TRACE([CONFIG_PYTHON_TOOLS_TRUE]) -m4trace:configure.ac:289: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_TRUE$]) -m4trace:configure.ac:289: -1- AC_SUBST([CONFIG_PYTHON_TOOLS_FALSE]) -m4trace:configure.ac:289: -1- AC_SUBST_TRACE([CONFIG_PYTHON_TOOLS_FALSE]) -m4trace:configure.ac:289: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_FALSE$]) -m4trace:configure.ac:289: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_TRUE]) -m4trace:configure.ac:289: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_FALSE]) -m4trace:configure.ac:290: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"]) -m4trace:configure.ac:290: -1- AC_SUBST([CONFIG_PAM_TRUE]) -m4trace:configure.ac:290: -1- AC_SUBST_TRACE([CONFIG_PAM_TRUE]) -m4trace:configure.ac:290: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$]) -m4trace:configure.ac:290: -1- AC_SUBST([CONFIG_PAM_FALSE]) -m4trace:configure.ac:290: -1- AC_SUBST_TRACE([CONFIG_PAM_FALSE]) -m4trace:configure.ac:290: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$]) -m4trace:configure.ac:290: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE]) -m4trace:configure.ac:290: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE]) -m4trace:configure.ac:291: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"]) -m4trace:configure.ac:291: -1- AC_SUBST([CONFIG_PLUGIN_TRUE]) -m4trace:configure.ac:291: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_TRUE]) -m4trace:configure.ac:291: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$]) -m4trace:configure.ac:291: -1- AC_SUBST([CONFIG_PLUGIN_FALSE]) -m4trace:configure.ac:291: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_FALSE]) -m4trace:configure.ac:291: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$]) -m4trace:configure.ac:291: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE]) -m4trace:configure.ac:291: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE]) -m4trace:configure.ac:296: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.ac:294: -1- AM_CONDITIONAL([CONFIG_MAN], [test "$enable_man" != "no"]) +m4trace:configure.ac:294: -1- AC_SUBST([CONFIG_MAN_TRUE]) +m4trace:configure.ac:294: -1- AC_SUBST_TRACE([CONFIG_MAN_TRUE]) +m4trace:configure.ac:294: -1- m4_pattern_allow([^CONFIG_MAN_TRUE$]) +m4trace:configure.ac:294: -1- AC_SUBST([CONFIG_MAN_FALSE]) +m4trace:configure.ac:294: -1- AC_SUBST_TRACE([CONFIG_MAN_FALSE]) +m4trace:configure.ac:294: -1- m4_pattern_allow([^CONFIG_MAN_FALSE$]) +m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_TRUE]) +m4trace:configure.ac:294: -1- _AM_SUBST_NOTMAKE([CONFIG_MAN_FALSE]) +m4trace:configure.ac:295: -1- AM_CONDITIONAL([CONFIG_CIFSUPCALL], [test "$enable_cifsupcall" != "no"]) +m4trace:configure.ac:295: -1- AC_SUBST([CONFIG_CIFSUPCALL_TRUE]) +m4trace:configure.ac:295: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_TRUE]) +m4trace:configure.ac:295: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_TRUE$]) +m4trace:configure.ac:295: -1- AC_SUBST([CONFIG_CIFSUPCALL_FALSE]) +m4trace:configure.ac:295: -1- AC_SUBST_TRACE([CONFIG_CIFSUPCALL_FALSE]) +m4trace:configure.ac:295: -1- m4_pattern_allow([^CONFIG_CIFSUPCALL_FALSE$]) +m4trace:configure.ac:295: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_TRUE]) +m4trace:configure.ac:295: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSUPCALL_FALSE]) +m4trace:configure.ac:296: -1- AM_CONDITIONAL([CONFIG_CIFSCREDS], [test "$enable_cifscreds" != "no"]) +m4trace:configure.ac:296: -1- AC_SUBST([CONFIG_CIFSCREDS_TRUE]) +m4trace:configure.ac:296: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_TRUE]) +m4trace:configure.ac:296: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_TRUE$]) +m4trace:configure.ac:296: -1- AC_SUBST([CONFIG_CIFSCREDS_FALSE]) +m4trace:configure.ac:296: -1- AC_SUBST_TRACE([CONFIG_CIFSCREDS_FALSE]) +m4trace:configure.ac:296: -1- m4_pattern_allow([^CONFIG_CIFSCREDS_FALSE$]) +m4trace:configure.ac:296: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_TRUE]) +m4trace:configure.ac:296: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSCREDS_FALSE]) +m4trace:configure.ac:297: -1- AM_CONDITIONAL([CONFIG_CIFSIDMAP], [test "$enable_cifsidmap" != "no"]) +m4trace:configure.ac:297: -1- AC_SUBST([CONFIG_CIFSIDMAP_TRUE]) +m4trace:configure.ac:297: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_TRUE]) +m4trace:configure.ac:297: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_TRUE$]) +m4trace:configure.ac:297: -1- AC_SUBST([CONFIG_CIFSIDMAP_FALSE]) +m4trace:configure.ac:297: -1- AC_SUBST_TRACE([CONFIG_CIFSIDMAP_FALSE]) +m4trace:configure.ac:297: -1- m4_pattern_allow([^CONFIG_CIFSIDMAP_FALSE$]) +m4trace:configure.ac:297: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_TRUE]) +m4trace:configure.ac:297: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSIDMAP_FALSE]) +m4trace:configure.ac:298: -1- AM_CONDITIONAL([CONFIG_CIFSACL], [test "$enable_cifsacl" != "no"]) +m4trace:configure.ac:298: -1- AC_SUBST([CONFIG_CIFSACL_TRUE]) +m4trace:configure.ac:298: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_TRUE]) +m4trace:configure.ac:298: -1- m4_pattern_allow([^CONFIG_CIFSACL_TRUE$]) +m4trace:configure.ac:298: -1- AC_SUBST([CONFIG_CIFSACL_FALSE]) +m4trace:configure.ac:298: -1- AC_SUBST_TRACE([CONFIG_CIFSACL_FALSE]) +m4trace:configure.ac:298: -1- m4_pattern_allow([^CONFIG_CIFSACL_FALSE$]) +m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_TRUE]) +m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([CONFIG_CIFSACL_FALSE]) +m4trace:configure.ac:299: -1- AM_CONDITIONAL([CONFIG_SMBINFO], [test "$enable_smbinfo" != "no"]) +m4trace:configure.ac:299: -1- AC_SUBST([CONFIG_SMBINFO_TRUE]) +m4trace:configure.ac:299: -1- AC_SUBST_TRACE([CONFIG_SMBINFO_TRUE]) +m4trace:configure.ac:299: -1- m4_pattern_allow([^CONFIG_SMBINFO_TRUE$]) +m4trace:configure.ac:299: -1- AC_SUBST([CONFIG_SMBINFO_FALSE]) +m4trace:configure.ac:299: -1- AC_SUBST_TRACE([CONFIG_SMBINFO_FALSE]) +m4trace:configure.ac:299: -1- m4_pattern_allow([^CONFIG_SMBINFO_FALSE$]) +m4trace:configure.ac:299: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_TRUE]) +m4trace:configure.ac:299: -1- _AM_SUBST_NOTMAKE([CONFIG_SMBINFO_FALSE]) +m4trace:configure.ac:300: -1- AM_CONDITIONAL([CONFIG_PYTHON_TOOLS], [test "$enable_pythontools" != "no"]) +m4trace:configure.ac:300: -1- AC_SUBST([CONFIG_PYTHON_TOOLS_TRUE]) +m4trace:configure.ac:300: -1- AC_SUBST_TRACE([CONFIG_PYTHON_TOOLS_TRUE]) +m4trace:configure.ac:300: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_TRUE$]) +m4trace:configure.ac:300: -1- AC_SUBST([CONFIG_PYTHON_TOOLS_FALSE]) +m4trace:configure.ac:300: -1- AC_SUBST_TRACE([CONFIG_PYTHON_TOOLS_FALSE]) +m4trace:configure.ac:300: -1- m4_pattern_allow([^CONFIG_PYTHON_TOOLS_FALSE$]) +m4trace:configure.ac:300: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_TRUE]) +m4trace:configure.ac:300: -1- _AM_SUBST_NOTMAKE([CONFIG_PYTHON_TOOLS_FALSE]) +m4trace:configure.ac:301: -1- AM_CONDITIONAL([CONFIG_PAM], [test "$enable_pam" != "no"]) +m4trace:configure.ac:301: -1- AC_SUBST([CONFIG_PAM_TRUE]) +m4trace:configure.ac:301: -1- AC_SUBST_TRACE([CONFIG_PAM_TRUE]) +m4trace:configure.ac:301: -1- m4_pattern_allow([^CONFIG_PAM_TRUE$]) +m4trace:configure.ac:301: -1- AC_SUBST([CONFIG_PAM_FALSE]) +m4trace:configure.ac:301: -1- AC_SUBST_TRACE([CONFIG_PAM_FALSE]) +m4trace:configure.ac:301: -1- m4_pattern_allow([^CONFIG_PAM_FALSE$]) +m4trace:configure.ac:301: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_TRUE]) +m4trace:configure.ac:301: -1- _AM_SUBST_NOTMAKE([CONFIG_PAM_FALSE]) +m4trace:configure.ac:302: -1- AM_CONDITIONAL([CONFIG_PLUGIN], [test "$enable_cifsidmap" != "no" -o "$enable_cifsacl" != "no"]) +m4trace:configure.ac:302: -1- AC_SUBST([CONFIG_PLUGIN_TRUE]) +m4trace:configure.ac:302: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_TRUE]) +m4trace:configure.ac:302: -1- m4_pattern_allow([^CONFIG_PLUGIN_TRUE$]) +m4trace:configure.ac:302: -1- AC_SUBST([CONFIG_PLUGIN_FALSE]) +m4trace:configure.ac:302: -1- AC_SUBST_TRACE([CONFIG_PLUGIN_FALSE]) +m4trace:configure.ac:302: -1- m4_pattern_allow([^CONFIG_PLUGIN_FALSE$]) +m4trace:configure.ac:302: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_TRUE]) +m4trace:configure.ac:302: -1- _AM_SUBST_NOTMAKE([CONFIG_PLUGIN_FALSE]) +m4trace:configure.ac:307: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the header file. */ @%:@undef HAVE_SYS_CAPABILITY_H]) -m4trace:configure.ac:296: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPABILITY_H]) -m4trace:configure.ac:296: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$]) -m4trace:configure.ac:296: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP]) -m4trace:configure.ac:296: -1- m4_pattern_allow([^HAVE_LIBCAP$]) -m4trace:configure.ac:296: -1- AH_OUTPUT([HAVE_LIBCAP], [/* Define if libcap exists */ +m4trace:configure.ac:307: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_CAPABILITY_H]) +m4trace:configure.ac:307: -1- m4_pattern_allow([^HAVE_SYS_CAPABILITY_H$]) +m4trace:configure.ac:307: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCAP]) +m4trace:configure.ac:307: -1- m4_pattern_allow([^HAVE_LIBCAP$]) +m4trace:configure.ac:307: -1- AH_OUTPUT([HAVE_LIBCAP], [/* Define if libcap exists */ @%:@undef HAVE_LIBCAP]) -m4trace:configure.ac:296: -1- AC_SUBST([LIBCAP]) -m4trace:configure.ac:296: -1- AC_SUBST_TRACE([LIBCAP]) -m4trace:configure.ac:296: -1- m4_pattern_allow([^LIBCAP$]) -m4trace:configure.ac:298: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:298: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([LTLIBOBJS]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:298: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) -m4trace:configure.ac:298: -1- AC_SUBST([am__EXEEXT_TRUE]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.ac:298: -1- AC_SUBST([am__EXEEXT_FALSE]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) -m4trace:configure.ac:298: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.ac:298: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([top_builddir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([top_build_prefix]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([srcdir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([abs_srcdir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([top_srcdir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([abs_top_srcdir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([builddir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([abs_builddir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([abs_top_builddir]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([INSTALL]) -m4trace:configure.ac:298: -1- AC_SUBST_TRACE([MKDIR_P]) +m4trace:configure.ac:307: -1- AC_SUBST([LIBCAP]) +m4trace:configure.ac:307: -1- AC_SUBST_TRACE([LIBCAP]) +m4trace:configure.ac:307: -1- m4_pattern_allow([^LIBCAP$]) +m4trace:configure.ac:309: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:309: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([LTLIBOBJS]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:309: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) +m4trace:configure.ac:309: -1- AC_SUBST([am__EXEEXT_TRUE]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.ac:309: -1- AC_SUBST([am__EXEEXT_FALSE]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) +m4trace:configure.ac:309: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.ac:309: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.ac:309: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([top_builddir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([top_build_prefix]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([srcdir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_srcdir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([top_srcdir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_top_srcdir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([builddir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_builddir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([abs_top_builddir]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([INSTALL]) +m4trace:configure.ac:309: -1- AC_SUBST_TRACE([MKDIR_P]) diff -Nru cifs-utils-6.14/cifs.idmap.c cifs-utils-7.0/cifs.idmap.c --- cifs-utils-6.14/cifs.idmap.c 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/cifs.idmap.c 2022-08-11 20:40:15.000000000 +0000 @@ -172,12 +172,14 @@ sidstr = strget(key_descr, "oi:"); if (sidstr) { - rc = str_to_uint(sidstr, (unsigned int *)&cuxid.id.uid); + unsigned int _uid = 0; + rc = str_to_uint(sidstr, (unsigned int *)&_uid); if (rc) { syslog(LOG_ERR, "Unable to convert %s to uid: %s", sidstr, strerror(rc)); goto cifs_idmap_ret; } + cuxid.id.uid = _uid; cuxid.type = CIFS_UXID_TYPE_UID; syslog(LOG_DEBUG, "SID: %s, uid: %u", sidstr, cuxid.id.uid); @@ -198,12 +200,14 @@ sidstr = strget(key_descr, "gi:"); if (sidstr) { - rc = str_to_uint(sidstr, (unsigned int *)&cuxid.id.gid); + unsigned int _gid = 0; + rc = str_to_uint(sidstr, (unsigned int *)&_gid); if (rc) { syslog(LOG_ERR, "Unable to convert %s to gid: %s", sidstr, strerror(rc)); goto cifs_idmap_ret; } + cuxid.id.gid = _gid; cuxid.type = CIFS_UXID_TYPE_GID; syslog(LOG_DEBUG, "SID: %s, gid: %u", sidstr, cuxid.id.gid); diff -Nru cifs-utils-6.14/cifs.upcall.c cifs-utils-7.0/cifs.upcall.c --- cifs-utils-6.14/cifs.upcall.c 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/cifs.upcall.c 2022-08-11 20:40:15.000000000 +0000 @@ -36,6 +36,10 @@ #elif defined(HAVE_KRB5_H) #include #endif + +#include +#include + #include #include #include @@ -64,6 +68,10 @@ #include #endif +#ifndef discard_const +#define discard_const(ptr) ((void *)((intptr_t)(ptr))) +#endif + static krb5_context context; static const char *prog = "cifs.upcall"; @@ -181,6 +189,14 @@ } #endif +#if !defined(HAVE_KRB5_FREE_STRING) /* Heimdal */ +static void krb5_free_string(krb5_context context, char *val) +{ + (void)context; + krb5_xfree(val); +} +#endif + #if !defined(HAVE_KRB5_AUTH_CON_GETSENDSUBKEY) /* Heimdal */ static krb5_error_code krb5_auth_con_getsendsubkey(krb5_context context, @@ -619,6 +635,8 @@ goto out; } +#define CIFS_SERVICE_NAME "cifs" + static int cifs_krb5_get_req(const char *host, krb5_ccache ccache, DATA_BLOB * mechtoken, DATA_BLOB * sess_key) @@ -640,8 +658,8 @@ return ret; } - ret = krb5_sname_to_principal(context, host, "cifs", KRB5_NT_UNKNOWN, - &in_creds.server); + ret = krb5_sname_to_principal(context, host, CIFS_SERVICE_NAME, + KRB5_NT_UNKNOWN, &in_creds.server); if (ret) { syslog(LOG_DEBUG, "%s: unable to convert sname to princ (%s).", __func__, host); @@ -740,6 +758,123 @@ return ret; } +static void cifs_gss_display_status_1(char *m, OM_uint32 code, int type) { + OM_uint32 min_stat; + gss_buffer_desc msg; + OM_uint32 msg_ctx; + + msg_ctx = 0; + while (1) { + (void) gss_display_status(&min_stat, code, type, + GSS_C_NULL_OID, &msg_ctx, &msg); + syslog(LOG_DEBUG, "GSS-API error %s: %s\n", m, (char *) msg.value); + (void) gss_release_buffer(&min_stat, &msg); + + if (!msg_ctx) + break; + } +} + +void cifs_gss_display_status(char *msg, OM_uint32 maj_stat, OM_uint32 min_stat) { + cifs_gss_display_status_1(msg, maj_stat, GSS_C_GSS_CODE); + cifs_gss_display_status_1(msg, min_stat, GSS_C_MECH_CODE); +} + +static int +cifs_gss_get_req(const char *host, DATA_BLOB *mechtoken, DATA_BLOB *sess_key) +{ + OM_uint32 maj_stat, min_stat; + gss_name_t target_name; + gss_ctx_id_t ctx = GSS_C_NO_CONTEXT; + gss_buffer_desc output_token; + gss_krb5_lucid_context_v1_t *lucid_ctx = NULL; + gss_krb5_lucid_key_t *key = NULL; + + size_t service_name_len = sizeof(CIFS_SERVICE_NAME) + 1 /* @ */ + + strlen(host) + 1; + char *service_name = malloc(service_name_len); + if (!service_name) { + syslog(LOG_DEBUG, "out of memory allocating service name"); + maj_stat = GSS_S_FAILURE; + goto out; + } + + snprintf(service_name, service_name_len, "%s@%s", CIFS_SERVICE_NAME, + host); + gss_buffer_desc target_name_buf; + target_name_buf.value = service_name; + target_name_buf.length = service_name_len; + + maj_stat = gss_import_name(&min_stat, &target_name_buf, + GSS_C_NT_HOSTBASED_SERVICE, &target_name); + free(service_name); + if (GSS_ERROR(maj_stat)) { + cifs_gss_display_status("gss_import_name", maj_stat, min_stat); + goto out; + } + + maj_stat = gss_init_sec_context(&min_stat, + GSS_C_NO_CREDENTIAL, /* claimant_cred_handle */ + &ctx, + target_name, + discard_const(gss_mech_krb5), /* force krb5 */ + 0, /* flags */ + 0, /* time_req */ + GSS_C_NO_CHANNEL_BINDINGS, /* input_chan_bindings */ + GSS_C_NO_BUFFER, + NULL, /* actual mech type */ + &output_token, + NULL, /* ret_flags */ + NULL); /* time_rec */ + + if (maj_stat != GSS_S_COMPLETE && + maj_stat != GSS_S_CONTINUE_NEEDED) { + cifs_gss_display_status("init_sec_context", maj_stat, min_stat); + goto out_release_target_name; + } + + /* as luck would have it, GSS-API hands us the finished article */ + *mechtoken = data_blob(output_token.value, output_token.length); + + maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx, 1, + (void **)&lucid_ctx); + + if (GSS_ERROR(maj_stat)) { + cifs_gss_display_status("gss_krb5_export_lucid_sec_context", + maj_stat, min_stat); + goto out_free_sec_ctx; + } + + switch (lucid_ctx->protocol) { + case 0: + key = &lucid_ctx->rfc1964_kd.ctx_key; + break; + case 1: + if (lucid_ctx->cfx_kd.have_acceptor_subkey) { + key = &lucid_ctx->cfx_kd.acceptor_subkey; + } else { + key = &lucid_ctx->cfx_kd.ctx_key; + } + break; + default: + syslog(LOG_DEBUG, "wrong lucid context protocol %d", + lucid_ctx->protocol); + goto out_free_lucid_ctx; + } + + *sess_key = data_blob(key->data, key->length); + +out_free_lucid_ctx: + (void) gss_krb5_free_lucid_sec_context(&min_stat, lucid_ctx); +out_free_sec_ctx: + (void) gss_delete_sec_context(&min_stat, &ctx, GSS_C_NO_BUFFER); + (void) gss_release_buffer(&min_stat, &output_token); +out_release_target_name: + (void) gss_release_name(&min_stat, &target_name); +out: + return GSS_ERROR(maj_stat); +} + /* * Prepares AP-REQ data for mechToken and gets session key * Uses credentials from cache. It will not ask for password @@ -765,28 +900,45 @@ DATA_BLOB * sess_key, krb5_ccache ccache) { int retval; - DATA_BLOB tkt, tkt_wrapped; + DATA_BLOB tkt_wrapped; syslog(LOG_DEBUG, "%s: getting service ticket for %s", __func__, host); - /* get a kerberos ticket for the service and extract the session key */ - retval = cifs_krb5_get_req(host, ccache, &tkt, sess_key); - if (retval) { - syslog(LOG_DEBUG, "%s: failed to obtain service ticket (%d)", - __func__, retval); - return retval; - } + /* + * Fall back to gssapi if there's no credential cache or no TGT + * so that gssproxy can maybe help out. + */ + if (!ccache) { + syslog(LOG_DEBUG, "%s: using GSS-API", __func__); + retval = cifs_gss_get_req(host, &tkt_wrapped, sess_key); + if (retval) { + syslog(LOG_DEBUG, "%s: failed to obtain service ticket via GSS (%d)", + __func__, retval); + return retval; + } + } else { + DATA_BLOB tkt; + syslog(LOG_DEBUG, "%s: using native krb5", __func__); + + /* get a kerberos ticket for the service and extract the session key */ + retval = cifs_krb5_get_req(host, ccache, &tkt, sess_key); + if (retval) { + syslog(LOG_DEBUG, "%s: failed to obtain service ticket (%d)", + __func__, retval); + return retval; + } - syslog(LOG_DEBUG, "%s: obtained service ticket", __func__); + syslog(LOG_DEBUG, "%s: obtained service ticket", __func__); - /* wrap that up in a nice GSS-API wrapping */ - tkt_wrapped = spnego_gen_krb5_wrap(tkt, TOK_ID_KRB_AP_REQ); + /* wrap that up in a nice GSS-API wrapping */ + tkt_wrapped = spnego_gen_krb5_wrap(tkt, TOK_ID_KRB_AP_REQ); + data_blob_free(&tkt); + } /* and wrap that in a shiny SPNEGO wrapper */ *secblob = gen_negTokenInit(oid, tkt_wrapped); data_blob_free(&tkt_wrapped); - data_blob_free(&tkt); return retval; } @@ -1146,7 +1298,6 @@ DATA_BLOB sess_key = data_blob_null; key_serial_t key = 0; size_t datalen; - unsigned int have; long rc = 1; int c; bool try_dns = false, legacy_uid = false , env_probe = true; @@ -1254,7 +1405,7 @@ if ((arg->have & DKD_MUSTHAVE_SET) != DKD_MUSTHAVE_SET) { syslog(LOG_ERR, "unable to get necessary params from key " - "description (0x%x)", have); + "description (0x%x)", arg->have); rc = 1; goto out; } @@ -1369,11 +1520,6 @@ if (ccache == NULL && arg->username[0] != '\0') ccache = init_cc_from_keytab(keytab_name, arg->username); - if (ccache == NULL) { - rc = 1; - goto out; - } - host = arg->hostname; // do mech specific authorization diff -Nru cifs-utils-6.14/cifs.upcall.rst.in cifs-utils-7.0/cifs.upcall.rst.in --- cifs-utils-6.14/cifs.upcall.rst.in 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/cifs.upcall.rst.in 2022-08-11 20:40:15.000000000 +0000 @@ -91,6 +91,15 @@ --version|-v Print version number and exit. +********************* +ENVIRONMENT VARIABLES +********************* + +GSS_USE_PROXY="yes" + Enable usage of gssproxy for credential retrieval. This includes keytab + based client initiation as well as (Resource Based) Constrained Delegation. + See gssproxy-mech(8). + ************************ CONFIGURATION FOR KEYCTL ************************ diff -Nru cifs-utils-6.14/config.h.in cifs-utils-7.0/config.h.in --- cifs-utils-6.14/config.h.in 2021-09-23 23:52:10.000000000 +0000 +++ cifs-utils-7.0/config.h.in 2022-08-11 20:56:05.000000000 +0000 @@ -58,6 +58,9 @@ /* Define to 1 if you have the `krb5_auth_con_set_req_cksumtype' function. */ #undef HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE +/* Define to 1 if you have the `krb5_free_string' function. */ +#undef HAVE_KRB5_FREE_STRING + /* Define to 1 if you have the `krb5_free_unparsed_name' function. */ #undef HAVE_KRB5_FREE_UNPARSED_NAME diff -Nru cifs-utils-6.14/configure cifs-utils-7.0/configure --- cifs-utils-6.14/configure 2021-09-23 23:52:10.000000000 +0000 +++ cifs-utils-7.0/configure 2022-08-11 20:56:05.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cifs-utils 6.14. +# Generated by GNU Autoconf 2.69 for cifs-utils 7.0. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='cifs-utils' PACKAGE_TARNAME='cifs-utils' -PACKAGE_VERSION='6.14' -PACKAGE_STRING='cifs-utils 6.14' +PACKAGE_VERSION='7.0' +PACKAGE_STRING='cifs-utils 7.0' PACKAGE_BUGREPORT='linux-cifs@vger.kernel.org' PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils' @@ -650,6 +650,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +GSSAPI_LDADD KRB5_LDADD RELRO_CFLAGS PIE_CFLAGS @@ -1338,7 +1339,7 @@ # 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 cifs-utils 6.14 to adapt to many kinds of systems. +\`configure' configures cifs-utils 7.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1410,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cifs-utils 6.14:";; + short | recursive ) echo "Configuration of cifs-utils 7.0:";; esac cat <<\_ACEOF @@ -1537,7 +1538,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cifs-utils configure 6.14 +cifs-utils configure 7.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2006,7 +2007,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cifs-utils $as_me 6.14, which was +It was created by cifs-utils $as_me 7.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2876,7 +2877,7 @@ # Define the identity of the package. PACKAGE='cifs-utils' - VERSION='6.14' + VERSION='7.0' cat >>confdefs.h <<_ACEOF @@ -5548,6 +5549,67 @@ fi + save_LIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gss_init_sec_context" >&5 +$as_echo_n "checking for library containing gss_init_sec_context... " >&6; } +if ${ac_cv_search_gss_init_sec_context+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* 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 gss_init_sec_context (); +int +main () +{ +return gss_init_sec_context (); + ; + return 0; +} +_ACEOF +for ac_lib in '' gssapi_krb5 gssapi; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_gss_init_sec_context=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_gss_init_sec_context+:} false; then : + break +fi +done +if ${ac_cv_search_gss_init_sec_context+:} false; then : + +else + ac_cv_search_gss_init_sec_context=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gss_init_sec_context" >&5 +$as_echo "$ac_cv_search_gss_init_sec_context" >&6; } +ac_res=$ac_cv_search_gss_init_sec_context +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + GSSAPI_LDADD="$ac_cv_search_gss_init_sec_context" +else + as_fn_error $? "no functioning gssapi library found!" "$LINENO" 5 +fi + + LIBS=$save_LIBS + fi # checks for wbclient.h and libwbclient.so library @@ -6018,6 +6080,21 @@ fi +# determine how to free a string allocated by a krb5 function +if test $enable_cifsupcall != "no"; then + for ac_func in krb5_free_string +do : + ac_fn_c_check_func "$LINENO" "krb5_free_string" "ac_cv_func_krb5_free_string" +if test "x$ac_cv_func_krb5_free_string" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KRB5_FREE_STRING 1 +_ACEOF + +fi +done + +fi + if test $enable_systemd != "no"; then $as_echo "#define ENABLE_SYSTEMD 1" >>confdefs.h @@ -6837,7 +6914,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cifs-utils $as_me 6.14, which was +This file was extended by cifs-utils $as_me 7.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6904,7 +6981,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cifs-utils config.status 6.14 +cifs-utils config.status 7.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru cifs-utils-6.14/configure.ac cifs-utils-7.0/configure.ac --- cifs-utils-6.14/configure.ac 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/configure.ac 2022-08-11 20:40:15.000000000 +0000 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([cifs-utils],[6.14],[linux-cifs@vger.kernel.org],[cifs-utils],[https://wiki.samba.org/index.php/LinuxCIFS_utils]) +AC_INIT([cifs-utils],[7.0],[linux-cifs@vger.kernel.org],[cifs-utils],[https://wiki.samba.org/index.php/LinuxCIFS_utils]) AC_CONFIG_SRCDIR([data_blob.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile contrib/Makefile contrib/request-key.d/Makefile]) @@ -208,6 +208,12 @@ [ KRB5_LDADD='-lkrb5' ], AC_MSG_ERROR([no functioning krb5 library found!])) AC_SUBST(KRB5_LDADD) + save_LIBS=$LIBS + AC_SEARCH_LIBS([gss_init_sec_context], [gssapi_krb5 gssapi], + [ GSSAPI_LDADD="$ac_cv_search_gss_init_sec_context" ], + AC_MSG_ERROR([no functioning gssapi library found!])) + LIBS=$save_LIBS + AC_SUBST(GSSAPI_LDADD) fi # checks for wbclient.h and libwbclient.so library @@ -256,6 +262,11 @@ AC_CHECK_FUNCS([krb5_auth_con_setaddrs krb5_auth_con_set_req_cksumtype]) fi +# determine how to free a string allocated by a krb5 function +if test $enable_cifsupcall != "no"; then + AC_CHECK_FUNCS([krb5_free_string]) +fi + if test $enable_systemd != "no"; then AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd specific behavior for mount.cifs]) fi diff -Nru cifs-utils-6.14/contrib/Makefile.in cifs-utils-7.0/contrib/Makefile.in --- cifs-utils-6.14/contrib/Makefile.in 2021-09-23 23:52:11.000000000 +0000 +++ cifs-utils-7.0/contrib/Makefile.in 2022-08-11 20:56:07.000000000 +0000 @@ -201,6 +201,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +GSSAPI_LDADD = @GSSAPI_LDADD@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru cifs-utils-6.14/contrib/request-key.d/Makefile.in cifs-utils-7.0/contrib/request-key.d/Makefile.in --- cifs-utils-6.14/contrib/request-key.d/Makefile.in 2021-09-23 23:52:11.000000000 +0000 +++ cifs-utils-7.0/contrib/request-key.d/Makefile.in 2022-08-11 20:56:07.000000000 +0000 @@ -143,6 +143,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +GSSAPI_LDADD = @GSSAPI_LDADD@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -Nru cifs-utils-6.14/debian/changelog cifs-utils-7.0/debian/changelog --- cifs-utils-6.14/debian/changelog 2022-05-10 19:59:48.000000000 +0000 +++ cifs-utils-7.0/debian/changelog 2022-08-26 14:06:45.000000000 +0000 @@ -1,3 +1,21 @@ +cifs-utils (2:7.0-2) unstable; urgency=medium + + * root_sbindir-hook.patch - fix upstream fix for non-parallel + install. Actually Closes: #993014 + + -- Michael Tokarev Fri, 26 Aug 2022 17:06:45 +0300 + +cifs-utils (2:7.0-1) unstable; urgency=medium + + * New upstream release (also Closes: #993014) + * d/control: add mjt@ to Uploaders + * d/patches: removed 2 patches from last upload (not needed for 7.0) + * permissons.patch: spelling fix + * debian/cifs-utils.lintian-overrides: reword the only override + to match current lintian + + -- Michael Tokarev Thu, 25 Aug 2022 23:09:14 +0300 + cifs-utils (2:6.14-1.1) unstable; urgency=high * Non-maintainer upload. diff -Nru cifs-utils-6.14/debian/cifs-utils.lintian-overrides cifs-utils-7.0/debian/cifs-utils.lintian-overrides --- cifs-utils-6.14/debian/cifs-utils.lintian-overrides 2022-05-10 19:59:48.000000000 +0000 +++ cifs-utils-7.0/debian/cifs-utils.lintian-overrides 2022-08-25 20:11:10.000000000 +0000 @@ -1 +1 @@ -cifs-utils: setuid-binary sbin/mount.cifs 4755 root/root +cifs-utils: elevated-privileges 4755 root/root [sbin/mount.cifs] diff -Nru cifs-utils-6.14/debian/control cifs-utils-7.0/debian/control --- cifs-utils-6.14/debian/control 2022-05-10 19:59:48.000000000 +0000 +++ cifs-utils-7.0/debian/control 2022-08-25 19:23:04.000000000 +0000 @@ -2,7 +2,12 @@ Section: otherosfs Priority: optional Maintainer: Debian Samba Maintainers -Uploaders: Steve Langasek , Noèl Köthe , Jelmer Vernooij , Mathieu Parent +Uploaders: + Steve Langasek , + Noèl Köthe , + Jelmer Vernooij , + Mathieu Parent , + Michael Tokarev , Build-Depends: libkeyutils-dev, libcap-ng-dev, diff -Nru cifs-utils-6.14/debian/patches/CVE-2022-27239-mount.cifs-fix-length-check-for-ip-op.patch cifs-utils-7.0/debian/patches/CVE-2022-27239-mount.cifs-fix-length-check-for-ip-op.patch --- cifs-utils-6.14/debian/patches/CVE-2022-27239-mount.cifs-fix-length-check-for-ip-op.patch 2022-05-10 19:59:48.000000000 +0000 +++ cifs-utils-7.0/debian/patches/CVE-2022-27239-mount.cifs-fix-length-check-for-ip-op.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From: Jeffrey Bencteux -Date: Thu, 17 Mar 2022 12:58:52 -0400 -Subject: CVE-2022-27239: mount.cifs: fix length check for ip option parsing -Origin: https://git.samba.org/cifs-utils.git/?p=cifs-utils.git;a=commit;h=007c07fd91b6d42f8bd45187cf78ebb06801139d -Bug: https://bugzilla.samba.org/show_bug.cgi?id=15025 -Bug-Debian: https://bugs.debian.org/1010818 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2022-27239 - -Previous check was true whatever the length of the input string was, -leading to a buffer overflow in the subsequent strcpy call. - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=15025 - -Signed-off-by: Jeffrey Bencteux -Reviewed-by: David Disseldorp ---- - mount.cifs.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 84274c98ddf5..3a6b449cc10c 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -926,9 +926,10 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) - if (!value || !*value) { - fprintf(stderr, - "target ip address argument missing\n"); -- } else if (strnlen(value, MAX_ADDRESS_LEN) <= -+ } else if (strnlen(value, MAX_ADDRESS_LEN) < - MAX_ADDRESS_LEN) { -- strcpy(parsed_info->addrlist, value); -+ strlcpy(parsed_info->addrlist, value, -+ MAX_ADDRESS_LEN); - if (parsed_info->verboseflag) - fprintf(stderr, - "ip address %s override specified\n", --- -2.36.0 - diff -Nru cifs-utils-6.14/debian/patches/mount.cifs-fix-verbose-messages-on-option-parsing.patch cifs-utils-7.0/debian/patches/mount.cifs-fix-verbose-messages-on-option-parsing.patch --- cifs-utils-6.14/debian/patches/mount.cifs-fix-verbose-messages-on-option-parsing.patch 2022-05-10 19:59:48.000000000 +0000 +++ cifs-utils-7.0/debian/patches/mount.cifs-fix-verbose-messages-on-option-parsing.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From: Jeffrey Bencteux -Date: Sat, 19 Mar 2022 13:41:15 -0400 -Subject: mount.cifs: fix verbose messages on option parsing -Origin: https://git.samba.org/cifs-utils.git/?p=cifs-utils.git;a=commit;h=8acc963a2e7e9d63fe1f2e7f73f5a03f83d9c379 -Bug: https://bugzilla.samba.org/show_bug.cgi?id=15026 -Bug-Debian: https://bugs.debian.org/1010818 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2022-29869 - -When verbose logging is enabled, invalid credentials file lines may be -dumped to stderr. This may lead to information disclosure in particular -conditions when the credentials file given is sensitive and contains '=' -signs. - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=15026 - -Signed-off-by: Jeffrey Bencteux -Reviewed-by: David Disseldorp ---- - mount.cifs.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 3a6b449cc10c..2278995c9653 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -628,17 +628,13 @@ static int open_cred_file(char *file_name, - goto return_i; - break; - case CRED_DOM: -- if (parsed_info->verboseflag) -- fprintf(stderr, "domain=%s\n", -- temp_val); - strlcpy(parsed_info->domain, temp_val, - sizeof(parsed_info->domain)); - break; - case CRED_UNPARSEABLE: - if (parsed_info->verboseflag) - fprintf(stderr, "Credential formatted " -- "incorrectly: %s\n", -- temp_val ? temp_val : "(null)"); -+ "incorrectly\n"); - break; - } - } --- -2.36.0 - diff -Nru cifs-utils-6.14/debian/patches/permissons.patch cifs-utils-7.0/debian/patches/permissons.patch --- cifs-utils-6.14/debian/patches/permissons.patch 1970-01-01 00:00:00.000000000 +0000 +++ cifs-utils-7.0/debian/patches/permissons.patch 2022-08-25 20:07:57.000000000 +0000 @@ -0,0 +1,14 @@ +diff --git a/cifscreds.c b/cifscreds.c +index 32f2ee4..44ecc3f 100644 +--- a/cifscreds.c ++++ b/cifscreds.c +@@ -227 +227 @@ static int cifscreds_add(struct cmdarg *arg) +- fprintf(stderr, "error: Setting permissons " ++ fprintf(stderr, "error: Setting permissions " +diff --git a/pam_cifscreds.c b/pam_cifscreds.c +index 5d99c2d..6e27a2b 100644 +--- a/pam_cifscreds.c ++++ b/pam_cifscreds.c +@@ -245 +245 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas +- pam_syslog(ph, LOG_ERR,"error: Setting permissons " ++ pam_syslog(ph, LOG_ERR,"error: Setting permissions " diff -Nru cifs-utils-6.14/debian/patches/root_sbindir-hook.patch cifs-utils-7.0/debian/patches/root_sbindir-hook.patch --- cifs-utils-6.14/debian/patches/root_sbindir-hook.patch 1970-01-01 00:00:00.000000000 +0000 +++ cifs-utils-7.0/debian/patches/root_sbindir-hook.patch 2022-08-26 14:06:21.000000000 +0000 @@ -0,0 +1,9 @@ +diff --git a/Makefile.am b/Makefile.am +index a15392d..64e2b44 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -119,3 +119,3 @@ SUBDIRS = contrib + +-install-exec-hook: install-sbinPROGRAMS ++install-exec-hook: install-root_sbinPROGRAMS + (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) diff -Nru cifs-utils-6.14/debian/patches/series cifs-utils-7.0/debian/patches/series --- cifs-utils-6.14/debian/patches/series 2022-05-10 19:59:48.000000000 +0000 +++ cifs-utils-7.0/debian/patches/series 2022-08-26 14:06:31.000000000 +0000 @@ -1,4 +1,4 @@ 0001-Fix-fPIE-casing.patch 0003-Change-script-shbangs-to-python3.patch -CVE-2022-27239-mount.cifs-fix-length-check-for-ip-op.patch -mount.cifs-fix-verbose-messages-on-option-parsing.patch +permissons.patch +root_sbindir-hook.patch diff -Nru cifs-utils-6.14/Makefile.am cifs-utils-7.0/Makefile.am --- cifs-utils-6.14/Makefile.am 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/Makefile.am 2022-08-11 20:40:15.000000000 +0000 @@ -31,7 +31,7 @@ if CONFIG_CIFSUPCALL sbin_PROGRAMS += cifs.upcall cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c -cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) $(CAPNG_LDADD) +cifs_upcall_LDADD = -ltalloc -lkeyutils $(GSSAPI_LDADD) $(KRB5_LDADD) $(CAPNG_LDADD) rst_man_pages += cifs.upcall.8 # # Fix the pathnames in manpages. To prevent @label@ being replaced by m4, we diff -Nru cifs-utils-6.14/Makefile.in cifs-utils-7.0/Makefile.in --- cifs-utils-6.14/Makefile.in 2021-09-23 23:52:11.000000000 +0000 +++ cifs-utils-7.0/Makefile.in 2022-08-11 20:56:07.000000000 +0000 @@ -154,6 +154,7 @@ cifs_upcall_OBJECTS = $(am_cifs_upcall_OBJECTS) am__DEPENDENCIES_1 = @CONFIG_CIFSUPCALL_TRUE@cifs_upcall_DEPENDENCIES = \ +@CONFIG_CIFSUPCALL_TRUE@ $(am__DEPENDENCIES_1) \ @CONFIG_CIFSUPCALL_TRUE@ $(am__DEPENDENCIES_1) am__cifscreds_SOURCES_DIST = cifscreds.c cifskey.c resolve_host.c \ util.c @@ -359,6 +360,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ +GSSAPI_LDADD = @GSSAPI_LDADD@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -469,7 +471,7 @@ $(am__append_19) bin_SCRIPTS = $(am__append_11) $(am__append_13) @CONFIG_CIFSUPCALL_TRUE@cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c -@CONFIG_CIFSUPCALL_TRUE@cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD) $(CAPNG_LDADD) +@CONFIG_CIFSUPCALL_TRUE@cifs_upcall_LDADD = -ltalloc -lkeyutils $(GSSAPI_LDADD) $(KRB5_LDADD) $(CAPNG_LDADD) @CONFIG_CIFSCREDS_TRUE@cifscreds_SOURCES = cifscreds.c cifskey.c resolve_host.c util.c @CONFIG_CIFSCREDS_TRUE@cifscreds_LDADD = -lkeyutils @CONFIG_CIFSIDMAP_TRUE@cifs_idmap_SOURCES = cifs.idmap.c idmap_plugin.c diff -Nru cifs-utils-6.14/mount.cifs.c cifs-utils-7.0/mount.cifs.c --- cifs-utils-6.14/mount.cifs.c 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/mount.cifs.c 2022-08-11 20:40:15.000000000 +0000 @@ -628,17 +628,13 @@ goto return_i; break; case CRED_DOM: - if (parsed_info->verboseflag) - fprintf(stderr, "domain=%s\n", - temp_val); strlcpy(parsed_info->domain, temp_val, sizeof(parsed_info->domain)); break; case CRED_UNPARSEABLE: if (parsed_info->verboseflag) fprintf(stderr, "Credential formatted " - "incorrectly: %s\n", - temp_val ? temp_val : "(null)"); + "incorrectly\n"); break; } } @@ -926,9 +922,10 @@ if (!value || !*value) { fprintf(stderr, "target ip address argument missing\n"); - } else if (strnlen(value, MAX_ADDRESS_LEN) <= + } else if (strnlen(value, MAX_ADDRESS_LEN) < MAX_ADDRESS_LEN) { - strcpy(parsed_info->addrlist, value); + strlcpy(parsed_info->addrlist, value, + MAX_ADDRESS_LEN); if (parsed_info->verboseflag) fprintf(stderr, "ip address %s override specified\n", diff -Nru cifs-utils-6.14/setcifsacl.c cifs-utils-7.0/setcifsacl.c --- cifs-utils-6.14/setcifsacl.c 2021-09-23 23:48:45.000000000 +0000 +++ cifs-utils-7.0/setcifsacl.c 2022-08-11 20:40:15.000000000 +0000 @@ -492,11 +492,11 @@ int i, numallowedaces, numdeniedaces, numallowedinhaces, numdeniedinhaces, numreorderaces; - allowedacesptr = calloc(numfaces, sizeof(struct cifs_aces *)); - deniedacesptr = calloc(numfaces, sizeof(struct cifs_aces *)); - allowedinhacesptr = calloc(numfaces, sizeof(struct cifs_aces *)); - deniedinhacesptr = calloc(numfaces, sizeof(struct cifs_aces *)); - reorderacesptr = calloc(numfaces, sizeof(struct cifs_aces *)); + allowedacesptr = calloc(numfaces, sizeof(struct cifs_ace *)); + deniedacesptr = calloc(numfaces, sizeof(struct cifs_ace *)); + allowedinhacesptr = calloc(numfaces, sizeof(struct cifs_ace *)); + deniedinhacesptr = calloc(numfaces, sizeof(struct cifs_ace *)); + reorderacesptr = calloc(numfaces, sizeof(struct cifs_ace *)); numallowedaces = 0; numdeniedaces = 0; @@ -631,7 +631,7 @@ int i, rc, numaces; numaces = numfaces + numcaces; - totalacesptr = calloc(numaces, sizeof(struct cifs_aces *)); + totalacesptr = calloc(numaces, sizeof(struct cifs_ace *)); for (i = 0; i < numfaces; i++) { totalacesptr[i] = facesptr[i]; @@ -780,7 +780,7 @@ char *acl_base; struct cifs_ace *pace, **facesptr; - facesptr = calloc(numfaces, sizeof(struct cifs_aces *)); + facesptr = calloc(numfaces, sizeof(struct cifs_ace *)); if (!facesptr) { fprintf(stderr, "%s: Error %d allocating ACE array", __func__, errno); @@ -1111,8 +1111,9 @@ int i; char *acesid, *acetype, *aceflag, *acemask; struct cifs_ace **cacesptr; + uint32_t access_req = 0; - cacesptr = calloc(numcaces, sizeof(struct cifs_aces *)); + cacesptr = calloc(numcaces, sizeof(struct cifs_ace *)); if (!cacesptr) { fprintf(stderr, "%s: Error %d allocating ACE array", __func__, errno); @@ -1156,12 +1157,14 @@ goto build_cmdline_aces_ret; } - if (verify_ace_mask(acemask, &cacesptr[i]->access_req)) { + if (verify_ace_mask(acemask, &access_req)) { fprintf(stderr, "%s: Invalid ACE mask: %s\n", __func__, arrptr[i]); goto build_cmdline_aces_ret; } + cacesptr[i]->access_req = access_req; + cacesptr[i]->size = htole16(1 + 1 + 2 + 4 + 1 + 1 + 6 + cacesptr[i]->sid.num_subauth * 4); } @@ -1497,7 +1500,7 @@ numfaces = get_numfaces((struct cifs_ntsd *)attrval, attrlen, &aclptr, ace_kind); - if (!numfaces && (maction != ActAdd || maction != ActAddReorder)) { + if (!numfaces && (maction != ActAdd && maction != ActAddReorder)) { /* if we are not adding aces */ fprintf(stderr, "%s: Empty DACL\n", __func__); goto setcifsacl_facenum_ret;