Changeset 85e9644

Timestamp:

2006-06-07T13:36:19Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c121f89

Parents:

a312b6b (diff), 0025b51 (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:

Merging Jelmer's storage tree (with LDAP support).

Files:

• Makefile (modified) (1 diff)
• configure (modified) (6 diffs)
• doc/bitlbee.schema (added)
• irc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• storage.c (modified) (1 diff)
• storage_ldap.c (added)

Makefile

@@ -13 +13 @@
 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
 subdirs = protocols
+
+objects += $(LDAP_OBJ)
 
 # Expansion of variables

configure

@@ -31 +31 @@
 
 events=glib
+ldap=auto
 ssl=auto
 
@@ -66 +67 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
+
+--ldap=0/1/auto LDAP support                            $ldap
 
 --events=...    Event handler (glib, libevent)          $events
@@ -146 +149 @@
 
 if [ -n "$CC" ]; then
-        echo "CC=$CC" >> Makefile.settings;
+        CC=$CC
 elif type gcc > /dev/null 2> /dev/null; then
-        echo "CC=gcc" >> Makefile.settings;
+        CC=gcc
 elif type cc > /dev/null 2> /dev/null; then
-        echo "CC=cc" >> Makefile.settings;
+        CC=cc
 else
         echo 'Cannot find a C compiler, aborting.'
         exit 1;
 fi
+
+echo "CC=$CC" >> Makefile.settings;
 
 if [ -n "$LD" ]; then
@@ -230 +235 @@
                 ret=0;
         fi;
+}
+
+detect_ldap()
+{
+        TMPFILE=`mktemp`
+        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
+                cat<<EOF>>Makefile.settings
+EFLAGS+=-lldap
+CFLAGS+=
+EOF
+                ldap=1
+                rm -f $TMPFILE
+                ret=1
+        else
+                ldap=0
+                ret=0
+        fi
 }
 
@@ -292 +314 @@
 fi
 
+if [ "$ldap" = "auto" ]; then
+        detect_ldap
+fi
+
+if [ "$ldap" = 0 ]; then
+        echo "LDAP_OBJ=\# no ldap" >> Makefile.settings
+        echo "#undef WITH_LDAP" >> config.h
+elif [ "$ldap" = 1 ]; then
+        echo "#define WITH_LDAP 1" >> config.h
+        echo "LDAP_OBJ=storage_ldap.o" >> Makefile.settings
+fi
+
 if [ "$strip" = 0 ]; then
         echo "STRIP=\# skip strip" >> Makefile.settings;
@@ -444 +478 @@
         echo '  Building without IM-protocol support. We wish you a lot of fun...';
 fi
+
+if [ "$ldap" = "0" ]; then
+        echo "  LDAP storage backend disabled."
+else
+        echo "  LDAP storage backend enabled."
+fi

irc.c

@@ -905 +905 @@
 void irc_kill( irc_t *irc, user_t *u )
 {
-        char *nick;
-        
-        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, "Leaving..." );
+        char *nick, *s;
+        char reason[64];
+        
+        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
+        {
+                if( u->gc->user->proto_opt[0][0] )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    u->gc->user->proto_opt[0] );
+                else if( ( s = strchr( u->gc->username, '@' ) ) )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    s + 1 );
+                else
+                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
+                                    u->gc->prpl->name, irc->myhost );
+                
+                /* proto_opt might contain garbage after the : */
+                if( ( s = strchr( reason, ':' ) ) )
+                        *s = 0;
+        }
+        else
+        {
+                strcpy( reason, "Leaving..." );
+        }
+        
+        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
         
         nick = g_strdup( u->nick );

protocols/nogaim.c

@@ -294 +294 @@
         
         serv_got_crap( gc, "Signing off.." );
-
+        gc->flags |= OPT_LOGGING_OUT;
+        
         b_event_remove( gc->keepalive );
         gc->keepalive = 0;

protocols/nogaim.h

@@ -54 +54 @@
 #define WEBSITE "http://www.bitlbee.org/"
 #define IM_FLAG_AWAY 0x0020
-#define OPT_CONN_HTML 0x00000001
-#define OPT_LOGGED_IN 0x00010000
 #define GAIM_AWAY_CUSTOM "Custom"
+
+#define OPT_CONN_HTML   0x00000001
+#define OPT_LOGGED_IN   0x00010000
+#define OPT_LOGGING_OUT 0x00020000
 
 /* ok. now the fun begins. first we create a connection structure */

storage.c

@@ -6 +6 @@
 
 /* Support for multiple storage backends */
+
+/* Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org> */
 
 /*