Import wiredtiger-wiredtiger-2.6.0-19-g35cc116.tar.gz from wiredtiger branch mongodb-3.2

11 files changed, 42 insertions, 43 deletions

diff --git a/src/third_party/wiredtiger/src/utilities/util_backup.c b/src/third_party/wiredtiger/src/utilities/util_backup.c
index cad91591a61..0eca4b3103a 100644
--- a/src/third_party/wiredtiger/src/utilities/util_backup.c
+++ b/src/third_party/wiredtiger/src/utilities/util_backup.c
@@ -97,10 +97,8 @@ util_backup(WT_SESSION *session, int argc, char *argv[])
 		goto err;
 	}
 
-err:	if (config != NULL)
-		free(config);
-	if (cbuf != NULL)
-		free(cbuf);
+err:	free(config);
+	free(cbuf);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_compact.c b/src/third_party/wiredtiger/src/utilities/util_compact.c
index bdfb2cd55d7..153d2d11a6d 100644
--- a/src/third_party/wiredtiger/src/utilities/util_compact.c
+++ b/src/third_party/wiredtiger/src/utilities/util_compact.c
@@ -43,8 +43,7 @@ util_compact(WT_SESSION *session, int argc, char *argv[])
 err:		ret = 1;
 	}
 
-	if (uri != NULL)
-		free(uri);
+	free(uri);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_drop.c b/src/third_party/wiredtiger/src/utilities/util_drop.c
index 722ffc31738..9717b102857 100644
--- a/src/third_party/wiredtiger/src/utilities/util_drop.c
+++ b/src/third_party/wiredtiger/src/utilities/util_drop.c
@@ -35,8 +35,7 @@ util_drop(WT_SESSION *session, int argc, char *argv[])
 
 	ret = session->drop(session, name, "force");
 
-	if (name != NULL)
-		free(name);
+	free(name);
 	return (ret);
 }
 
diff --git a/src/third_party/wiredtiger/src/utilities/util_dump.c b/src/third_party/wiredtiger/src/utilities/util_dump.c
index b02186cee75..0ae201ea21e 100644
--- a/src/third_party/wiredtiger/src/utilities/util_dump.c
+++ b/src/third_party/wiredtiger/src/utilities/util_dump.c
@@ -84,10 +84,9 @@ util_dump(WT_SESSION *session, int argc, char *argv[])
 		if (json && i > 0)
 			if ((ret = dump_json_separator(session)) != 0)
 				goto err;
-		if (name != NULL) {
-			free(name);
-			name = NULL;
-		}
+		free(name);
+		name = NULL;
+
 		if ((name = util_name(session, argv[i], "table")) == NULL)
 			goto err;
 
@@ -131,10 +130,8 @@ util_dump(WT_SESSION *session, int argc, char *argv[])
 err:		ret = 1;
 	}
 
-	if (config != NULL)
-		free(config);
-	if (name != NULL)
-		free(name);
+	free(config);
+	free(name);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_list.c b/src/third_party/wiredtiger/src/utilities/util_list.c
index 270f06666a2..1888c7d967b 100644
--- a/src/third_party/wiredtiger/src/utilities/util_list.c
+++ b/src/third_party/wiredtiger/src/utilities/util_list.c
@@ -49,8 +49,7 @@ util_list(WT_SESSION *session, int argc, char *argv[])
 
 	ret = list_print(session, name, cflag, vflag);
 
-	if (name != NULL)
-		free(name);
+	free(name);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_load_json.c b/src/third_party/wiredtiger/src/utilities/util_load_json.c
index f498b821073..2604348e56b 100644
--- a/src/third_party/wiredtiger/src/utilities/util_load_json.c
+++ b/src/third_party/wiredtiger/src/utilities/util_load_json.c
@@ -196,8 +196,7 @@ json_strdup(WT_SESSION *session, JSON_INPUT_STATE *ins, char **resultp)
 	if (0) {
 err:		if (ret == 0)
 			ret = EINVAL;
-		if (result != NULL)
-			free(result);
+		free(result);
 		*resultp = NULL;
 	}
 	return (ret);
@@ -433,8 +432,7 @@ err:		if (ret == 0)
 			ret = EINVAL;
 	}
 	config_list_free(&cl);
-	if (tableuri != NULL)
-		free(tableuri);
+	free(tableuri);
 	return (ret);
 }
 
@@ -574,8 +572,7 @@ util_load_json(WT_SESSION *session, const char *filename, uint32_t flags)
 	if ((ret = json_top_level(session, &instate, flags)) != 0)
 		goto err;
 
-err:	if (instate.line.mem != NULL)
-		free(instate.line.mem);
+err:	free(instate.line.mem);
 	free(instate.kvraw);
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_main.c b/src/third_party/wiredtiger/src/utilities/util_main.c
index 79d768f5752..348460e95e0 100644
--- a/src/third_party/wiredtiger/src/utilities/util_main.c
+++ b/src/third_party/wiredtiger/src/utilities/util_main.c
@@ -11,7 +11,7 @@
 const char *home = ".";				/* Home directory */
 const char *progname;				/* Program name */
 						/* Global arguments */
-const char *usage_prefix = "[-Vv] [-R] [-C config] [-h home]";
+const char *usage_prefix = "[-LRVv] [-C config] [-E secretkey] [-h home]";
 int verbose;					/* Verbose flag */
 
 static const char *command;			/* Command name */
