summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-10-25 19:25:54 +0000
committerGerald Carter <jerry@samba.org>2004-10-25 19:25:54 +0000
commit317ab676bf28d3922dc0fba02e908a766035872f (patch)
treed9ea00a371f92740e58b95991b4b56723454304d /packaging
parent943c0aaaeb5a24a9501a164e9a765384e8e8a2ff (diff)
downloadsamba-317ab676bf28d3922dc0fba02e908a766035872f.tar.gz
samba-317ab676bf28d3922dc0fba02e908a766035872f.tar.xz
samba-317ab676bf28d3922dc0fba02e908a766035872f.zip
r3220: merging current 3.0 code to release branch
Diffstat (limited to 'packaging')
-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 2a46321f818..0d4dc02d1ce 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 6c5aa3e28ab..0863e158c3d 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