The branch, master has been updated
via 2458752 ctdb-daemon: Use sock_clean() to remove stale sockets
via a0c2295 ctdb-common: Refactor code to remove a stale socket
via 574914f ctdb-locking: Remove unnecessary global variable
from adbdce7 Modify smbspool_krb5_wrapper to just fall through to
smbspool if AUTH_INFO_REQUIRED is not set or is not "negotiate".
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2458752fd06b3ebf760455208a524e335b9d48ba
Author: Amitay Isaacs <[email protected]>
Date: Mon Jan 30 14:34:12 2017 +1100
ctdb-daemon: Use sock_clean() to remove stale sockets
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Fri Feb 17 14:45:10 CET 2017 on sn-devel-144
commit a0c22958c5078bde55775a45a3bab52ceffe3980
Author: Amitay Isaacs <[email protected]>
Date: Mon Jan 30 14:30:51 2017 +1100
ctdb-common: Refactor code to remove a stale socket
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
commit 574914f8d45e9ec9f9c2c8a9c83e338c4394c85c
Author: Amitay Isaacs <[email protected]>
Date: Wed Feb 15 11:56:01 2017 +1100
ctdb-locking: Remove unnecessary global variable
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/sock_io.c | 15 +++++++++++++++
ctdb/common/sock_io.h | 1 +
ctdb/server/ctdb_daemon.c | 10 ++--------
ctdb/server/ctdb_lock_helper.c | 13 +++++--------
ctdb/server/eventscript.c | 7 +------
5 files changed, 24 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/sock_io.c b/ctdb/common/sock_io.c
index 7431eec..3f7138f 100644
--- a/ctdb/common/sock_io.c
+++ b/ctdb/common/sock_io.c
@@ -31,6 +31,21 @@
#include "common/logging.h"
#include "common/sock_io.h"
+bool sock_clean(const char *sockpath)
+{
+ int ret;
+
+ ret = unlink(sockpath);
+ if (ret == 0) {
+ D_WARNING("Removed stale socket %s\n", sockpath);
+ } else if (errno != ENOENT) {
+ D_ERR("Failed to remove stale socket %s\n", sockpath);
+ return false;
+ }
+
+ return true;
+}
+
int sock_connect(const char *sockpath)
{
struct sockaddr_un addr;
diff --git a/ctdb/common/sock_io.h b/ctdb/common/sock_io.h
index cbb83a8..8b6e4eb 100644
--- a/ctdb/common/sock_io.h
+++ b/ctdb/common/sock_io.h
@@ -25,6 +25,7 @@ typedef void (*sock_queue_callback_fn_t)(uint8_t *buf, size_t
buflen,
struct sock_queue;
+bool sock_clean(const char *sockpath);
int sock_connect(const char *sockpath);
struct sock_queue *sock_queue_setup(TALLOC_CTX *mem_ctx,
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index d0d86a0..91a86c3 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -45,6 +45,7 @@
#include "common/common.h"
#include "common/logging.h"
#include "common/pidfile.h"
+#include "common/sock_io.h"
struct ctdb_client_pid_list {
struct ctdb_client_pid_list *next, *prev;
@@ -1007,14 +1008,7 @@ static int ux_socket_bind(struct ctdb_context *ctdb)
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, ctdb->daemon.name, sizeof(addr.sun_path)-1);
- /* Remove any old socket */
- ret = unlink(ctdb->daemon.name);
- if (ret == 0) {
- DEBUG(DEBUG_WARNING,
- ("Removed stale socket %s\n", ctdb->daemon.name));
- } else if (errno != ENOENT) {
- DEBUG(DEBUG_ERR,
- ("Failed to remove stale socket %s\n",
ctdb->daemon.name));
+ if (! sock_clean(ctdb->daemon.name)) {
return -1;
}
diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index 8b9f5aa..f918b73 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -33,7 +33,6 @@
#include "common/system.h"
-static char *progname = NULL;
static bool realtime = true;
struct lock_state {
@@ -77,7 +76,7 @@ static void send_result(int fd, char result)
}
-static void usage(void)
+static void usage(const char *progname)
{
fprintf(stderr, "\n");
fprintf(stderr, "Usage: %s <ctdbd-pid> <output-fd> RECORD <db-path>
<db-flags> <db-key>\n", progname);
@@ -276,10 +275,8 @@ int main(int argc, char *argv[])
reset_scheduler();
- progname = argv[0];
-
if (argc < 4) {
- usage();
+ usage(argv[0]);
exit(1);
}
@@ -306,7 +303,7 @@ int main(int argc, char *argv[])
fprintf(stderr,
"locking: Invalid number of arguments (%d)\n",
argc);
- usage();
+ usage(argv[0]);
exit(1);
}
result = lock_record(argv[4], argv[5], argv[6], &state);
@@ -316,14 +313,14 @@ int main(int argc, char *argv[])
fprintf(stderr,
"locking: Invalid number of arguments (%d)\n",
argc);
- usage();
+ usage(argv[0]);
exit(1);
}
result = lock_db(argv[4], argv[5], &state);
} else {
fprintf(stderr, "locking: Invalid lock-type '%s'\n", lock_type);
- usage();
+ usage(argv[0]);
exit(1);
}
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 22cd873..438fbbb 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -171,12 +171,7 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
ectx = ctdb->ectx;
- ret = unlink(ectx->socket);
- if (ret == 0) {
- D_WARNING("Removed stale eventd socket %s\n", ectx->socket);
- } else if (errno != ENOENT) {
- D_ERR("Failed to remove stale eventd socket %s\n",
- ectx->socket);
+ if (! sock_clean(ectx->socket)) {
return -1;
}
--
Samba Shared Repository
