[linux-cifs-client] [PATCH 1/2] try#2 cifs.spnego helper in samba: configure.in/Makefile.in changes

[Q (Igor Mammedov)]

Signed-off-by: Igor Mammedov <niallain at gmail.com>
---
  source/Makefile.in  |   20 +++++++++++++++++---
  source/configure.in |   45 +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/source/Makefile.in b/source/Makefile.in
index a1da65a..ff07aae 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -160,7 +160,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \

  SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ 
@EXTRA_SBIN_PROGS@

-ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
+ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSSPNEGO_PROGS@

  BIN_PROGS1 = bin/smbclient at EXEEXT@ bin/net at EXEEXT@ bin/smbspool at EXEEXT@ \
  	bin/testparm at EXEEXT@ bin/smbstatus at EXEEXT@ bin/smbget at EXEEXT@
@@ -728,6 +728,8 @@ CIFS_MOUNT_OBJ = client/mount.cifs.o

  CIFS_UMOUNT_OBJ = client/umount.cifs.o

+CIFS_SPNEGO_OBJ = client/cifs.spnego.o
+
  NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) 
$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) \
                 $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) 
$(LIBSAMBA_OBJ)

@@ -1185,6 +1187,11 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) 
$(CIFS_UMOUNT_OBJ)
  	@echo Linking $@
  	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS)

+bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) 
$(LIBSMBCLIENT_OBJ)
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) 
-lkeyutils $(LIBS) \
+		$(LIBSMBCLIENT_OBJ) $(KRB5LIBS) $(LDAP_LIBS)
+
  bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@
  	@echo Linking $@
  	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) 
$(LDAP_LIBS) @POPTLIBS@
@@ -1712,7 +1719,7 @@ bin/timelimit at EXEEXT@: script/tests/timelimit.o
  	@echo Linking $@
  	@$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o

-install: installservers installbin @INSTALL_CIFSMOUNT@ installman 
installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ 
@INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
+install: installservers installbin @INSTALL_CIFSMOUNT@ 
@INSTALL_CIFSSPNEGO@ installman installscripts installdat installmodules 
@SWAT_INSTALL_TARGETS@ @INSTALL_LIBSMBCLIENT@ @INSTALL_PAM_MODULES@ 
@INSTALL_LIBSMBSHAREMODES@


  install-everything: install installmodules
@@ -1738,6 +1745,10 @@ installcifsmount: @CIFSMOUNT_PROGS@
  	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) 
$(DESTDIR) $(ROOTSBINDIR)
  	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) 
$(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@

+installcifsspnego: @CIFSSPNEGO_PROGS@
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) 
$(DESTDIR) $(ROOTSBINDIR)
+	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) 
$(prefix) $(ROOTSBINDIR) @CIFSSPNEGO_PROGS@
+
  # Some symlinks are required for the 'probing' of modules.
  # This mechanism should go at some point..
  installmodules: modules installdirs
@@ -1821,7 +1832,7 @@ showlayout:
  	@echo "  swatdir:     $(SWATDIR)"


-uninstall: uninstallman uninstallservers uninstallbin 
@UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat 
uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_PAM_MODULES@ 
@UNINSTALL_LIBSMBSHAREMODES@
+uninstall: uninstallman uninstallservers uninstallbin 
@UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSSPNEGO@ uninstallscripts 
uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ 
@UNINSTALL_PAM_MODULES@ @UNINSTALL_LIBSMBSHAREMODES@

  uninstallman:
  	@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) 
$(srcdir) C
@@ -1835,6 +1846,9 @@ uninstallbin:
  uninstallcifsmount:
  	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) 
$(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@

+uninstallcifsspnego:
+	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) 
$(prefix) $(ROOTSBINDIR) @CIFSSPNEGO_PROGS@
+
  uninstallmodules:
  	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) 
$(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
  	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) 
$(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
diff --git a/source/configure.in b/source/configure.in
index 80e57f8..44cb976 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -333,6 +333,9 @@ AC_SUBST(SMBMOUNT_PROGS)
  AC_SUBST(CIFSMOUNT_PROGS)
  AC_SUBST(INSTALL_CIFSMOUNT)
  AC_SUBST(UNINSTALL_CIFSMOUNT)
+AC_SUBST(CIFSSPNEGO_PROGS)
+AC_SUBST(INSTALL_CIFSSPNEGO)
+AC_SUBST(UNINSTALL_CIFSSPNEGO)
  AC_SUBST(EXTRA_SBIN_PROGS)
  AC_SUBST(EXTRA_ALL_TARGETS)
  AC_SUBST(CONFIG_LIBS)
@@ -4447,6 +4450,48 @@ AC_ARG_WITH(cifsmount,
    esac ]
  )

+#################################################
+# check for cifs.spnego support
+CIFSSPNEGO_PROGS=""
+INSTALL_CIFSSPNEGO=""
+UNINSTALL_CIFSSPNEGO=""
+AC_MSG_CHECKING(whether to build cifs.spnego)
+AC_ARG_WITH(cifsspnego,
+[  --with-cifsspnego       Include cifs.spnego (Linux only) support 
(default=yes)],
+[ case "$withval" in
+  no)
+	AC_MSG_RESULT(no)
+	;;
+  *)
+	case "$host_os" in
+	*linux*)
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(WITH_CIFSSPNEGO,1,[Whether to build cifs.spnego])
+		CIFSSPNEGO_PROGS="bin/cifs.spnego"
+		INSTALL_CIFSSPNEGO="installcifsspnego"
+		UNINSTALL_CIFSSPNEGO="uninstallcifsspnego"
+		;;
+	*)
+		AC_MSG_ERROR(not on a linux system!)
+		;;
+	esac
+    ;;
+  esac ],
+[ case "$host_os" in
+  *linux*)
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(WITH_CIFSSPNEGO,1,[Whether to build cifs.spnego])
+	CIFSSPNEGO_PROGS="bin/cifs.spnego"
+	INSTALL_CIFSSPNEGO="installcifsspnego"
+	UNINSTALL_CIFSSPNEGO="uninstallcifsspnego"
+	;;
+  *)
+	AC_MSG_RESULT(no)
+	;;
+  esac ]
+)
+
+

  #################################################
  # Check for a PAM clear-text auth, accounts, password
-- 1.5.2.1


-- 

Best regards,

-------------------------
Igor Mammedov,
niallain "at" gmail.com