The branch, master has been updated
via edd18f7 messages_dgm: Fix an incorrect cast
via cfca46a messages_dgm: No includes.h necessary
from ae43867 s4-torture: trying to make clusapi resource online/offline
testing a bit more robust
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit edd18f7a1dc7df7a1c4cbefd0c2b460a82c6cb17
Author: Volker Lendecke <v...@samba.org>
Date: Wed Sep 30 00:30:49 2015 +0200
messages_dgm: Fix an incorrect cast
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Wed Sep 30 17:36:32 CEST 2015 on sn-devel-104
commit cfca46a56568b8a83c7b2657821fd3c86918bba1
Author: Volker Lendecke <v...@samba.org>
Date: Wed Sep 30 00:30:28 2015 +0200
messages_dgm: No includes.h necessary
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/messages_dgm.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index 1602caf..944602a 100644
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -17,7 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "includes.h"
+#include "replace.h"
+#include "system/network.h"
+#include "system/filesys.h"
+#include <dirent.h>
#include "lib/util/data_blob.h"
#include "lib/util/debug.h"
#include "lib/unix_msg/unix_msg.h"
@@ -66,7 +69,7 @@ static int messaging_dgm_lockfile_create(struct
messaging_dgm_context *ctx,
pid_t pid, int *plockfile_fd,
uint64_t unique)
{
- fstring buf;
+ char buf[64];
int lockfile_fd;
struct sun_path_buf lockfile_name;
struct flock lck;
@@ -74,7 +77,7 @@ static int messaging_dgm_lockfile_create(struct
messaging_dgm_context *ctx,
ssize_t written;
ret = snprintf(lockfile_name.buf, sizeof(lockfile_name.buf),
- "%s/%u", ctx->lockfile_dir.buf, (int)pid);
+ "%s/%u", ctx->lockfile_dir.buf, (unsigned)pid);
if (ret >= sizeof(lockfile_name.buf)) {
return ENAMETOOLONG;
}
--
Samba Shared Repository
