Freenas/11.1 stable ticket 40720 #1643
Conversation
Ticket: #23392 (cherry picked from commit 51b4222) (11.1-stable) Ticket: #40720
(cherry picked from commit b65131b) (11.1-stable) Ticket: #40720
(cherry picked from commit de60a61) (11.1-stable) Ticket: #40720
(cherry picked from commit efa2e99) (11.1-stable) Ticket: #40692
Ticket: #23392 (cherry picked from commit 97fa419) (11.1-stable) Ticket: #40720
ghost
assigned 
| if nslcd_running | ||
| then | ||
| nslcd_stop | ||
| ldapctl_cmd ${service} ix-nslcd start |
There was a problem hiding this comment.
I couldn't find ix-nslcd in the master, does it exist or it should be nslcd here?
There was a problem hiding this comment.
Good question. I don't know! I'll look at the patch and see what I meant to do here.
| if ldap['ldap_certificate']: | ||
| cert = safe_call('certificateauthority.query', [('id', '=', ldap['ldap_certificate']['id'])], {'get': True}) | ||
| if cert: | ||
| capath = cert['cert_certificate_path'] |
There was a problem hiding this comment.
I have no idea what I'm talking about but in the next file there is an update:
- capath = cert['cert_certificate_path']
+ capath = cert['certificate_path']
So one of them must be wrong, I guess.
There was a problem hiding this comment.
So apparently cert_certificate_path is the correct key. This was changed at some point, which is why you see a bunch of cert_certificate_path to certificate_path changes. Now that I see that cert_certificate_path is the correct key, I need to revisit all of these PR's where that key change is made. Good find.
|
|
||
| ldap_enabled = safe_call('notifier.common', 'system', 'ldap_enabled') | ||
|
|
||
| ldap_uri = "%s://%s" % ("ldaps" if ldap['ldap_ssl'] == "on" else "ldap", ldap['ldap_hostname']) |
There was a problem hiding this comment.
Potentially, ldap can be set to None here, so querying ldap['ldap_hostname'] will give us an exception here?
| @@ -13,7 +13,7 @@ | |||
| if ldap['ldap_certificate']: | |||
| cert = safe_call('certificateauthority.query', [('id', '=', ldap['ldap_certificate']['id'])], {'get': True}) | |||
| if cert: | |||
| capath = cert['cert_certificate_path'] | |||
Ticket: #40720
Ticket: #40720
DEPENDS: truenas/core-build#96