From e8dbf2889f0f5c6d213e92cbfd97b6a874aedb03 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 19 Jul 2012 16:36:18 -0700
Subject: Move everything to use the common pidfile functions.

The extra code in source3/lib/pidfile.c is no longer needed.
---
 source3/smbd/server.c      | 3 ++-
 source3/smbd/server_exit.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ee1eafb0dc..63edf0020a 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -43,6 +43,7 @@
 #include "lib/param/param.h"
 #include "lib/background.h"
 #include "lib/conn_tdb.h"
+#include "../lib/util/pidfile.h"
 
 struct smbd_open_socket;
 struct smbd_child_pid;
@@ -1285,7 +1286,7 @@ extern void build_options(bool screen);
 		mkdir(lp_piddir(), 0755);
 
 	if (is_daemon)
-		pidfile_create_s3("smbd");
+		pidfile_create(lp_piddir(), "smbd");
 
 	status = reinit_after_fork(msg_ctx,
 				   ev_ctx,
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index ab64b9c8a9..517d4c27da 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -44,6 +44,7 @@
 #include "printing.h"
 #include "serverid.h"
 #include "messages.h"
+#include "../lib/util/pidfile.h"
 
 static struct files_struct *log_writeable_file_fn(
 	struct files_struct *fsp, void *private_data)
@@ -216,7 +217,7 @@ static void exit_server_common(enum server_exit_reason how,
 		DEBUG(3,("Server exit (%s)\n",
 			(reason ? reason : "normal exit")));
 		if (am_parent) {
-			pidfile_unlink_s3("smbd");
+			pidfile_unlink(lp_piddir(), "smbd");
 		}
 		gencache_stabilize();
 	}
-- 
cgit