Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 22656c36a2 | |||
| 11071522a2 | |||
| 909036d714 | |||
| de50b39475 | |||
| b5c99ec30e | |||
| 58b96645c9 |
+1
-1
@@ -4,7 +4,7 @@ m4_define([libsubid_abi_major], 4)
|
|||||||
m4_define([libsubid_abi_minor], 0)
|
m4_define([libsubid_abi_minor], 0)
|
||||||
m4_define([libsubid_abi_micro], 0)
|
m4_define([libsubid_abi_micro], 0)
|
||||||
m4_define([libsubid_abi], [libsubid_abi_major.libsubid_abi_minor.libsubid_abi_micro])
|
m4_define([libsubid_abi], [libsubid_abi_major.libsubid_abi_minor.libsubid_abi_micro])
|
||||||
AC_INIT([shadow], [4.14.1], [pkg-shadow-devel@lists.alioth.debian.org], [],
|
AC_INIT([shadow], [4.14.2], [pkg-shadow-devel@lists.alioth.debian.org], [],
|
||||||
[https://github.com/shadow-maint/shadow])
|
[https://github.com/shadow-maint/shadow])
|
||||||
AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
|
AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
|
||||||
AC_CONFIG_MACRO_DIRS([m4])
|
AC_CONFIG_MACRO_DIRS([m4])
|
||||||
|
|||||||
+1
-1
@@ -39,7 +39,7 @@ static int run_btrfs_subvolume_cmd(const char *subcmd, const char *arg1, const c
|
|||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
if (access(cmd, X_OK)) {
|
if (!cmd || access(cmd, X_OK)) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,8 +36,12 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
__BEGIN_DECLS
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
char * readpassphrase(const char *, char *, size_t, int);
|
char * readpassphrase(const char *, char *, size_t, int);
|
||||||
__END_DECLS
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* !LIBBSD_READPASSPHRASE_H */
|
#endif /* !LIBBSD_READPASSPHRASE_H */
|
||||||
|
|||||||
+5
-6
@@ -368,17 +368,16 @@ int update_utmp (const char *user,
|
|||||||
struct utmp *utent, *ut;
|
struct utmp *utent, *ut;
|
||||||
|
|
||||||
utent = get_current_utmp ();
|
utent = get_current_utmp ();
|
||||||
if (utent == NULL) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
ut = prepare_utmp (user, tty, host, utent);
|
ut = prepare_utmp (user, tty, host, utent);
|
||||||
|
|
||||||
(void) setutmp (ut); /* make entry in the utmp & wtmp files */
|
(void) setutmp (ut); /* make entry in the utmp & wtmp files */
|
||||||
free (utent);
|
|
||||||
|
if (utent != NULL) {
|
||||||
|
free (utent);
|
||||||
|
}
|
||||||
free (ut);
|
free (ut);
|
||||||
|
|
||||||
return 1;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void record_failure(const char *failent_user,
|
void record_failure(const char *failent_user,
|
||||||
|
|||||||
@@ -198,6 +198,21 @@
|
|||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<option>-P</option>, <option>--prefix</option> <replaceable>PREFIX_DIR</replaceable>
|
||||||
|
</term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
Apply changes to configuration files under the root filesystem
|
||||||
|
found under the directory <replaceable>PREFIX_DIR</replaceable>.
|
||||||
|
This option does not chroot and is intended for preparing a cross-compilation
|
||||||
|
target. Some limitations: NIS and LDAP users/groups are
|
||||||
|
not verified. PAM authentication is using the host files.
|
||||||
|
No SELINUX support.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>
|
<term>
|
||||||
<option>-W</option>, <option>--warndays</option> <replaceable>WARN_DAYS</replaceable>
|
<option>-W</option>, <option>--warndays</option> <replaceable>WARN_DAYS</replaceable>
|
||||||
|
|||||||
@@ -173,6 +173,21 @@
|
|||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<option>-P</option>, <option>--prefix</option> <replaceable>PREFIX_DIR</replaceable>
|
||||||
|
</term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
Apply changes to configuration files under the root filesystem
|
||||||
|
found under the directory <replaceable>PREFIX_DIR</replaceable>.
|
||||||
|
This option does not chroot and is intended for preparing a cross-compilation
|
||||||
|
target. Some limitations: NIS and LDAP users/groups are
|
||||||
|
not verified. PAM authentication is using the host files.
|
||||||
|
No SELINUX support.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
<varlistentry condition="sha_crypt">
|
<varlistentry condition="sha_crypt">
|
||||||
<term>
|
<term>
|
||||||
<option>-s</option>, <option>--sha-rounds</option> <replaceable>ROUNDS</replaceable>
|
<option>-s</option>, <option>--sha-rounds</option> <replaceable>ROUNDS</replaceable>
|
||||||
|
|||||||
@@ -280,6 +280,21 @@
|
|||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<option>-P</option>, <option>--prefix</option> <replaceable>PREFIX_DIR</replaceable>
|
||||||
|
</term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
Apply changes to configuration files under the root filesystem
|
||||||
|
found under the directory <replaceable>PREFIX_DIR</replaceable>.
|
||||||
|
This option does not chroot and is intended for preparing a cross-compilation
|
||||||
|
target. Some limitations: NIS and LDAP users/groups are
|
||||||
|
not verified. PAM authentication is using the host files.
|
||||||
|
No SELINUX support.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>
|
<term>
|
||||||
<option>-S</option>, <option>--status</option>
|
<option>-S</option>, <option>--status</option>
|
||||||
|
|||||||
+1
-1
@@ -2787,7 +2787,7 @@ int main (int argc, char **argv)
|
|||||||
if (home_added) {
|
if (home_added) {
|
||||||
copy_tree (def_template, prefix_user_home, false, true,
|
copy_tree (def_template, prefix_user_home, false, true,
|
||||||
(uid_t)-1, user_id, (gid_t)-1, user_gid);
|
(uid_t)-1, user_id, (gid_t)-1, user_gid);
|
||||||
copy_tree (def_usrtemplate, prefix_user_home, false, false,
|
copy_tree (def_usrtemplate, prefix_user_home, false, true,
|
||||||
(uid_t)-1, user_id, (gid_t)-1, user_gid);
|
(uid_t)-1, user_id, (gid_t)-1, user_gid);
|
||||||
} else {
|
} else {
|
||||||
fprintf (stderr,
|
fprintf (stderr,
|
||||||
|
|||||||
Reference in New Issue
Block a user