summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-21cifs-utils: bump version number to 4.5cifs-utils-4.5Jeff Layton1-1/+1
Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-05-14mount.cifs: cosmetic alignment patchScott Lovenberg1-3/+3
Align CRED_ macro values to keep style consistent with last patch. Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
2010-05-14mount.cifs: clean up option parsingScott Lovenberg1-74/+189
Moved option string parsing to function parse_opt_token(char*). Main loop in parse_options(const char*, struct parsed_mount_info*) transplanted to a switch block. The parsing function folds common options to a single macro: 1.) 'unc','target', and 'path' -> 'OPT_UNC' 2.) 'dom*' and 'workg*' -> 'OPT_DOM' 3.) 'nobrl' and 'nolock' -> 'OPT_NO_LOCK' Kept 'fmask' and 'dmask' (OPT_FMASK, OPT_DMASK), which fall through to 'file_mode' and 'dir_mode' in the main loop. Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
2010-05-14mount.cifs: unitialized variable in cred parsing error pathSteve French1-4/+4
Signed-off-by: Steve French <smfrench@gmail.com> Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-05-11mount.cifs: turn into a multicall binary for smb2Steve French1-15/+68
mount.smb2 has different help (many fewer mount options) and different fsname, but otherwise can reuse all of the good work Jeff did on mount.cifs. This patch allow mount.cifs to detect if run as mount.smb2 (to display different help and fsname). Signed-off-by: Steve French <smfrench@gmail.com>
2010-05-11mount.cifs: removed magic number for max username in parse_optionsScott Lovenberg1-1/+5
Replaced max username in parse_options with the sum of its potential parts for "domain/user%password" formatted values. Note that forward slashes still expand to a double back slash in the parse_username function, though. Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
2010-05-02mount.cifs: strip leading delimiter off of prefixpath optionJeff Layton1-0/+5
...the kernel doesn't expect to see it and it causes a regression when mounting some UNCs. Reported-by: Ales Zelinka <azelinka@redhat.com> Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-05-02cifs-utils: bump version number to 4.4.1 for interim buildsJeff Layton1-1/+1
Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-28cifs-utils: bump version number to 4.4Jeff Layton1-1/+1
Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-28mount.cifs: fix parsing of password in parse_usernamecifs-utils-4.4Jeff Layton1-1/+2
Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-25mount.cifs: continued cleanup of open_cred_file and zero out bufferScott Lovenberg1-52/+78
The parsing for values has been moved to its own function and is a bit cleaner. Temporary buffers are zeroed out before being freed to ensure passwords/credentials aren't left in released memory. Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com> Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-23mount.cifs: clean up credential file parsingScott Lovenberg1-46/+32
Remove magic numbers, redundant code and extra variables from open_cred_file(). Remove check for domain length since strlcpy is safe from buffer overflows. Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
2010-04-17mount.cifs: remove unneeded newline in verbose outputJeff Layton1-1/+1
Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-14mount.cifs: check for NULL pointer before calling strchr()Jeff Layton1-3/+5
mount.cifs calls strchr on currentaddress, which may be a NULL pointer. Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-13automake: don't use @foo@ constructs in Makefile.amJeff Layton1-2/+2
...use $(foo) instead. That doesn't rely on an explicit AC_SUBST(). Reported-by: Lars Müller <lars@samba.org> Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-12cifs: enable CAP_DAC_READ_SEARCH before chdir() and realpath() callsJeff Layton2-1/+7
It's possible that root won't have privileges to chdir or evaluate the paths without that capability. Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-09cifs-utils: bump version number to 4.3cifs-utils-4.3Jeff Layton1-1/+1
Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-09autoconf: remove explicit check for prctlJeff Layton1-3/+0
...it's already checked in AC_LIBCAP Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-06autotools: add --with-libcap autoconf optionJeff Layton1-6/+21
...it's rather confusing since we can compile against libcap or libcap-ng but this is helpful for testing. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-06mount.cifs: fix capability issues when libcap isn't presentJeff Layton1-14/+17
...some #defines are missing in that case. This fixes the build for all possible libcap/libcap-ng availability scenarios. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-06mount.cifs: make credentials file parameters consistent with mount optionsScott Lovenberg1-3/+3
This patch makes the mount.cifs credentials file parameters consistent with the command line parameters to remove ambiguity between the command line parameter format and the credentials file format. That is, it parses for both short and long form of the 'username', 'password', and 'domain' parameters. This patch is against the current cifs-utils-4.2. I'm also thinking of adding a second patch that allows for parsing a "domain/user", "domain%user" and "domain/user%password" formats as allowed from the command line. Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
2010-04-05mount.cifs: restrict capabilities furtherJeff Layton1-26/+29
Only the parent process will ever need CAP_DAC_OVERRIDE. The child can get by with CAP_DAC_READ_SEARCH. Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-05mount.cifs: properly prune the capabilities bounding setJeff Layton2-1/+39
...libcap-ng does this in a much easier fashion. If that's not available, then we have to do it manually. Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-04mount.cifs: use libcap-ng to manage capabilitiesJeff Layton3-2/+48
...in preference to libcap if it's available. Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-04autotools: don't link mount.cifs against krb5 libraryJeff Layton2-2/+11
mount.cifs is being linked against the krb5 library. Fix it so that that doesn't happen. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-03mount.cifs: fix toggle_cap_dac_overrideJeff Layton1-7/+6
...it clears the capability set completely, which it shouldn't do. It also doesn't call cap_set_proc to make the new capability set active. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-03mount.cifs: only enable CAP_DAC_OVERRIDE when neededJeff Layton1-66/+144
When dropping capabilities, drop CAP_DAC_OVERRIDE from the effective set but not the permitted. When we need to open credential or password files, make it effective again and drop it after the open completes. This reduces CAP_DAC_OVERRIDE exposure. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-02mount.cifs: if real uid is 0, child must keep CAP_DAC_OVERRIDEJeff Layton1-7/+10
...otherwise, root may not be able to read credential files. The ideal thing would be to remove it from the effective set, and only turn it on when needed, but for now this should fix the immediate problem. Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-02cifs-utils: bump version to 4.2cifs-utils-4.2Jeff Layton4-6/+7
- fix URL's and email addresses - update copyright notices Signed-off-by: Jeff Layton <jlayton@samba.org>
2010-04-01cifs.upcall: run it through LindentJeff Layton1-72/+66
...coding style cleanup. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01cifs-upcall: krb5.h inclusion quick fixTorsten Kurbad1-0/+4
...eventually it might be better to make autoconf set -I/usr/include/krb5 or whatever and get rid of the #ifdef's here. It's a little tricky to figure out the include dir however, so this will do for now. Signed-off-by: Torsten Kurbad <torsten@tk-webart.de>
2010-04-01cifs-upcall: heimdal fixesTorsten Kurbad3-13/+64
Signed-off-by: Torsten Kurbad <torsten@tk-webart.de>
2010-04-01mount.cifs: re-enable setuid usageJeff Layton1-27/+18
Now that mount.cifs is safe(r) we don't need to disable setuid capability by default. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: drop capabilities if libcap is availableJeff Layton4-0/+94
Might as well be as safe as possible. Have child drop all capabilities, and have the parent drop all but CAP_SYS_ADMIN (needed for mounting) and CAP_DAC_OVERRIDE (needed in case mtab isn't writable by root). We might even eventually consider being clever and dropping CAP_DAC_OVERRIDE when root has access to the mtab. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: guard against signals by unprivileged usersJeff Layton1-9/+38
If mount.cifs is setuid root, then the unprivileged user who runs the program can send the mount.cifs process a signal and kill it. This is not a huge problem unless we happen to be updating the mtab at the time, in which case the mtab lockfiles might not get cleaned up. To remedy this, have the privileged mount.cifs process set its real uid to the effective uid (usually, root). This prevents unprivileged users from being able to signal the process. While we're at it, also mask off signals while we're updating the mtab. This leaves a SIGKILL by root as the only way to interrupt the mtab update, but there's really nothing we can do about that. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: introduce privilege separationJeff Layton1-16/+80
Much of the mount option parsing and other activities can be done by an unprivileged process. Allocate the parsed_mount_info struct as an anonymous mmap() segment and then fork to do the actual mount option parsing. The child can then drop root privileges before populating the parsed_mount_info struct. The parent waits for the child to exit and then continues the mount process based on the child's exit status. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: move nomtab, fakemnt, and verboseflag flags to parsed_mount_infoJeff Layton1-13/+13
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: move assembly of parsed_mount_info to separate functionJeff Layton1-94/+110
...later, we'll want to introduce privilege separation so make this a separate function to facilitate that. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: run mount.cifs through LindentJeff Layton1-282/+336
...code cleanup Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: move mtab adding code to separate functionJeff Layton1-57/+71
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: clean up command-line optionsJeff Layton1-96/+3
The mount.cifs command apparently tries to take a ton of command-line options. Many of these will never be passed to mount.cifs by /bin/mount. Others are more appropriately specified as mount options. In both cases, there are a lot of options in the switch statement that are not listed in the optstring, and there are characters in the optstring that are not dealt with by the switch statement. Other options are poorly wired to the rest of the code and don't actually do anything. Clean it up by removing all but the ones that are likely to ever be used. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: reassemble device name from piecesJeff Layton1-8/+30
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: clean up setting of password fieldJeff Layton1-109/+84
Add a function to set and escape the password properly. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: eliminate "legacy" setuid behaviorJeff Layton1-81/+9
This behavior is demonstrably unsafe and not something we want to support going forward. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: eliminate some unneeded flags in parsed_mount_infoJeff Layton1-6/+1
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: parse unc into separate fieldsJeff Layton1-196/+179
The UNC is currently handled as a single string and mount.cifs will just munge it whenever it needs to change the delimiter type or uppercase it, etc. This is tricky to handle correctly and means that we often need to keep track of what's already been changed. Instead of doing this, just track the pieces of the UNC in separate fields in the parsed_mount_info, and then use those pieces to build strings as needed. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: add username and domain fields to parsed_mount_infoJeff Layton1-172/+116
...and fill and use them accordingly. Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: make mountpassword a field in parsed_infoJeff Layton1-130/+78
...rather than a buffer pointed to by a global var Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: make parse_options return proper mount error codesJeff Layton1-16/+17
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2010-04-01mount.cifs: have parse_options fill parsed_mount_infoJeff Layton1-130/+89
Allocate a zeroed out parsed_mount_info struct and have parse_options put its info into that instead. realloc() is no longer used here and instead we just have the option parser carefully check that the result will fit in the buffer before copying it. We also no longer use snprintf to stuff info directly into the buffer. It may not be possible given the other checks, but snprintf can leave a non-NULL terminated string. Use strlcat everywhere instead to ensure that doesn't occur. Signed-off-by: Jeff Layton <jlayton@redhat.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 17:42:00 +0000