6a576391d6
There's no standard function that copies from a null-padded character sequence into a string. A few standard functions can be workarounded to do that: - strncat(3): This function is designed to catenate from a null-padded character sequence into a string. The catch is that there's no *cpy() equivalent of it --strncpy(3) is not at all related to strncat(3); don't be fooled by the confusing name--, so one would need to zero the first byte before the call to strncat(3). It also has the inconvenient that it returns a useless value. - strncpy(3): This function is designed to copy from a string to a null-padded character sequence; the opposite of what we want to do. If one passes the size of src instead of the size of dst, and then manually zeroes the last byte of the dst buffer, something similar to what we want happens. However, this does more than what we want: it also padds with NUL the remaining bytes after the terminating NUL. That extra work can confuse maintainers to believe that it's necessary. That is exactly what happens in logout.c. src/logoutd.c-46- /* src/logoutd.c-47- * ut_user may not have the terminating NUL. src/logoutd.c-48- */ src/logoutd.c:49: strncpy (user, ut->ut_user, sizeof (ut->ut_user)); src/logoutd.c-50- user[sizeof (ut->ut_user)] = '\0'; In that logout.c case --and in most invocations of strncpy(3), which is usually a wrong tool-- the extra work is not wanted, so it's preferrable to use the right tool, a function that does exactly what's needed and nothing more than that. That tool is zustr2stp(). Read string_copying(7) for a more complete comparison of string copying functions. Cc: Christian Göttsche <cgzones@googlemail.com> Cc: Serge Hallyn <serge@hallyn.com> Cc: Iker Pedrosa <ipedrosa@redhat.com> Signed-off-by: Alejandro Colomar <alx@kernel.org>
199 lines
2.8 KiB
Makefile
199 lines
2.8 KiB
Makefile
|
|
AUTOMAKE_OPTIONS = 1.0 foreign
|
|
|
|
DEFS =
|
|
|
|
noinst_LTLIBRARIES = libshadow.la
|
|
|
|
if USE_PAM
|
|
LIBCRYPT_PAM = $(LIBCRYPT)
|
|
else
|
|
LIBCRYPT_PAM =
|
|
endif
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
|
|
|
|
libshadow_la_CPPFLAGS = $(ECONF_CPPFLAGS)
|
|
if HAVE_VENDORDIR
|
|
libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
|
|
endif
|
|
|
|
libshadow_la_CPPFLAGS += -I$(top_srcdir)
|
|
libshadow_la_CFLAGS = $(LIBBSD_CFLAGS) $(LIBCRYPT_PAM) $(LIBSYSTEMD)
|
|
|
|
libshadow_la_SOURCES = \
|
|
addgrps.c \
|
|
age.c \
|
|
agetpass.c \
|
|
alloc.c \
|
|
alloc.h \
|
|
audit_help.c \
|
|
basename.c \
|
|
bit.c \
|
|
bit.h \
|
|
chkname.c \
|
|
chkname.h \
|
|
chowndir.c \
|
|
chowntty.c \
|
|
cleanup.c \
|
|
cleanup_group.c \
|
|
cleanup_user.c \
|
|
commonio.c \
|
|
commonio.h \
|
|
console.c \
|
|
copydir.c \
|
|
csrand.c \
|
|
date_to_str.c \
|
|
defines.h \
|
|
encrypt.c \
|
|
entry.c \
|
|
env.c \
|
|
exitcodes.h \
|
|
faillog.h \
|
|
failure.c \
|
|
failure.h \
|
|
fields.c \
|
|
find_new_gid.c \
|
|
find_new_uid.c \
|
|
find_new_sub_gids.c \
|
|
find_new_sub_uids.c \
|
|
fputsx.c \
|
|
get_gid.c \
|
|
get_pid.c \
|
|
get_uid.c \
|
|
getdate.h \
|
|
getdate.y \
|
|
getdef.c \
|
|
getdef.h \
|
|
getlong.c \
|
|
getgr_nam_gid.c \
|
|
getrange.c \
|
|
gettime.c \
|
|
getulong.c \
|
|
groupio.c \
|
|
groupmem.c \
|
|
groupio.h \
|
|
gshadow.c \
|
|
hushed.c \
|
|
idmapping.h \
|
|
idmapping.c \
|
|
isexpired.c \
|
|
limits.c \
|
|
list.c \
|
|
lockpw.c \
|
|
loginprompt.c \
|
|
mail.c \
|
|
mempcpy.c \
|
|
mempcpy.h \
|
|
memzero.c \
|
|
memzero.h \
|
|
motd.c \
|
|
must_be.h \
|
|
myname.c \
|
|
nss.c \
|
|
nscd.c \
|
|
nscd.h \
|
|
obscure.c \
|
|
pam_defs.h \
|
|
pam_pass.c \
|
|
pam_pass_non_interactive.c \
|
|
port.c \
|
|
port.h \
|
|
prefix_flag.c \
|
|
prototypes.h \
|
|
pwauth.c \
|
|
pwauth.h \
|
|
pwio.c \
|
|
pwio.h \
|
|
pwd_init.c \
|
|
pwd2spwd.c \
|
|
pwdcheck.c \
|
|
pwmem.c \
|
|
remove_tree.c \
|
|
rlogin.c \
|
|
root_flag.c \
|
|
run_part.h \
|
|
run_part.c \
|
|
salt.c \
|
|
selinux.c \
|
|
semanage.c \
|
|
setugid.c \
|
|
setupenv.c \
|
|
sgetgrent.c \
|
|
sgetpwent.c \
|
|
sgetspent.c \
|
|
sgroupio.c \
|
|
sgroupio.h\
|
|
shadow.c \
|
|
shadowio.c \
|
|
shadowio.h \
|
|
shadowlog.c \
|
|
shadowlog.h \
|
|
shadowlog_internal.h \
|
|
shadowmem.c \
|
|
shell.c \
|
|
sizeof.h \
|
|
spawn.c \
|
|
sssd.c \
|
|
sssd.h \
|
|
stpecpy.c \
|
|
stpecpy.h \
|
|
stpeprintf.c \
|
|
stpeprintf.h \
|
|
strtoday.c \
|
|
sub.c \
|
|
subordinateio.h \
|
|
subordinateio.c \
|
|
sulog.c \
|
|
ttytype.c \
|
|
tz.c \
|
|
ulimit.c \
|
|
user_busy.c \
|
|
valid.c \
|
|
write_full.c \
|
|
xgetpwnam.c \
|
|
xprefix_getpwnam.c \
|
|
xgetpwuid.c \
|
|
xgetgrnam.c \
|
|
xgetgrgid.c \
|
|
xgetspnam.c \
|
|
yesno.c \
|
|
zustr2stp.c \
|
|
zustr2stp.h
|
|
|
|
if WITH_TCB
|
|
libshadow_la_SOURCES += tcbfuncs.c tcbfuncs.h
|
|
endif
|
|
|
|
if WITH_BTRFS
|
|
libshadow_la_SOURCES += btrfs.c
|
|
endif
|
|
|
|
if ENABLE_LASTLOG
|
|
libshadow_la_SOURCES += log.c
|
|
endif
|
|
|
|
if ENABLE_LOGIND
|
|
libshadow_la_SOURCES += logind.c
|
|
else
|
|
libshadow_la_SOURCES += utmp.c
|
|
endif
|
|
|
|
if !WITH_LIBBSD
|
|
libshadow_la_SOURCES += \
|
|
freezero.h \
|
|
freezero.c \
|
|
readpassphrase.h \
|
|
readpassphrase.c
|
|
endif
|
|
|
|
# These files are unneeded for some reason, listed in
|
|
# order of appearance:
|
|
#
|
|
# sources for dbm support (not yet used)
|
|
|
|
EXTRA_DIST = \
|
|
.indent.pro \
|
|
gshadow_.h \
|
|
xgetXXbyYY.c
|