summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-08-13 04:11:50 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-08-13 04:11:50 +0000
commitfd4c40a00da975e4d6caf924877c695eb02b5982 (patch)
tree346c2ad089599ecc7292e5f5a56443da357cc7a3 /source3
parent998ded9155ce22008a4563d678dfb2a4d1385726 (diff)
downloadsamba-fd4c40a00da975e4d6caf924877c695eb02b5982.tar.gz
samba-fd4c40a00da975e4d6caf924877c695eb02b5982.tar.bz2
samba-fd4c40a00da975e4d6caf924877c695eb02b5982.zip
Create symlinks for modules that register multiple functions (fixes bug #91 )
(This used to be commit 3000a99b2dc4fbffe4f20b92b22b9658d6620b65)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in9
-rwxr-xr-xsource3/script/installmodules.sh9
-rwxr-xr-xsource3/script/linkmodules.sh12
3 files changed, 20 insertions, 10 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 92f3c44ddc..40f506c807 100644
--- 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 ec5691992d..c80da76368 100755
--- 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
index 0000000000..16a04cc064
--- /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