comparison: src/server/daemon/ldap_resource.c
src/server/daemon/ldap_resource.c
- changeset 463
- 4fd523fff13b
- parent 462
- 72848970541a
- child 464
- 0a29110b94ec
equal
deleted
inserted
replaced
| 462:72848970541a | 463:4fd523fff13b |
|---|---|
| 122 char *port = pblock_findval("Port", pb); | 122 char *port = pblock_findval("Port", pb); |
| 123 char *binddn = pblock_findval("Binddn", pb); | 123 char *binddn = pblock_findval("Binddn", pb); |
| 124 char *bindpw = pblock_findval("Bindpw", pb); | 124 char *bindpw = pblock_findval("Bindpw", pb); |
| 125 char *bind = pblock_findval("Bind", pb); | 125 char *bind = pblock_findval("Bind", pb); |
| 126 | 126 |
| 127 if(!ldap_uri || !host) { | 127 log_ereport( |
| 128 LOG_INFORM, | |
| 129 "create ldap resource pool: name=%s : %s%s%s%s : binddn=%s", | |
| 130 rpname, | |
| 131 ldap_uri ? "uri=" : "host=", | |
| 132 ldap_uri ? ldap_uri : host, | |
| 133 ldap_uri || !port ? "" : ":", | |
| 134 !port ? "" : port, | |
| 135 binddn ? binddn : "''"); | |
| 136 | |
| 137 if(!ldap_uri && !host) { | |
| 128 log_ereport(LOG_MISCONFIG, "Resource pool %s: No host or ldap uri specified", rpname); | 138 log_ereport(LOG_MISCONFIG, "Resource pool %s: No host or ldap uri specified", rpname); |
| 129 return NULL; | 139 return NULL; |
| 130 } | 140 } |
| 131 if(ldap_uri && host) { | 141 if(ldap_uri && host) { |
| 132 log_ereport(LOG_MISCONFIG, "Resource pool %s: Either Uri or Host must be specified, not both", rpname); | 142 log_ereport(LOG_MISCONFIG, "Resource pool %s: Either Uri or Host must be specified, not both", rpname); |
| 158 ldap_pool->ldap_uri = ldap_uri; | 168 ldap_pool->ldap_uri = ldap_uri; |
| 159 ldap_pool->host = host; | 169 ldap_pool->host = host; |
| 160 ldap_pool->port = (int)port_i; | 170 ldap_pool->port = (int)port_i; |
| 161 ldap_pool->binddn = binddn; | 171 ldap_pool->binddn = binddn; |
| 162 ldap_pool->bindpw = bindpw; | 172 ldap_pool->bindpw = bindpw; |
| 163 ldap_pool->bind = util_getboolean(bind, ldap_pool->binddn != NULL); | 173 WSBool bind_def = binddn != NULL; |
| 174 ldap_pool->bind = bind ? util_getboolean(bind, bind_def) : bind_def; | |
| 164 | 175 |
| 165 return ldap_pool; | 176 return ldap_pool; |
| 166 } | 177 } |
| 167 | 178 |
| 168 void ldap_resourcepool_destroy(LDAPResourcePool *pool) { | 179 void ldap_resourcepool_destroy(LDAPResourcePool *pool) { |
