Merge branch 'capabilities'

* capabilities:
  "multi-prefix" capability 2/2: adjust NAME and WHO handlers
  "multi-prefix" capability 1/2: implement complete CAP infrastructure
  IRC_Send_NAMES(): Code cleanup
  New function Client_CapSet() in addition to Client_Cap{Add|Del}
  "CAP REQ" starts capability negotiation and delays user registration
  Correctly handle "CAP END", new client type CLIENT_WAITCAPEND
  Implement core IRC capability handling and "CAP" command
  New "login" source file
  Introduce_Client() => Client_Introduce(), and move it to client.c

diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj
index 23026c64269f09db09947d9148cf26dcdba3ed8b..6da1cb3e1e9cac2baa588f56c3572671b0ff96bb 100644 (file)
--- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj
+++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj
@@ -315,8 +315,6 @@
                        isa = PBXGroup;
                        children = (
                                FA322D020CEF74B1001761B3 /* Makefile.am */,
-                               FAA3D2790F139CDC00B2447E /* conn-ssl.c */,
-                               FAA3D27A0F139CDC00B2447E /* conn-ssl.h */,
                                FA322CD90CEF74B1001761B3 /* array.c */,
                                FA322CDA0CEF74B1001761B3 /* array.h */,
                                FA322CDB0CEF74B1001761B3 /* channel.c */,
@@ -336,6 +334,8 @@
                                FA322CE40CEF74B1001761B3 /* conn-zip.h */,
                                FA322CE50CEF74B1001761B3 /* conn.c */,
                                FA322CE60CEF74B1001761B3 /* conn.h */,
+                               FAA3D2790F139CDC00B2447E /* conn-ssl.c */,
+                               FAA3D27A0F139CDC00B2447E /* conn-ssl.h */,
                                FA322CE70CEF74B1001761B3 /* defines.h */,
                                FA322CE80CEF74B1001761B3 /* hash.c */,
                                FA322CE90CEF74B1001761B3 /* hash.h */,

diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh
index 6449a67cdbb5dd6da1342cda88f5a88a828ce910..201ed41f78f71195bb6fe60604d3480f5d08414f 100755 (executable)
--- a/contrib/platformtest.sh
+++ b/contrib/platformtest.sh
@@ -96,9 +96,14 @@ if [ -r "Makefile" ]; then
        CC=$(grep "^CC = " Makefile | cut -d' ' -f3)
        $CC --version 2>&1 | grep -i "GCC" >/dev/null
        if [ $? -eq 0 ]; then
-               COMPILER=$($CC --version | head -1 \
-                 | cut -d')' -f2 | cut -d' ' -f2)
-               COMPILER="gcc $COMPILER"
+               $CC --version 2>&1 | grep -i "Open64" >/dev/null
+               if [ $? -eq 0 ]; then
+                       COMPILER="Open64"
+               else
+                       COMPILER=$($CC --version | head -1 \
+                         | cut -d')' -f2 | cut -d' ' -f2)
+                       COMPILER="gcc $COMPILER"
+               fi
        else
                case "$CC" in
                  gcc*)

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index 4f57ca73521f6b65f568d0aefa9c60b844a685c6..5c6c52c4c9b2c9f15a4bdddcd05bef422125b929 100644 (file)
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -147,10 +147,8 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
 
        strlcpy(newelem->mask, Mask, sizeof(newelem->mask));
        if (Reason) {
-               newelem->reason = malloc(strlen(Reason) + 1);
-               if (newelem->reason)
-                       strlcpy(newelem->reason, Reason, strlen(Reason) + 1);
-               else
+               newelem->reason = strdup(Reason);
+               if (!newelem->reason)
                        Log(LOG_EMERG,
                            "Can't allocate memory for new list reason text!");
        }