sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

smbspool: Improve URI handling code

Browse Source 
This also checks that the URI given via the environment variables
starts with smb://

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Feb 20 21:46:38 CET 2018 on sn-devel-144
This commit is contained in:
Andreas Schneider 2018-01-05 10:50:57 +01:00 committed by Andreas Schneider
parent 7573b2a960
commit a6eac8f649
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source3/client/smbspool.c
View File

@ -100,6 +100,8 @@ main(int argc, /* I - Number of command-line arguments */
const char *dev_uri;
const char *config_file = NULL;
TALLOC_CTX *frame = talloc_stackframe();
int cmp;
int len;
if (argc == 1) {
/*
@ -153,20 +155,25 @@ main(int argc, /* I - Number of command-line arguments */
}
/*
* Find the URI...
*/
* Find the URI ...
*/
dev_uri = getenv("DEVICE_URI");
if (dev_uri) {
strncpy(uri, dev_uri, sizeof(uri) - 1);
} else if (strncmp(argv[1], "smb://", 6) == 0) {
strncpy(uri, argv[1], sizeof(uri) - 1);
} else {
fputs("ERROR: No device URI found in DEVICE_URI environment variable or arg1 !\n", stderr);
goto done;
if (dev_uri == NULL || strlen(dev_uri) == 0) {
dev_uri = argv[1];
}
uri[sizeof(uri) - 1] = '\0';
cmp = strncmp(dev_uri, "smb://", 6);
if (cmp != 0) {
fprintf(stderr,
"ERROR: No valid device URI has been specified\n");
goto done;
}
len = snprintf(uri, sizeof(uri), "%s", dev_uri);
if (len >= sizeof(uri)) {
fprintf(stderr,
"ERROR: The URI is too long.\n");
goto done;
}
/*
* Extract the destination from the URI...