storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If no group is specified, use the user's primary group

Browse Source
This commit is contained in:
Justin Maggard 2017-10-06 16:05:01 -07:00
parent 7a27ce3077
commit ad5d6413a7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minidlna.c
View File

@ -734,6 +734,8 @@ init(int argc, char **argv)
DPRINTF(E_FATAL, L_GENERAL, "Bad user '%s'.\n", DPRINTF(E_FATAL, L_GENERAL, "Bad user '%s'.\n",
ary_options[i].value); ary_options[i].value);
uid = entry->pw_uid; uid = entry->pw_uid;
if (!gid)
gid = entry->pw_gid;
} }
break; break;
case FORCE_SORT_CRITERIA: case FORCE_SORT_CRITERIA:
@ -873,6 +875,8 @@ init(int argc, char **argv)
if (!entry) if (!entry)
DPRINTF(E_FATAL, L_GENERAL, "Bad user '%s'.\n", argv[i]); DPRINTF(E_FATAL, L_GENERAL, "Bad user '%s'.\n", argv[i]);
uid = entry->pw_uid; uid = entry->pw_uid;
if (!gid)
gid = entry->pw_gid;
} }
} }
else else

4
monitor.c
View File

@ -571,12 +571,12 @@ monitor_remove_directory(int fd, const char * path)
/* Invalidate the scanner cache so we don't insert files into non-existent containers */ /* Invalidate the scanner cache so we don't insert files into non-existent containers */
valid_cache = 0; valid_cache = 0;
#ifdef HAVE_INOTIFY
if( fd > 0 ) if( fd > 0 )
{ {
#ifdef HAVE_INOTIFY
remove_watch(fd, path); remove_watch(fd, path);
#endif
} }
#endif
sql = sqlite3_mprintf("SELECT ID from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" sql = sqlite3_mprintf("SELECT ID from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')"
" or PATH = '%q'", path, path, 0xFF, path); " or PATH = '%q'", path, path, 0xFF, path);
if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) ) if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) )