summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-07-24 09:32:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:56 -0500
commit93c56c712cd1a4cedf77a017cdc7474dfbb9ccbf (patch)
treed03f9bb35a2fa87b214eeec5c44a2693d709ac56
parentefddd9c7533447d6df304701b02c08c562c9ad27 (diff)
downloadsamba-93c56c712cd1a4cedf77a017cdc7474dfbb9ccbf.tar.gz
samba-93c56c712cd1a4cedf77a017cdc7474dfbb9ccbf.tar.bz2
samba-93c56c712cd1a4cedf77a017cdc7474dfbb9ccbf.zip
r24021: use MSG_BROADCAST_PID_STR as value for broadcast messages
to fix the cluster case vl: please check, if this works with clustering = no metze (This used to be commit 9d4104b8d5773537f2271f7be1439f1da1e0bf42)
-rw-r--r--source3/include/messages.h6
-rw-r--r--source3/utils/smbcontrol.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/source3/include/messages.h b/source3/include/messages.h
index ddf0aa9172..7818446a09 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -148,7 +148,11 @@ struct server_id {
#endif
};
-
+#ifdef CLUSTER_SUPPORT
+#define MSG_BROADCAST_PID_STR "0:0"
+#else
+#define MSG_BROADCAST_PID_STR "0"
+#endif
struct messaging_context;
struct messaging_rec;
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index e4db2cd4f6..e3358b1eff 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1148,7 +1148,7 @@ static struct server_id parse_dest(const char *dest)
/* Zero is a special return value for broadcast smbd */
if (strequal(dest, "smbd")) {
- return interpret_pid("0");
+ return interpret_pid(MSG_BROADCAST_PID_STR);
}
/* Try self - useful for testing */