BUG: https://bugzilla.samba.org/show_bug.cgi?id=13577
Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit
b2399b6994c89404f245e1a97ba1c1cf13d7fc86)
uint8_t *provision_bin_data = NULL;
size_t provision_bin_data_size = 0;
uint32_t options = NETSETUP_PROVISION_ONLINE_CALLER;
uint8_t *provision_bin_data = NULL;
size_t provision_bin_data_size = 0;
uint32_t options = NETSETUP_PROVISION_ONLINE_CALLER;
- const char *loadfile = NULL;
const char *windows_path = NULL;
int i;
const char *windows_path = NULL;
int i;
for (i = 0; i < argc; i++) {
if (strnequal(argv[i], "loadfile", strlen("loadfile"))) {
for (i = 0; i < argc; i++) {
if (strnequal(argv[i], "loadfile", strlen("loadfile"))) {
+ const char *loadfile = NULL;
+
loadfile = get_string_param(argv[i]);
if (loadfile == NULL) {
return -1;
}
loadfile = get_string_param(argv[i]);
if (loadfile == NULL) {
return -1;
}
+
+ provision_bin_data =
+ (uint8_t *)file_load(loadfile,
+ &provision_bin_data_size,
+ 0,
+ c);
+ if (provision_bin_data == NULL) {
+ d_printf("Failed to read loadfile: %s\n",
+ loadfile);
+ return -1;
+ }
}
#if 0
if (strnequal(argv[i], "localos", strlen("localos"))) {
}
#if 0
if (strnequal(argv[i], "localos", strlen("localos"))) {
- provision_bin_data =
- (uint8_t *)file_load(loadfile, &provision_bin_data_size, 0, c);
- if (provision_bin_data == NULL) {
- d_printf("Failed to read loadfile: %s\n", loadfile);
+ if (provision_bin_data == NULL || provision_bin_data_size == 0) {
+ d_printf("Please provide provision data\n");
return -1;
}
if (provision_bin_data_size > UINT32_MAX) {
return -1;
}
if (provision_bin_data_size > UINT32_MAX) {