patch from Dominik Kubla <dominik.kubla@uni-mainz.de>

diff --git a/source/profile/profile.c b/source/profile/profile.c
index 72954f90c9f50b64462661d67e920d69e09b3ed7..c2d9b4ce89ed2a03069c0a7c2d51031aa27689de 100644 (file)
--- a/source/profile/profile.c
+++ b/source/profile/profile.c
@@ -23,10 +23,7 @@
 #include "includes.h"
 
 #ifdef WITH_PROFILE
-
-#ifndef HAVE_SYSV_IPC
-#error "You must have SYSV shared memory to compile in the profiling code"
-#endif
+#include <sys/shm.h>
 
 extern int DEBUGLEVEL;
 

diff --git a/source/smbd/connection.c b/source/smbd/connection.c
index aa49f8cf7cf3527e03ef7b1a019436944a64ce4b..bc014c300d625def39a44a3822942138bce5d481 100644 (file)
--- a/source/smbd/connection.c
+++ b/source/smbd/connection.c
@@ -340,7 +340,7 @@ static void utmp_yield(pid_t pid, const connection_struct *conn)
        }
 }
 
-static void utmp_claim(const struct connect_record *crec, const connection_struct *conn)
+static void utmp_claim(const struct connections_data *crec, const connection_struct *conn)
 {
        struct utmp u;
 
@@ -354,8 +354,8 @@ static void utmp_claim(const struct connect_record *crec, const connection_struc
                return;
        }
 
-       DEBUG(2,("utmp_claim: conn: user:%s cnum:%d i:%d\n",
-         conn->user, conn->cnum, i));
+       DEBUG(2,("utmp_claim: conn: user:%s cnum:%d\n",
+         conn->user, conn->cnum));
        DEBUG(2,("utmp_claim: crec: pid:%d, cnum:%d name:%s addr:%s mach:%s DNS:%s\n",
          crec->pid, crec->cnum, crec->name, crec->addr, crec->machine, client_name()));