sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:param: Allow to add usershare if uid_wrapper is loaded

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2017-06-22 16:13:12 +02:00 committed by Stefan Metzmacher
parent 4f5cfe2713
commit 0df6ecf2fa
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/param/loadparm.c
View File

@ -3513,6 +3513,19 @@ static bool usershare_exists(int iService, struct timespec *last_mod)
return true;
}
static bool usershare_directory_is_root(uid_t uid)
{
if (uid == 0) {
return true;
}
if (uid_wrapper_enabled()) {
return true;
}
return false;
}
/***************************************************************************
Load a usershare service by name. Returns a valid servicenumber or -1.
***************************************************************************/
@ -3546,9 +3559,11 @@ int load_usershare_service(const char *servicename)
*/
#ifdef S_ISVTX
if (sbuf.st_ex_uid != 0 || !(sbuf.st_ex_mode & S_ISVTX) || (sbuf.st_ex_mode & S_IWOTH)) {
if (!usershare_directory_is_root(sbuf.st_ex_uid) ||
!(sbuf.st_ex_mode & S_ISVTX) || (sbuf.st_ex_mode & S_IWOTH)) {
#else
if (sbuf.st_ex_uid != 0 || (sbuf.st_ex_mode & S_IWOTH)) {
if (!usershare_directory_is_root(sbuf.st_ex_uid) ||
(sbuf.st_ex_mode & S_IWOTH)) {
#endif
DEBUG(0,("load_usershare_service: directory %s is not owned by root "
"or does not have the sticky bit 't' set or is writable by anyone.\n",