diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-03-22 13:08:20 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-03-22 13:08:20 -0400 |
| commit | 4822583a749a4edd3974bf4dbe2a30bca716bece (patch) | |
| tree | 2723797f2557efec71c286f6874cdb3bf9e5435b /usr/src/pkg | |
| parent | 5dcd311113b08a0d9d9246e667434563ada332fe (diff) | |
| parent | c4140c56306ad2a74081dd949618b4f3162dd06b (diff) | |
| download | illumos-joyent-4822583a749a4edd3974bf4dbe2a30bca716bece.tar.gz | |
[illumos-gate merge]
commit c4140c56306ad2a74081dd949618b4f3162dd06b
14552 We should provide 64-bit pam_smb_passwd.so.1
commit faa2068d5f60927511f588cf120b905d985371d0
14434 overlays should persist across reboots
Conflicts:
manifest
usr/src/cmd/svc/milestone/net-early-admin
usr/src/cmd/svc/milestone/net-physical
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/service-file-system-smb.p5m | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/service-file-system-smb.p5m b/usr/src/pkg/manifests/service-file-system-smb.p5m index 8340ef7bbc..8944694ad1 100644 --- a/usr/src/pkg/manifests/service-file-system-smb.p5m +++ b/usr/src/pkg/manifests/service-file-system-smb.p5m @@ -63,9 +63,15 @@ dir path=usr/lib/reparse link path=usr/lib/reparse/libreparse_smb.so target=libreparse_smb.so.1 file path=usr/lib/reparse/libreparse_smb.so.1 dir path=usr/lib/security +dir path=usr/lib/security/$(ARCH64) +link path=usr/lib/security/$(ARCH64)/pam_smb_passwd.so \ + target=pam_smb_passwd.so.1 +file path=usr/lib/security/$(ARCH64)/pam_smb_passwd.so.1 link path=usr/lib/security/pam_smb_passwd.so target=pam_smb_passwd.so.1 file path=usr/lib/security/pam_smb_passwd.so.1 dir path=usr/lib/smbsrv +dir path=usr/lib/smbsrv/$(ARCH64) +file path=usr/lib/smbsrv/$(ARCH64)/libsmb.so.1 dir path=usr/lib/smbsrv/dtrace file path=usr/lib/smbsrv/dtrace/nbl-conflict.d mode=0555 file path=usr/lib/smbsrv/dtrace/smb-trace.d mode=0555 |