The branch, master has been updated
via 7d271450f71 ctdb: Remove <file> parameter from pfetch usage info
via 81de8f06414 ctdb: Fix hex to int conversion in h2i
from 90de1431b91 rpcclient: Use dom_sid_str_buf
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7d271450f71a168898482d8c8a0f1f6bbf875804
Author: Christof Schmitt <[email protected]>
Date: Mon May 22 16:28:40 2017 -0700
ctdb: Remove <file> parameter from pfetch usage info
The code does not implement saving the record data to a file, so update
the usage info accordingly.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Mon Dec 10 05:02:13 CET 2018 on sn-devel-144
commit 81de8f0641484729e4fbfc055a1a52dcd15cd32e
Author: Christof Schmitt <[email protected]>
Date: Mon May 22 12:31:35 2017 -0700
ctdb: Fix hex to int conversion in h2i
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/tools/ctdb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index f96167f9366..b598a866c9b 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -587,7 +587,7 @@ static int h2i(char h)
return h - 'a' + 10;
}
if (h >= 'A' && h <= 'F') {
- return h - 'f' + 10;
+ return h - 'A' + 10;
}
return h - '0';
}
@@ -4804,7 +4804,7 @@ static int control_pfetch(TALLOC_CTX *mem_ctx, struct
ctdb_context *ctdb,
TDB_DATA key, data;
int ret;
- if (argc < 2 || argc > 3) {
+ if (argc != 2) {
usage("pfetch");
}
@@ -5973,7 +5973,7 @@ static const struct ctdb_cmd {
{ "setdbsticky", control_setdbsticky, false, true,
"enable sticky records", "<dbname|dbid>"},
{ "pfetch", control_pfetch, false, false,
- "fetch record from persistent database", "<dbname|dbid> <key>
[<file>]" },
+ "fetch record from persistent database", "<dbname|dbid> <key>"
},
{ "pstore", control_pstore, false, false,
"write record to persistent database", "<dbname|dbid> <key>
<value>" },
{ "pdelete", control_pdelete, false, false,
--
Samba Shared Repository
