Adapted secaudit and usermap (now ntfssecaudit and ntfsusermap) to ntfsprogs

These tools were originally developed for running on Windows and later
ported to libntfs-3g. This patch makes them similar to other ntfsprogs
tools, dropping the native Windows interfaces and using libntfs-3g on
all platforms.

There is no change in usage or supported features, only the command
names have changed.
This commit is contained in:
Jean-Pierre André 2016-04-07 09:20:23 +02:00
parent 0ded128808
commit 3d7a28bfa5
8 changed files with 1685 additions and 3290 deletions

View File

@ -668,11 +668,11 @@ AC_CONFIG_FILES([
ntfsprogs/ntfstruncate.8
ntfsprogs/ntfsfallocate.8
ntfsprogs/ntfsrecover.8
ntfsprogs/ntfsusermap.8
ntfsprogs/ntfssecaudit.8
src/Makefile
src/ntfs-3g.8
src/ntfs-3g.probe.8
src/ntfs-3g.usermap.8
src/ntfs-3g.secaudit.8
])
AC_OUTPUT

View File

@ -17,7 +17,8 @@ if ENABLE_NTFSPROGS
bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls ntfscat ntfscmp
sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone \
ntfscp
EXTRA_PROGRAM_NAMES = ntfswipe ntfstruncate ntfsrecover
EXTRA_PROGRAM_NAMES = ntfswipe ntfstruncate ntfsrecover \
ntfsusermap ntfssecaudit
QUARANTINED_PROGRAM_NAMES = ntfsdump_logfile ntfsmftalloc ntfsmove ntfsck \
ntfsfallocate
@ -26,7 +27,8 @@ man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \
ntfsundelete.8 ntfsresize.8 ntfsprogs.8 ntfsls.8 \
ntfsclone.8 ntfscluster.8 ntfscat.8 ntfscp.8 \
ntfscmp.8 ntfswipe.8 ntfstruncate.8 \
ntfsdecrypt.8 ntfsfallocate.8 ntfsrecover.8
ntfsdecrypt.8 ntfsfallocate.8 ntfsrecover.8 \
ntfsusermap.8 ntfssecaudit.8
EXTRA_MANS =
CLEANFILES = $(EXTRA_PROGRAMS)
@ -106,6 +108,14 @@ ntfsrecover_SOURCES = playlog.c ntfsrecover.c utils.c utils.h ntfsrecover.h
ntfsrecover_LDADD = $(AM_LIBS) $(NTFSRECOVER_LIBS)
ntfsrecover_LDFLAGS = $(AM_LFLAGS)
ntfsusermap_SOURCES = ntfsusermap.c utils.c utils.h
ntfsusermap_LDADD = $(AM_LIBS) $(NTFSRECOVER_LIBS)
ntfsusermap_LDFLAGS = $(AM_LFLAGS)
ntfssecaudit_SOURCES = ntfssecaudit.c utils.c utils.h
ntfssecaudit_LDADD = $(AM_LIBS) $(NTFSRECOVER_LIBS)
ntfssecaudit_LDFLAGS = $(AM_LFLAGS)
# We don't distribute these
ntfstruncate_SOURCES = attrdef.c ntfstruncate.c utils.c utils.h

View File

