[PATCH] Fix build on FreeBSD10

[Volker Lendecke]

Hi!

Attached find 2 patches from the build on FreeBSD10 and one
warning fix.

Please review & push!

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 756eef9015ef73d894a7c4c1203ce0d21745bd28 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 24 Jan 2014 10:08:41 +0100
Subject: [PATCH 1/3] smbd: Fix format errors on FreeBSD10

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/lib/sysquotas_nfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/sysquotas_nfs.c b/source3/lib/sysquotas_nfs.c
index 63f114b..2b0e494 100644
--- a/source3/lib/sysquotas_nfs.c
+++ b/source3/lib/sysquotas_nfs.c
@@ -155,7 +155,7 @@ int sys_get_nfs_quota(const char *path, const char *bdev,
 
 	DEBUG(10, ("sys_get_nfs_quotas: Asking for quota of path '%s' on "
 		   "host '%s', rpcprog '%i', rpcvers '%i', network '%s'\n",
-		    host, testpath+1, RQUOTAPROG, RQUOTAVERS, "udp"));
+		   host, testpath+1, (int)RQUOTAPROG, (int)RQUOTAVERS, "udp"));
 
 	clnt = clnt_create(host, RQUOTAPROG, RQUOTAVERS, "udp");
 	if (clnt == NULL) {
-- 
1.7.9.5


From 06d1c692d6c2a804e2159b88fdc6f91b798eece2 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 24 Jan 2014 10:09:29 +0100
Subject: [PATCH 2/3] heimdal: Fix a format error on FreeBSD10

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source4/heimdal/lib/roken/rkpty.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source4/heimdal/lib/roken/rkpty.c b/source4/heimdal/lib/roken/rkpty.c
index f2c62f2..a7b7825 100644
--- a/source4/heimdal/lib/roken/rkpty.c
+++ b/source4/heimdal/lib/roken/rkpty.c
@@ -233,7 +233,7 @@ eval_parent(pid_t pid)
 		     c->str, c->lineno);
 	    else if (alarmset)
 		errx(1, "got a signal %d waiting for %s (line %u)",
-		     alarmset, c->str, c->lineno);
+		     (int)alarmset, c->str, c->lineno);
 	    if (sret <= 0)
 		errx(1, "end command while waiting for %s (line %u)",
 		     c->str, c->lineno);
-- 
1.7.9.5


From c80e01597d0065c2d46ae8c05e15b48afd5871e0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 24 Jan 2014 10:09:57 +0100
Subject: [PATCH 3/3] vfs_time_audit: Make durable functions static

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/modules/vfs_time_audit.c |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index fd9eb52..a70c8ca 100644
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -2275,10 +2275,10 @@ static int smb_time_audit_set_offline(struct vfs_handle_struct *handle,
 	return result;
 }
 
-NTSTATUS smb_time_audit_durable_cookie(struct vfs_handle_struct *handle,
-				       struct files_struct *fsp,
-				       TALLOC_CTX *mem_ctx,
-				       DATA_BLOB *cookie)
+static NTSTATUS smb_time_audit_durable_cookie(struct vfs_handle_struct *handle,
+					      struct files_struct *fsp,
+					      TALLOC_CTX *mem_ctx,
+					      DATA_BLOB *cookie)
 {
 	NTSTATUS result;
 	struct timespec ts1,ts2;
@@ -2296,11 +2296,11 @@ NTSTATUS smb_time_audit_durable_cookie(struct vfs_handle_struct *handle,
 	return result;
 }
 
-NTSTATUS smb_time_audit_durable_disconnect(struct vfs_handle_struct *handle,
-					   struct files_struct *fsp,
-					   const DATA_BLOB old_cookie,
-					   TALLOC_CTX *mem_ctx,
-					   DATA_BLOB *new_cookie)
+static NTSTATUS smb_time_audit_durable_disconnect(struct vfs_handle_struct *handle,
+						  struct files_struct *fsp,
+						  const DATA_BLOB old_cookie,
+						  TALLOC_CTX *mem_ctx,
+						  DATA_BLOB *new_cookie)
 {
 	NTSTATUS result;
 	struct timespec ts1,ts2;
@@ -2319,13 +2319,13 @@ NTSTATUS smb_time_audit_durable_disconnect(struct vfs_handle_struct *handle,
 	return result;
 }
 
-NTSTATUS smb_time_audit_durable_reconnect(struct vfs_handle_struct *handle,
-					  struct smb_request *smb1req,
-					  struct smbXsrv_open *op,
-					  const DATA_BLOB old_cookie,
-					  TALLOC_CTX *mem_ctx,
-					  struct files_struct **fsp,
-					  DATA_BLOB *new_cookie)
+static NTSTATUS smb_time_audit_durable_reconnect(struct vfs_handle_struct *handle,
+						 struct smb_request *smb1req,
+						 struct smbXsrv_open *op,
+						 const DATA_BLOB old_cookie,
+						 TALLOC_CTX *mem_ctx,
+						 struct files_struct **fsp,
+						 DATA_BLOB *new_cookie)
 {
 	NTSTATUS result;
 	struct timespec ts1,ts2;
-- 
1.7.9.5