[SCM] Samba Shared Repository - branch v4-18-test updated
Jule Anger
janger at samba.org
Mon Jun 19 08:14:01 UTC 2023
The branch, v4-18-test has been updated
via c7e3c042fbc smbcacls/smbcquotas: check for valid UNC path
from c4968128b7f smbclient: Fix fd leak with "showacls;ls"
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-18-test
- Log -----------------------------------------------------------------
commit c7e3c042fbc56824f66652af7c0580276f5144e7
Author: Björn Jacke <bj at sernet.de>
Date: Tue Jan 10 12:25:35 2023 +0100
smbcacls/smbcquotas: check for valid UNC path
we used to strip the first two characters of the path and used that.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=2312
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Jun 6 09:33:47 UTC 2023 on atb-devel-224
(cherry picked from commit fcedf5514b121914483bbc0ffe77580929093ac6)
Autobuild-User(v4-18-test): Jule Anger <janger at samba.org>
Autobuild-Date(v4-18-test): Mon Jun 19 08:13:18 UTC 2023 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/utils/smbcacls.c | 5 +++++
source3/utils/smbcquotas.c | 5 +++++
2 files changed, 10 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 71cd93b8bc7..6e6a5d932be 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1736,6 +1736,11 @@ int main(int argc, char *argv[])
return -1;
}
+ if (strncmp(path, "\\\\", 2) && strncmp(path, "//", 2)) {
+ printf("Invalid argument: %s\n", path);
+ return -1;
+ }
+
if(!poptPeekArg(pc)) {
poptPrintUsage(pc, stderr, 0);
return -1;
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 748334a04a6..ce8ca2fafd0 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -760,6 +760,11 @@ int main(int argc, char *argv[])
exit(EXIT_PARSE_ERROR);
}
+ if (strncmp(path, "\\\\", 2) && strncmp(path, "//", 2)) {
+ printf("Invalid argument: %s\n", path);
+ return -1;
+ }
+
poptFreeContext(pc);
samba_cmdline_burn(argc, argv);
--
Samba Shared Repository
More information about the samba-cvs
mailing list