@ -1,11 +1,11 @@
.\" Copyright (c) 2007-2009 Jean-Pierre André.
.\" Copyright (c) 2007-2016 Jean-Pierre André.
.\" This file may be copied under the terms of the GNU Public License.
.\"
.TH NTFS-3G.SECAUDIT 8 "February 2010" "ntfs-3g.secaudit 1.4.1"
.TH NTFSSECAUDIT 8 "February 2010" "ntfssecaudit 1.5.0"
.SH NAME
ntfs-3g.secaudit \- NTFS Security Data Auditing
ntfssecaudit \- NTFS Security Data Auditing
.SH SYNOPSIS
.B ntfs-3g.secaudit
.B ntfssecaudit
\fB[\fIoptions\fP\fB]\fR
.I args
.PP
@ -39,7 +39,7 @@ and args define the parameters and the set of files acted upon.
.PP
Typing secaudit with no args will display a summary of available options.
.SH DESCRIPTION
\fBntfs-3g.secaudit\fR
\fBntfssecaudit\fR
displays the ownership and permissions of a set of files on an NTFS
file system, and checks their consistency. It can be started in terminal
mode only (no graphical user interface is available.)
@ -53,7 +53,7 @@ of information. It is therefore advisable to redirect the output to
a file or pipe it to a text editor for examination.
.SH OPTIONS
Below are the valid combinations of options and arguments that
\fBntfs-3g.secaudit\fR accepts. All the indicated arguments are
\fBntfssecaudit\fR accepts. All the indicated arguments are
mandatory and must be unique (if wildcards are used, they must
resolve to a single name.)
.TP
@ -135,25 +135,25 @@ Example : "\fBu::7,g::5,o:0,u:510:rwx,g:500:5,d:u:510:7\fP"
Audit the global security data on /dev/sda1
.RS
.sp
.B ntfs-3g.secaudit -ar /dev/sda1
.B ntfssecaudit -ar /dev/sda1
.sp
.RE
Display the ownership and permissions parameters for files in directory
/audio/music on device /dev/sda5, excluding sub-directories :
.RS
.sp
.B ntfs-3g.secaudit /dev/sda5 /audio/music
.B ntfssecaudit /dev/sda5 /audio/music
.sp
.RE
Set all files in directory /audio/music on device /dev/sda5 as writeable
by owner and read-only for everybody :
.RS
.sp
.B ntfs-3g.secaudit -r /dev/sda5 644 /audio/music
.B ntfssecaudit -r /dev/sda5 644 /audio/music
.sp
.RE
.SH EXIT CODES
.B ntfs-3g.secaudit
.B ntfssecaudit
exits with a value of 0 when no error was detected, and with a value
of 1 when an error was detected.
.SH KNOWN ISSUES
@ -170,7 +170,7 @@ in detail. You can contact the
development team on the ntfs\-3g\-devel@lists.sf.net
address.
.SH AUTHORS
.B ntfs-3g.secaudit
.B ntfssecaudit
has been developed by Jean-Pierre André.
.SH THANKS
Several people made heroic efforts, often over five or more

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,11 @@
.\" Copyright (c) 2007-2009 Jean-Pierre André.
.\" Copyright (c) 2007-2016 Jean-Pierre André.
.\" This file may be copied under the terms of the GNU Public License.
.\"
.TH NTFS-3G.USERMAP 8 "February 2010" "ntfs-3g.usermap 1.1.2"
.TH NTFSUSERMAP 8 "February 2016" "ntfsusermap 1.2.0"
.SH NAME
ntfs-3g.usermap \- NTFS Building a User Mapping File
ntfsusermap \- NTFS Building a User Mapping File
.SH SYNOPSIS
.B ntfs-3g.usermap
.B ntfsusermap
\fIwindows-system-device\fP
\fB[\fIother-ntfs-device\fP...\fB]\fR
.PP
@ -15,13 +15,13 @@ whose users are to be mapped to current Linux system.
And \fIother-ntfs-device\fP is another device containing files which are
to be accessed both by the Windows mentioned above and current Linux system.
.PP
the ntfs-3g.usermap command must be started as root, and the designated devices
the ntfsusermap command must be started as root, and the designated devices
must not be mounted.
.PP
Typing ntfs-3g.usermap with no args will display a summary of command
Typing ntfsusermap with no args will display a summary of command
arguments.
.SH DESCRIPTION
\fBntfs-3g.usermap\fR
\fBntfsusermap\fR
creates the file defining the mapping of Windows accounts to Linux logins for
users who owns files which should be visible from both Windows and
Linux.
@ -44,7 +44,7 @@ The mappings for standard Windows users, such as "Administrator" or
"All Users" are defined implicitly. As a consequence a user mapping should
never be defined as Linux root.
.PP
When there are no more significant files, ntfs-3g.usermap create the
When there are no more significant files, ntfsusermap create the
mapping file into the file UserMapping in the current directory. This
file has to be moved to the hidden directory .NTFS-3G in the root of
all the NTFS file systems to be shared between Windows and Linux. This
@ -53,19 +53,19 @@ be taken into account if not present at mount time, which means the
file system has to be unmounted and mounted again for the new mapping
file to be taken into account.
.SH OPTIONS
No option is defined for ntfs-3g.usermap.
No option is defined for ntfsusermap.
.SH EXAMPLES
Map the users defined on the Windows system present on /dev/sda1 :
.RS
.sp
.B ntfs-3g.usermap /dev/sda1
.B ntfsusermap /dev/sda1
.sp
.RE
.PP
A detailed example, with screen displays is available on
http://pagesperso-orange.fr/b.andre/usermap.html
http://jp-andre.pagesperso-orange.fr/ntfsusermap.html
.SH EXIT CODES
.B ntfs-3g.usermap
.B ntfsusermap
exits with a value of 0 when no error was detected, and with a value
of 1 when an error was detected.
.SH KNOWN ISSUES

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
EXTRA_DIST = secaudit.h ntfs-3g_common.h
EXTRA_DIST = ntfs-3g_common.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
@ -18,14 +18,10 @@ endif
if ENABLE_NTFS_3G
bin_PROGRAMS = ntfs-3g.probe \
ntfs-3g.usermap \
ntfs-3g.secaudit
bin_PROGRAMS = ntfs-3g.probe
rootbin_PROGRAMS = ntfs-3g lowntfs-3g
rootsbin_DATA = #Create directory
man_MANS = ntfs-3g.8 ntfs-3g.probe.8 \
ntfs-3g.usermap.8 \
ntfs-3g.secaudit.8
man_MANS = ntfs-3g.8 ntfs-3g.probe.8
ntfs_3g_LDADD = -ldl $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
if REALLYSTATIC
@ -52,19 +48,11 @@ lowntfs_3g_CFLAGS = \
lowntfs_3g_SOURCES = lowntfs-3g.c ntfs-3g_common.c
ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
ntfs_3g_usermap_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
ntfs_3g_secaudit_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
if REALLYSTATIC
ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static
ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static
endif
ntfs_3g_probe_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
ntfs_3g_usermap_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
ntfs_3g_secaudit_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
ntfs_3g_probe_SOURCES = ntfs-3g.probe.c
ntfs_3g_usermap_SOURCES = usermap.c
ntfs_3g_secaudit_SOURCES = secaudit.c
drivers : $(FUSE_LIBS) ntfs-3g lowntfs-3g

View File

@ -381,7 +381,7 @@ by Windows has to be collected. This will lead to a user mapping file like :
.sp
.RE
.P
The utility \fBntfs-3g.usermap\fP may be used to create such a user
The utility \fBntfsusermap\fP may be used to create such a user
mapping file.
.SH EXAMPLES
Mount /dev/sda1 to /mnt/windows: