summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-10-13 12:20:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:57 -0500
commit64666f51ae83b7200c25d3cd5009a9ae4ece4e0b (patch)
tree4f3b9ba03998c79c14e02db8a4dbab71f0737bce
parent3eff1f48d5806aeb0347f13c50e7620bbdc04dd5 (diff)
downloadsamba-64666f51ae83b7200c25d3cd5009a9ae4ece4e0b.tar.gz
samba-64666f51ae83b7200c25d3cd5009a9ae4ece4e0b.tar.bz2
samba-64666f51ae83b7200c25d3cd5009a9ae4ece4e0b.zip
r2943: solaris packagaing updates from Darren Chew <darrenc@vicscouts.asn.au>
(This used to be commit 3798357e443f2795bf62a6e6ec73ca6a572957db)
-rwxr-xr-xpackaging/Solaris/makepkg.sh.tmpl6
-rw-r--r--packaging/Solaris/prototype.master12
2 files changed, 12 insertions, 6 deletions
diff --git a/packaging/Solaris/makepkg.sh.tmpl b/packaging/Solaris/makepkg.sh.tmpl
index 2a46321f81..0d4dc02d1c 100755
--- a/packaging/Solaris/makepkg.sh.tmpl
+++ b/packaging/Solaris/makepkg.sh.tmpl
@@ -49,6 +49,12 @@ add_dynamic_entries()
echo s none /usr/lib/nss_winbind.so.2=/usr/lib/libnss_winbind.so 0755 root other
fi
+ # add pam_winbind module to /usr/lib/security
+ if [ -f $DISTR_BASE/source/nsswitch/pam_winbind.so ] ; then
+ echo f none /usr/lib/security/pam_winbind.so.1=source/nsswitch/pam_winbind.so 0755 root bin
+ echo s none /usr/lib/security/pam_winbind.so=/usr/lib/security/pam_winbind.so.1 0777 root root
+ fi
+
# add the .dat codepages
echo "#\n# Codepages \n#"
for file in $DISTR_BASE/source/codepages/*.dat ; do
diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master
index 6c5aa3e28a..0863e158c3 100644
--- a/packaging/Solaris/prototype.master
+++ b/packaging/Solaris/prototype.master
@@ -40,12 +40,12 @@ d none samba/docs 0755 root other
d none samba/lib/charset 0755 root other
f none samba/lib/smb.conf.example=examples/smb.conf.default 0644 root other
d none samba/lib/regeditscripts 0755 root other
-f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/Registry/NT4_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/Registry/Win95_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/Registry/Win98_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/WinME_PlainPassword.reg=docs/Registry/WinME_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/Registry/Win2000_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/WinXP_PlainPassword.reg=docs/Registry/WinXP_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/registry/NT4_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/registry/Win95_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/registry/Win98_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/WinME_PlainPassword.reg=docs/registry/WinME_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/registry/Win2000_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/WinXP_PlainPassword.reg=docs/registry/WinXP_PlainPassword.reg 0444 root other
#
# Random files
f none samba/docs/Samba-HOWTO-Collection.pdf=docs/Samba-HOWTO-Collection.pdf 0644 root other