36577fca4e
* Spawn: don't loop forever on ECHILD * Do not fail locking if there is a stale lockfile (Tomas Mraz) * Use lckpwdf if prefix not set (Tomas Mraz) * Build: check correct DocBook version (Jan Tojnar) * Usermod: Print 'no changes' to stdout, not stderr (Serge Hallyn) * Add support for btrfs subvolumes for home (Adam Majer) * Fix chpasswd long line handling (Nathan Ruiz) * Use secure_getenv for gettime (Chris Lamb) * Make sp_lstchg reproducible (Chris Lamb) * Do not crash commonio_close if db file is not open (Tomas Mraz) * Don't flush nscd and sssd cache in read-only mode (Charlie Vuillemez) * French manpage update (Alban VIDAL) * Fix manpage defaults for SUB_UID/GID_COUNT (Tomas Mraz) * Sync po files from shadow.pot (Alban VIDAL) * Usermod: guard against unsafe chown of homedir contents (Tomas Mraz) * Add LASTLOG_UID_MAX to login.defs (Tomas Mraz) * new[ug]idmap file capabilities support (Giuseppe Scrivano and Christian Brauner) * Fix segfault in useradd (Tomas Mraz) * Coverity issues (Tomas Mraz) * Flush sssd caches (Jakub Hrozek) * Log UID in nologin (Vladimir Ivanov) * run pam_getenvlist after setup_env in su.c (Michael Vogt) * Support systems with only utmpx (A. Wilcox) * Fix unguarded ENABLE_SUBIDS code (Jan Chren (rindeal)) * Update po/zh_CN translation (Lion Yang) * Create parent dirs for useradd -m (Michael Vetter) * Prevent usermod segv * Fix usermod crash (fariouche) - Remove btrfs-subvolumes.patch (fate#316134): OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=68
105 lines
3.1 KiB
Diff
105 lines
3.1 KiB
Diff
Index: lib/getdef.c
|
|
===================================================================
|
|
--- lib/getdef.c.orig
|
|
+++ lib/getdef.c
|
|
@@ -127,6 +127,8 @@ static struct itemdef def_table[] = {
|
|
{"UID_MIN", NULL},
|
|
{"UMASK", NULL},
|
|
{"USERDEL_CMD", NULL},
|
|
+ {"USERDEL_PRECMD", NULL},
|
|
+ {"USERDEL_POSTCMD", NULL},
|
|
{"USERGROUPS_ENAB", NULL},
|
|
#ifndef USE_PAM
|
|
PAMDEFS
|
|
Index: etc/login.defs
|
|
===================================================================
|
|
--- etc/login.defs.orig
|
|
+++ etc/login.defs
|
|
@@ -216,9 +216,25 @@ DEFAULT_HOME yes
|
|
# It should remove any at/cron/print jobs etc. owned by
|
|
# the user to be removed (passed as the first argument).
|
|
#
|
|
+# See also USERDEL_PRECMD and USERDEL_POSTCMD below.
|
|
+#
|
|
#USERDEL_CMD /usr/sbin/userdel_local
|
|
|
|
#
|
|
+# If defined, this command is run before removing a user.
|
|
+# It should remove any at/cron/print jobs etc. owned by
|
|
+# the user to be removed.
|
|
+#
|
|
+USERDEL_PRECMD /usr/sbin/userdel-pre.local
|
|
+
|
|
+#
|
|
+# If defined, this command is run after removing a user.
|
|
+# It should rebuild any NIS database etc. to remove the
|
|
+# account from it.
|
|
+#
|
|
+USERDEL_POSTCMD /usr/sbin/userdel-post.local
|
|
+
|
|
+#
|
|
# Enable setting of the umask group bits to be the same as owner bits
|
|
# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
|
|
# the same as gid, and username is the same as the primary group name.
|
|
Index: src/userdel.c
|
|
===================================================================
|
|
--- src/userdel.c.orig
|
|
+++ src/userdel.c
|
|
@@ -126,7 +126,7 @@ static void close_files (void);
|
|
static void fail_exit (int);
|
|
static void open_files (void);
|
|
static void update_user (void);
|
|
-static void user_cancel (const char *);
|
|
+static void call_script (const char *, const char *);
|
|
|
|
#ifdef EXTRA_CHECK_HOME_DIR
|
|
static bool path_prefix (const char *, const char *);
|
|
@@ -768,13 +768,13 @@ static void update_user (void)
|
|
* cron, at, or print jobs.
|
|
*/
|
|
|
|
-static void user_cancel (const char *user)
|
|
+static void call_script (const char *program, const char *user)
|
|
{
|
|
const char *cmd;
|
|
const char *argv[3];
|
|
int status;
|
|
|
|
- cmd = getdef_str ("USERDEL_CMD");
|
|
+ cmd = getdef_str (program);
|
|
if (NULL == cmd) {
|
|
return;
|
|
}
|
|
@@ -1214,9 +1214,10 @@ int main (int argc, char **argv)
|
|
}
|
|
|
|
/*
|
|
- * Do the hard stuff - open the files, create the user entries,
|
|
- * create the home directory, then close and update the files.
|
|
+ * Do the hard stuff - open the files, remove the user entries,
|
|
+ * remove the home directory, then close and update the files.
|
|
*/
|
|
+ call_script ("USERDEL_PRECMD", user_name);
|
|
open_files ();
|
|
update_user ();
|
|
update_groups ();
|
|
@@ -1337,7 +1338,7 @@ int main (int argc, char **argv)
|
|
* the entry from /etc/passwd.
|
|
*/
|
|
if(prefix[0] == '\0')
|
|
- user_cancel (user_name);
|
|
+ call_script ("USERDEL_CMD", user_name);
|
|
close_files ();
|
|
|
|
#ifdef WITH_TCB
|
|
@@ -1348,6 +1349,9 @@ int main (int argc, char **argv)
|
|
nscd_flush_cache ("group");
|
|
sssd_flush_cache (SSSD_DB_PASSWD | SSSD_DB_GROUP);
|
|
|
|
+ /* Call the post script, for example to rebuild NIS database */
|
|
+ call_script ("USERDEL_POSTCMD", user_name);
|
|
+
|
|
return ((0 != errors) ? E_HOMEDIR : E_SUCCESS);
|
|
}
|
|
|