From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 4 Sep 2007 00:21:51 +0000 (+1000)
Subject: change server_id.vnn to server_id.pnn
X-Git-Tag: tevent-0.9.20~348^2~2430^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f693bbcbd44ca56f4267ff3cce5c54dee7c39c1;p=thirdparty%2Fsamba.git

change server_id.vnn to server_id.pnn

(This used to be ctdb commit 26f2ee2b754a9271454412f05111a19b3013c6eb)
---

diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h
index 64534e81a52..34c8d0877c5 100644
--- a/ctdb/include/ctdb.h
+++ b/ctdb/include/ctdb.h
@@ -418,7 +418,7 @@ enum ctdb_server_id_type { SERVER_TYPE_SAMBA=1 };
 
 struct ctdb_server_id {
 	enum ctdb_server_id_type type;
-	uint32_t vnn;
+	uint32_t pnn;
 	uint32_t server_id;
 };
 
diff --git a/ctdb/server/ctdb_serverids.c b/ctdb/server/ctdb_serverids.c
index 8c8c9308744..ca9be264af9 100644
--- a/ctdb/server/ctdb_serverids.c
+++ b/ctdb/server/ctdb_serverids.c
@@ -27,7 +27,7 @@ static uint32_t *get_server_id_key(struct ctdb_server_id *server_id)
 	static uint32_t key[SERVER_ID_KEY_SIZE];
 
 	key[0] = server_id->type;
-	key[1] = server_id->vnn;
+	key[1] = server_id->pnn;
 	key[2] = server_id->server_id;
 
 	return &key[0];
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 9edad983cf9..fd944f039db 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -390,7 +390,7 @@ static int regsrvid(struct ctdb_context *ctdb, int argc, const char **argv)
 		usage();
 	}
 
-	server_id.vnn       = strtoul(argv[0], NULL, 0);
+	server_id.pnn       = strtoul(argv[0], NULL, 0);
 	server_id.type      = strtoul(argv[1], NULL, 0);
 	server_id.server_id = strtoul(argv[2], NULL, 0);
 
@@ -414,7 +414,7 @@ static int unregsrvid(struct ctdb_context *ctdb, int argc, const char **argv)
 		usage();
 	}
 
-	server_id.vnn       = strtoul(argv[0], NULL, 0);
+	server_id.pnn       = strtoul(argv[0], NULL, 0);
 	server_id.type      = strtoul(argv[1], NULL, 0);
 	server_id.server_id = strtoul(argv[2], NULL, 0);
 
@@ -439,7 +439,7 @@ static int chksrvid(struct ctdb_context *ctdb, int argc, const char **argv)
 		usage();
 	}
 
-	server_id.vnn       = strtoul(argv[0], NULL, 0);
+	server_id.pnn       = strtoul(argv[0], NULL, 0);
 	server_id.type      = strtoul(argv[1], NULL, 0);
 	server_id.server_id = strtoul(argv[2], NULL, 0);
 
@@ -450,9 +450,9 @@ static int chksrvid(struct ctdb_context *ctdb, int argc, const char **argv)
 	}
 
 	if (status) {
-		printf("Server id %d:%d:%d EXISTS\n", server_id.vnn, server_id.type, server_id.server_id);
+		printf("Server id %d:%d:%d EXISTS\n", server_id.pnn, server_id.type, server_id.server_id);
 	} else {
-		printf("Server id %d:%d:%d does NOT exist\n", server_id.vnn, server_id.type, server_id.server_id);
+		printf("Server id %d:%d:%d does NOT exist\n", server_id.pnn, server_id.type, server_id.server_id);
 	}
 	return 0;
 }
@@ -473,7 +473,7 @@ static int getsrvids(struct ctdb_context *ctdb, int argc, const char **argv)
 
 	for (i=0; i<server_ids->num; i++) {
 		printf("Server id %d:%d:%d\n", 
-			server_ids->server_ids[i].vnn, 
+			server_ids->server_ids[i].pnn, 
 			server_ids->server_ids[i].type, 
 			server_ids->server_ids[i].server_id); 
 	}