0e0d24367a
+ fixes for various bugs turned up by Coverity
+ clean unused cruft out of upcall binary
+ add new pam_cifscreds PAM module for establishing NTLM creds on login
which BuildRequires the pam-devel package
- Make the PAM security directory configurable at compile time; (bso#10513).
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=99
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
Author: Lars Mueller <lmuelle@suse.com>
|
|
Subject: Make PAM security install directory configurable at compile time
|
|
Reported-upstream: yes
|
|
Bugzilla: bso#10513
|
|
|
|
Index: cifs-utils-6.3/Makefile.in
|
|
===================================================================
|
|
--- cifs-utils-6.3.orig/Makefile.in
|
|
+++ cifs-utils-6.3/Makefile.in
|
|
@@ -413,6 +411,7 @@ localstatedir = @localstatedir@
|
|
mandir = @mandir@
|
|
mkdir_p = @mkdir_p@
|
|
oldincludedir = @oldincludedir@
|
|
+pamdir = @pamdir@
|
|
pdfdir = @pdfdir@
|
|
pluginpath = @pluginpath@
|
|
prefix = @prefix@
|
|
@@ -446,7 +445,6 @@ include_HEADERS = cifsidmap.h
|
|
@CONFIG_CIFSACL_TRUE@setcifsacl_SOURCES = setcifsacl.c idmap_plugin.c
|
|
@CONFIG_CIFSACL_TRUE@setcifsacl_LDADD = -ldl
|
|
@CONFIG_PLUGIN_TRUE@plugindir = $(pkglibdir)
|
|
-@CONFIG_PAM_TRUE@pamdir = $(libdir)/security
|
|
SUBDIRS = contrib
|
|
all: config.h
|
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
Index: cifs-utils-6.3/configure.ac
|
|
===================================================================
|
|
--- cifs-utils-6.3.orig/configure.ac
|
|
+++ cifs-utils-6.3/configure.ac
|
|
@@ -58,6 +58,12 @@ AC_ARG_WITH(idmap-plugin,
|
|
AC_DEFINE_UNQUOTED(IDMAP_PLUGIN_PATH, "$pluginpath", [Location of plugin that ID mapping infrastructure should use. (usually a symlink to real plugin)])
|
|
AC_SUBST([pluginpath])
|
|
|
|
+AC_ARG_WITH(pamdir,
|
|
+ [AC_HELP_STRING([--with-pamdir=DIR],[Where to install the PAM module [[$(libdir)/security]]])],
|
|
+ pamdir=$withval,
|
|
+ pamdir="\$(libdir)/security")
|
|
+AC_SUBST([pamdir])
|
|
+
|
|
# check for ROOTSBINDIR environment var
|
|
if test -z $ROOTSBINDIR; then
|
|
ROOTSBINDIR="/sbin"
|
|
Index: cifs-utils-6.3/Makefile.am
|
|
===================================================================
|
|
--- cifs-utils-6.3.orig/Makefile.am
|
|
+++ cifs-utils-6.3/Makefile.am
|
|
@@ -92,8 +92,6 @@ idmapwb.8: idmapwb.8.in
|
|
endif
|
|
|
|
if CONFIG_PAM
|
|
-pamdir = $(libdir)/security
|
|
-
|
|
pam_PROGRAMS = pam_cifscreds.so
|
|
|
|
pam_cifscreds.so: pam_cifscreds.c cifskey.c resolve_host.c util.c
|