mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
9c6b7f2d62
This merges Samba4 up to current lorikeet-heimdal, which includes a
replacement for some Samba-specific hacks.
In particular, the credentials system now supplies GSS client and
server credentials. These are imported into GSS with
gss_krb5_import_creds(). Unfortunetly this can't take an MEMORY
keytab, so we now create a FILE based keytab as provision and join
time.
Because the keytab is now created in advance, we don't spend .4s at
negprot doing sha1 s2k calls. Also, because the keytab is read in
real time, any change in the server key will be correctly picked up by
the the krb5 code.
To mark entries in the secrets which should be exported to a keytab,
there is a new kerberosSecret objectClass. The new routine
cli_credentials_update_all_keytabs() searches for these, and updates
the keytabs.
This is called in the provision.js via the ejs wrapper
credentials_update_all_keytabs().
We can now (in theory) use a system-provided /etc/krb5.keytab, if
krb5Keytab: FILE:/etc/krb5.keytab
is added to the secrets.ldb record. By default the attribute
privateKeytab: secrets.keytab
is set, pointing to allow the whole private directory to be moved
without breaking the internal links.
(This used to be commit 6b75573df4)
56 lines
1.2 KiB
Plaintext
56 lines
1.2 KiB
Plaintext
dn: @INDEXLIST
|
|
@IDXATTR: cn
|
|
@IDXATTR: flatname
|
|
@IDXATTR: realm
|
|
|
|
dn: @ATTRIBUTES
|
|
realm: CASE_INSENSITIVE
|
|
flatname: CASE_INSENSITIVE
|
|
sAMAccountName: CASE_INSENSITIVE
|
|
|
|
#Add modules to the list to activate them by default
|
|
#beware often order is important
|
|
dn: @MODULES
|
|
@LIST: operational
|
|
|
|
dn: CN=LSA Secrets
|
|
objectClass: top
|
|
objectClass: container
|
|
cn: LSA Secrets
|
|
|
|
dn: CN=Primary Domains
|
|
objectClass: top
|
|
objectClass: container
|
|
cn: Primary Domains
|
|
|
|
dn: flatname=${DOMAIN},CN=Primary Domains
|
|
objectClass: top
|
|
objectClass: primaryDomain
|
|
objectClass: kerberosSecret
|
|
flatname: ${DOMAIN}
|
|
realm: ${REALM}
|
|
secret: ${MACHINEPASS}
|
|
secureChannelType: 6
|
|
sAMAccountName: ${NETBIOSNAME}$
|
|
whenCreated: ${LDAPTIME}
|
|
whenChanged: ${LDAPTIME}
|
|
msDS-KeyVersionNumber: 1
|
|
objectSid: ${DOMAINSID}
|
|
privateKeytab: secrets.keytab
|
|
|
|
dn: samAccountName=krbtgt,flatname=${DOMAIN},CN=Principals
|
|
objectClass: top
|
|
objectClass: secret
|
|
objectClass: kerberosSecret
|
|
flatname: ${DOMAIN}
|
|
realm: ${REALM}
|
|
secret: ${KRBTGTPASS}
|
|
sAMAccountName: krbtgt
|
|
whenCreated: ${LDAPTIME}
|
|
whenChanged: ${LDAPTIME}
|
|
msDS-KeyVersionNumber: 1
|
|
objectSid: ${DOMAINSID}
|
|
servicePrincipalName: kadmin/changepw
|
|
saltPrincipal: krbtgt@${REALM}
|
|
privateKeytab: secrets.keytab
|