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 /manifest | |
| 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 'manifest')
| -rw-r--r-- | manifest | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -10447,6 +10447,8 @@ f usr/lib/security/amd64/pam_roles.so.1 0755 root bin s usr/lib/security/amd64/pam_roles.so=pam_roles.so.1 f usr/lib/security/amd64/pam_sample.so.1 0755 root bin s usr/lib/security/amd64/pam_sample.so=pam_sample.so.1 +f usr/lib/security/amd64/pam_smb_passwd.so.1 0755 root bin +s usr/lib/security/amd64/pam_smb_passwd.so=pam_smb_passwd.so.1 f usr/lib/security/amd64/pam_smbfs_login.so.1 0755 root bin s usr/lib/security/amd64/pam_smbfs_login.so=pam_smbfs_login.so.1 f usr/lib/security/amd64/pam_timestamp.so.1 0755 root bin @@ -10535,6 +10537,8 @@ d usr/lib/smbfs 0755 root bin f usr/lib/smbfs/smbiod 0555 root bin f usr/lib/smbfs/smbiod-svc 0555 root bin d usr/lib/smbsrv 0755 root bin +d usr/lib/smbsrv/amd64 0755 root bin +f usr/lib/smbsrv/amd64/libsmb.so.1 0555 root bin d usr/lib/smbsrv/dtrace 0755 root bin f usr/lib/smbsrv/dtrace/nbl-conflict.d 0555 root bin f usr/lib/smbsrv/dtrace/smb-trace.d 0555 root bin |