Create symlinks for modules that register multiple functions (fixes bug #91 )

(This used to be commit 3000a99b2dc4fbffe4f20b92b22b9658d6620b65)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 92f3c44ddc72da719bd7ed599b3628359413b59a..40f506c80751c608f1838e16d246576fae0ddf0c 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -990,7 +990,7 @@ bin/domain.@SHLIBEXT@: $(AUTH_DOMAIN_OBJ:.o=.po)
        @echo "Building plugin $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_DOMAIN_OBJ:.o=.po) @SONAMEFLAG@`basename $@`
 
-bin/server.@SHLIBEXT@: $(AUTH_SERVER_OBJ:.o=.po)
+bin/smbserver.@SHLIBEXT@: $(AUTH_SERVER_OBJ:.o=.po)
        @echo "Building plugin $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(AUTH_SERVER_OBJ:.o=.po) @SONAMEFLAG@`basename $@`
 
@@ -1135,6 +1135,13 @@ installmodules: modules installdirs
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(IDMAPLIBDIR) $(IDMAP_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(CHARSETLIBDIR) $(CHARSET_MODULES)
        @$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(AUTHLIBDIR) $(AUTH_MODULES)
+       @# These symlinks are required for the 'probing' of modules. 
+       @# This mechanism should go at some point..
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ ldapsam_compat.@SHLIBEXT@
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) rhosts.@SHLIBEXT@ hostsequiv.@SHLIBEXT@
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) sam.@SHLIBEXT@ sam_ignoredomain.@SHLIBEXT@
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) domain.@SHLIBEXT@ trustdomain.@SHLIBEXT@ ntdomain.@SHLIBEXT@
+       @$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) builtin.@SHLIBEXT@ guest.@SHLIBEXT@ fixed_challenge.@SHLIBEXT@ name_to_ntstatus.@SHLIBEXT@
 
 installscripts: installdirs
        @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)

diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh
index ec5691992dd1e8614fcda50b7fdddf6f9f952a0c..c80da763688fdad5e705ed2b019dab3eea5f8752 100755 (executable)
--- a/source3/script/installmodules.sh
+++ b/source3/script/installmodules.sh
@@ -24,13 +24,4 @@ for p in $*; do
  chmod $INSTALLPERMS $LIBDIR/$p2
 done
 
-
-cat << EOF
-======================================================================
-The modules are installed.  You may uninstall the modules using the 
-command "make uninstallmodules" or "make uninstall" to uninstall
-binaries, man pages, shell scripts and modules.
-======================================================================
-EOF
-
 exit 0

diff --git a/source3/script/linkmodules.sh b/source3/script/linkmodules.sh
new file mode 100755 (executable)
index 0000000..16a04cc
--- /dev/null
+++ b/source3/script/linkmodules.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd "$1"
+test -f "$2" || exit 0
+
+for I in $3 $4 $5 $6 $7 $8
+do 
+       echo "Linking $I to $2"
+       ln -s $2 $I
+done
+
+exit 0