Changeset 537d9b9 for conf.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -55 +55 @@
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
+        conf->auth_backend = NULL;
         conf->auth_pass = NULL;
         conf->oper_pass = NULL;
+        conf->allow_account_add = 1;
         conf->configdir = g_strdup(CONFIG);
         conf->plugindir = g_strdup(PLUGINDIR);
@@ -240 +242 @@
                                         conf->authmode = AUTHMODE_OPEN;
                                 }
+                        } else if (g_strcasecmp(ini->key, "authbackend") == 0) {
+                                if (g_strcasecmp(ini->value, "storage") == 0) {
+                                        conf->auth_backend = NULL;
+                                } else if (g_strcasecmp(ini->value, "pam") == 0 ||
+                                         g_strcasecmp(ini->value, "ldap") == 0) {
+                                        g_free(conf->auth_backend);
+                                        conf->auth_backend = g_strdup(ini->value);
+                                } else {
+                                        fprintf(stderr, "Invalid %s value: %s\n", ini->key, ini->value);
+                                        return 0;
+                                }
                         } else if (g_strcasecmp(ini->key, "authpassword") == 0) {
                                 g_free(conf->auth_pass);
@@ -246 +259 @@
                                 g_free(conf->oper_pass);
                                 conf->oper_pass = g_strdup(ini->value);
+                        } else if (g_strcasecmp(ini->key, "allowaccountadd") == 0) {
+                                if (!is_bool(ini->value)) {
+                                        fprintf(stderr, "Invalid %s value: %s\n", ini->key, ini->value);
+                                        return 0;
+                                }
+                                conf->allow_account_add = bool2int(ini->value);
                         } else if (g_strcasecmp(ini->key, "hostname") == 0) {
                                 g_free(conf->hostname);