summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/profile/profile.c5
-rw-r--r--source3/smbd/connection.c6
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 72954f90c9..c2d9b4ce89 100644
--- a/source3/profile/profile.c
+++ b/source3/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/source3/smbd/connection.c b/source3/smbd/connection.c
index aa49f8cf7c..bc014c300d 100644
--- a/source3/smbd/connection.c
+++ b/source3/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()));