r23410: Merge the core of the cluster code.

I'm 100% certain I've forgotten to merge something, but the main code
should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and
messages_ctdbd.c.

There should be no changes to the non-cluster case, it does survive make
test on my laptop.

It survives some very basic tests with ctdbd enables, I did not do the
full test suite for clusters yet.

Phew...

Volker
(This used to be commit 15553d6327a3aecdd2b0b94a3656d04bf4106323)

1 files changed, 5 insertions, 1 deletions

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 25a6a2c4c82..708c184475b 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -453,7 +453,7 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
 		      const char *str)
 {
 	char *b, *p, *s, *r, *a_string;
-	fstring pidstr;
+	fstring pidstr, vnnstr;
 	struct passwd *pass;
 	const char *local_machine_name = get_local_machine_name();
 
@@ -552,6 +552,10 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
 		case '(':
 			a_string = realloc_expand_longvar( a_string, p );
 			break;
+		case 'V' :
+			slprintf(vnnstr,sizeof(vnnstr)-1, "%u", get_my_vnn());
+			a_string = realloc_string_sub(a_string, "%V", vnnstr);
+			break;
 		default: 
 			break;
 		}