- Unique id should be in lock

3 files changed, 9 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c613da..4052241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 0.4
   - Option for quarantining files with viruses
   - Fixed problem with returning wrong SMTP error code
-  - Fixed handling of timeouts
+  - Handling timeouts properly
   - Fixed stupid problem with sockets not getting closed properly
 
 0.3
diff --git a/common/smtppass.c b/common/smtppass.c
index 7f7d8e6..f021a8b 100644
--- a/common/smtppass.c
+++ b/common/smtppass.c
@@ -551,13 +551,14 @@ static void* thread_main(void* arg)
 
     memset(&ctx, 0, sizeof(ctx));
 
-    /* Assign a unique id to the connection */
-    ctx.id = g_unique_id++;
-
     ctx.server = -1;
     ctx.clam = -1;
 
     plock();
+        /* Assign a unique id to the connection */
+        ctx.id = g_unique_id++;
+
+        /* Get the client socket */
         ctx.client = thread->fd;
     punlock();
 
diff --git a/src/clamsmtpd.c b/src/clamsmtpd.c
index 7f7d8e6..f021a8b 100644
--- a/src/clamsmtpd.c
+++ b/src/clamsmtpd.c
@@ -551,13 +551,14 @@ static void* thread_main(void* arg)
 
     memset(&ctx, 0, sizeof(ctx));
 
-    /* Assign a unique id to the connection */
-    ctx.id = g_unique_id++;
-
     ctx.server = -1;
     ctx.clam = -1;
 
     plock();
+        /* Assign a unique id to the connection */
+        ctx.id = g_unique_id++;
+
+        /* Get the client socket */
         ctx.client = thread->fd;
     punlock();