Browse Source

* add 'debug' keyword

master
Alex 'AdUser' Z 9 years ago
parent
commit
ecafd42e96
  1. 3
      src/config.c
  2. 1
      src/config.h
  3. 1
      tests/parse_config.c
  4. 2
      tests/test.conf

3
src/config.c

@ -72,6 +72,9 @@ int parse_config(oal_config_t * const config, const char *file) {
if (strncmp(key, "bindtimeout", 11) == 0) { if (strncmp(key, "bindtimeout", 11) == 0) {
config->bindtimeout = atoi(value); config->bindtimeout = atoi(value);
} else } else
if (strncmp(key, "debug", 5) == 0) {
config->debug = !!atoi(value);
} else
if (strncmp(key, "basedn", 6) == 0) { if (strncmp(key, "basedn", 6) == 0) {
config->basedn = strndup(value, valsize); config->basedn = strndup(value, valsize);
} else } else

1
src/config.h

@ -7,6 +7,7 @@ typedef struct {
char *bindpass; /** bind with this password */ char *bindpass; /** bind with this password */
size_t bindtimeout; /** bind timeout */ size_t bindtimeout; /** bind timeout */
char *basedn; /** where to search for users */ char *basedn; /** where to search for users */
short debug; /** enable ldap debug */
char *userfilter; /** ldap filter for user entry */ char *userfilter; /** ldap filter for user entry */
char error[1024]; /** parser error */ char error[1024]; /** parser error */
} oal_config_t; } oal_config_t;

1
tests/parse_config.c

@ -16,6 +16,7 @@ int main(void) {
} }
assert(config.bindtimeout == 5); assert(config.bindtimeout == 5);
assert(config.debug == 1);
assert(strcmp(config.bindpass, "strong-password") == 0); assert(strcmp(config.bindpass, "strong-password") == 0);
assert(strcmp(config.bindurls, "ldap://127.0.0.1 ldaps://172.16.17.1") == 0); assert(strcmp(config.bindurls, "ldap://127.0.0.1 ldaps://172.16.17.1") == 0);
assert(strcmp(config.binddn, "cn=admin,dc=example,dc=com") == 0); assert(strcmp(config.binddn, "cn=admin,dc=example,dc=com") == 0);

2
tests/test.conf

@ -4,6 +4,8 @@ binddn cn=admin,dc=example,dc=com
bindpass strong-password bindpass strong-password
bindtimeout 5 bindtimeout 5
# another comment and empty string below # another comment and empty string below
debug 5
# ^^ this is actually boolean flag: zero and non-zero
basedn ou=users,dc=example,dc=com basedn ou=users,dc=example,dc=com
userfilter (objectClass=inetOrgPerson) userfilter (objectClass=inetOrgPerson)

Loading…
Cancel
Save