Changeset 50bb490

Timestamp:

2016-03-25T18:07:53Z (9 years ago)

Author:

Dennis Kaarsemaker <dennis@…>

Branches:

master

Children:

64b4263

Parents:

a6005da

git-author:

Dennis Kaarsemaker <dennis@…> (23-02-16 19:14:57)

git-committer:

Dennis Kaarsemaker <dennis@…> (25-03-16 18:07:53)

Message:

ldap authentication backend

We only support the openldap scheme for now, with users that are
posixAccounts. Moreover, as the plugin cannot be configured directly,
you must configure libldap correctly in /etc/openldap/ldap.conf

Files:

• .travis.yml (modified) (3 diffs)
• auth.c (modified) (2 diffs)
• auth_ldap.c (added)
• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (1 diff)
• configure (modified) (3 diffs)
• tests/Makefile (modified) (1 diff)

.travis.yml

@@ -3 +3 @@
 
 script:
- - ./configure --pam=1
+ - ./configure --pam=1 --ldap=1
  - make check
  - BITLBEE_SKYPE=plugin dpkg-buildpackage -uc -us -d
@@ -30 +30 @@
     - check
     - libpam0g-dev
+    - libldap2-dev
   coverity_scan:
     project:
@@ -35 +36 @@
       description: "An IRC to other chat networks gateway"
     notification_email: dx@dxzone.com.ar
-    build_command_prepend: ./configure --otr=1 --debug=1 --pam=1
+    build_command_prepend: ./configure --otr=1 --debug=1 --pam=1 --ldap=1
     build_command: make
     branch_pattern: coverity_scan

auth.c

@@ -4 +4 @@
 #ifdef WITH_PAM
 extern auth_backend_t auth_pam;
+#endif
+#ifdef WITH_LDAP
+extern auth_backend_t auth_ldap;
 #endif
 
@@ -13 +16 @@
         gl = g_list_append(gl, &auth_pam);
         if (backend && !strcmp(backend, "pam")) {
+                ok = 1;
+        }
+#endif
+#ifdef WITH_LDAP
+        gl = g_list_append(gl, &auth_ldap);
+        if (backend && !strcmp(backend, "ldap")) {
                 ok = 1;
         }

bitlbee.conf

@@ -66 +66 @@
 ## - storage (internal storage)
 ## - pam (Linux PAM authentication)
+## - ldap (LDAP server configured in the openldap settings)
 #
 # AuthBackend = storage

conf.c

@@ -245 +245 @@
                                 if (g_strcasecmp(ini->value, "storage") == 0) {
                                         conf->auth_backend = NULL;
-                                } else if (g_strcasecmp(ini->value, "pam") == 0) {
+                                } 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);

configure

@@ -53 +53 @@
 
 pam=0
+ldap=0
 
 pie=1
@@ -137 +138 @@
 
 --pam=0/1       Disable/enable PAM authentication       $pam
+--ldap=0/1      Disable/enable LDAP authentication      $ldap
 
 --doc=0/1       Disable/enable help.txt generation      $doc
@@ -645 +647 @@
         authobjs=$authobjs'auth_pam.o '
         authlibs=$authlibs'-lpam '
+fi
+if [ "$ldap" = 0 ]; then
+        echo '#undef WITH_LDAP' >> config.h
+else
+        if ! echo '#include <ldap.h>' | $CC -E - >/dev/null 2>/dev/null; then
+                echo 'Cannot find libldap development libraries, aborting. (Install libldap2-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_LDAP' >> config.h
+        authobjs=$authobjs'auth_ldap.o '
+        authlibs=$authlibs'-lldap '
 fi
 echo AUTH_OBJS=$authobjs >> Makefile.settings

tests/Makefile

@@ -15 +15 @@
 distclean: clean
 
-main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_cap.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o auth.o auth_pam.o
+main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_cap.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o auth.o auth_pam.o auth_ldap.o
 
 test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_set.o check_jabber_sasl.o check_jabber_util.o