@@ -31,11 +31,12 @@ main(int argc, char *argv[])
 	size_t len;
 	int ch, major_v, minor_v, tret, (*func)(WT_SESSION *, int, char *[]);
 	int logoff, recover;
-	char *p;
-	const char *cmd_config, *config, *rec_config;
+	char *p, *secretkey;
+	const char *cmd_config, *config, *p1, *p2, *p3, *rec_config;
 
 	conn = NULL;
 	p = NULL;
+	secretkey = NULL;
 
 	/* Get the program name. */
 	if ((progname = strrchr(argv[0], '/')) == NULL)
@@ -57,7 +58,7 @@ main(int argc, char *argv[])
 		return (EXIT_FAILURE);
 	}
 
-	cmd_config = config = NULL;
+	cmd_config = config = secretkey = NULL;
 	/*
 	 * We default to returning an error if recovery needs to be run.
 	 * Generally we expect this to be run after a clean shutdown.
@@ -67,11 +68,18 @@ main(int argc, char *argv[])
 	rec_config = REC_ERROR;
 	logoff = recover = 0;
 	/* Check for standard options. */
-	while ((ch = __wt_getopt(progname, argc, argv, "C:h:LRVv")) != EOF)
+	while ((ch = __wt_getopt(progname, argc, argv, "C:E:h:LRVv")) != EOF)
 		switch (ch) {
 		case 'C':			/* wiredtiger_open config */
 			cmd_config = __wt_optarg;
 			break;
+		case 'E':			/* secret key */
+			if ((secretkey = strdup(__wt_optarg)) == NULL) {
+				ret = util_err(NULL, errno, NULL);
+				goto err;
+			}
+			memset(__wt_optarg, 0, strlen(__wt_optarg));
+			break;
 		case 'h':			/* home directory */
 			home = __wt_optarg;
 			break;
@@ -182,18 +190,25 @@ main(int argc, char *argv[])
 
 	/* Build the configuration string. */
 	len = 10;					/* some slop */
+	p1 = p2 = p3 = "";
 	if (config != NULL)
 		len += strlen(config);
 	if (cmd_config != NULL)
 		len += strlen(cmd_config);
+	if (secretkey != NULL) {
+		len += strlen(secretkey) + 30;
+		p1 = ",encryption=(secretkey=";
+		p2 = secretkey;
+		p3 = ")";
+	}
 	len += strlen(rec_config);
 	if ((p = malloc(len)) == NULL) {
 		ret = util_err(NULL, errno, NULL);
 		goto err;
 	}
-	(void)snprintf(p, len, "%s,%s,%s",
+	(void)snprintf(p, len, "%s,%s,%s%s%s%s",
 	    config == NULL ? "" : config,
-	    cmd_config == NULL ? "" : cmd_config, rec_config);
+	    cmd_config == NULL ? "" : cmd_config, rec_config, p1, p2, p3);
 	config = p;
 
 	/* Open the database and a session. */
@@ -215,8 +230,8 @@ main(int argc, char *argv[])
 err:	if (conn != NULL && (tret = conn->close(conn, NULL)) != 0 && ret == 0)
 		ret = tret;
 
-	if (p != NULL)
-		free(p);
+	free(p);
+	free(secretkey);
 
 	return (ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_rename.c b/src/third_party/wiredtiger/src/utilities/util_rename.c
index 971e1376f26..29347690ccc 100644
--- a/src/third_party/wiredtiger/src/utilities/util_rename.c
+++ b/src/third_party/wiredtiger/src/utilities/util_rename.c
@@ -44,8 +44,7 @@ util_rename(WT_SESSION *session, int argc, char *argv[])
 err:		ret = 1;
 	}
 
-	if (uri != NULL)
-		free(uri);
+	free(uri);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_salvage.c b/src/third_party/wiredtiger/src/utilities/util_salvage.c
index ffe413da732..e791d2f1dda 100644
--- a/src/third_party/wiredtiger/src/utilities/util_salvage.c
+++ b/src/third_party/wiredtiger/src/utilities/util_salvage.c
@@ -52,8 +52,7 @@ util_salvage(WT_SESSION *session, int argc, char *argv[])
 err:		ret = 1;
 	}
 
-	if (name != NULL)
-		free(name);
+	free(name);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_upgrade.c b/src/third_party/wiredtiger/src/utilities/util_upgrade.c
index 2f15069b6fc..0f2e655d1dd 100644
--- a/src/third_party/wiredtiger/src/utilities/util_upgrade.c
+++ b/src/third_party/wiredtiger/src/utilities/util_upgrade.c
@@ -47,8 +47,7 @@ util_upgrade(WT_SESSION *session, int argc, char *argv[])
 err:		ret = 1;
 	}
 
-	if (name != NULL)
-		free(name);
+	free(name);
 
 	return (ret);
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_verify.c b/src/third_party/wiredtiger/src/utilities/util_verify.c
index 20a7060f729..9d95a6c9022 100644
--- a/src/third_party/wiredtiger/src/utilities/util_verify.c
+++ b/src/third_party/wiredtiger/src/utilities/util_verify.c
@@ -95,10 +95,8 @@ util_verify(WT_SESSION *session, int argc, char *argv[])
 err:		ret = 1;
 	}
 
-	if (config != NULL)
-		free(config);
-	if (name != NULL)
-		free(name);
+	free(config);
+	free(name);
 
 	return (ret);
 }