opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Displayed the parent directory of selected files in usermap 

Displaying the parent directory facilitates the identification of files
selected by usermap as a base for defining the mapping of Windows users
to Linux ones.
edge.strict_endians
Jean-Pierre André 2014-05-22 08:58:03 +02:00
parent 3e212bb901
commit 5554f2e677
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/usermap.c
View File

@ -41,10 +41,13 @@
* - avoided selecting DOS names on Linux
*
* Nov 2009 Version 1.1.3
* - shutdown compiler warnings for unused parameters
* - silenced compiler warnings for unused parameters
*
* Jan 2010 Version 1.1.4
* - fixed compilation problems for Mac OSX (Erik Larsson)
*
* Apr 2014 Version 1.1.5
* - displayed the parent directory of selected files
*/
/*
@ -83,7 +86,7 @@
#define INIT_FILE_SECURITY "ntfs_initialize_file_security"
#define LEAVE_FILE_SECURITY "ntfs_leave_file_security"
#define VERSION "1.1.4"
#define VERSION "1.1.5"
#define MAPDIR ".NTFS-3G"
#define MAPFILE "UserMapping"
#define MAXATTRSZ 2048
@ -472,7 +475,7 @@ STATIC unsigned char *makegroupsid(const unsigned char *sid)
}
STATIC void domapping(const char *accname, const char *filename,
const unsigned char *sid, int type)
const char *dir, const unsigned char *sid, int type)
{
char buf[81];
char *sidstr;
@ -499,6 +502,8 @@ STATIC void domapping(const char *accname, const char *filename,
printf("\n");
if (accname)
printf("Under Windows login \"%s\"\n", accname);
if (dir)
printf(" in directory \"%s\"\n",dir);
printf(" file \"%s\" has no mapped %s\n",
filename,(type ? "group" : "owner"));
printf("By which Linux login should this file be owned ?\n");
@ -578,7 +583,8 @@ STATIC void listaclusers(const char *accname, const unsigned char *attr, int off
cnt = get2l(attr, off + 4);
x = 8;
for (i = 0; i < cnt; i++) {
domapping(accname, (char *)NULL, &attr[off + x + 8], 2);
domapping(accname, (char *)NULL, (char*)NULL,
&attr[off + x + 8], 2);
x += get2l(attr, off + x + 2);
}
}
@ -602,12 +608,12 @@ STATIC void account(const char *accname, const char *dir, const char *name, int
if (GetFileSecurity
(fullname, OWNER_SECURITY_INFORMATION, attr, MAXATTRSZ,
&attrsz)) {
domapping(accname, name, &attr[20], 0);
domapping(accname, name, dir, &attr[20], 0);
attrsz = 0;
if (GetFileSecurity
(fullname, GROUP_SECURITY_INFORMATION, attr,
MAXATTRSZ, &attrsz))
domapping(accname, name, &attr[20], 1);
domapping(accname, name, dir, &attr[20], 1);
else
printf(" No group SID\n");
attrsz = 0;
@ -641,12 +647,12 @@ STATIC void account(const char *accname, const char *dir, const char *name, int
if (ntfs_get_file_security(ntfs_context,
fullname, OWNER_SECURITY_INFORMATION,
(char*)attr, MAXATTRSZ, &attrsz)) {
domapping(accname, name, &attr[20], 0);
domapping(accname, name, dir, &attr[20], 0);
attrsz = 0;
if (ntfs_get_file_security(ntfs_context,
fullname, GROUP_SECURITY_INFORMATION,
(char*)attr, MAXATTRSZ, &attrsz))
domapping(accname, name, &attr[20], 1);
domapping(accname, name, dir, &attr[20], 1);
else
printf(" No group SID\n");
attrsz = 0;