diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-07-27 08:58:37 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-07-27 08:58:37 +0400 |
| commit | ea839a52aebd6a29a8dde70412b0e7b8d68568b4 (patch) | |
| tree | 10026e84c8b73d4e5ad6704ab1cb78ea7c63c305 /src/userdel.c | |
| parent | 6c1662a897fd34b5b0b0174ab83552b016d05e8d (diff) | |
| download | shadow-upstream.tar.gz | |
Imported Upstream version 4.1.5.1upstream/4.1.5.1upstream
Diffstat (limited to 'src/userdel.c')
| -rw-r--r-- | src/userdel.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/userdel.c b/src/userdel.c index 0eb2289..4439f62 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -2,7 +2,7 @@ * Copyright (c) 1991 - 1994, Julianne Frances Haugh * Copyright (c) 1996 - 2000, Marek Michałkiewicz * Copyright (c) 2000 - 2006, Tomasz Kłoczko - * Copyright (c) 2007 - 2011, Nicolas François + * Copyright (c) 2007 - 2012, Nicolas François * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ #include <config.h> -#ident "$Id: userdel.c 3640 2011-11-19 21:51:52Z nekral-guest $" +#ident "$Id: userdel.c 3743 2012-05-25 11:51:53Z nekral-guest $" #include <errno.h> #include <fcntl.h> @@ -333,22 +333,22 @@ static void remove_usergroup (void) * We can remove this group, it is not the primary * group of any remaining user. */ - if (gr_remove (grp->gr_name) == 0) { + if (gr_remove (user_name) == 0) { fprintf (stderr, _("%s: cannot remove entry '%s' from %s\n"), - Prog, grp->gr_name, gr_dbname ()); + Prog, user_name, gr_dbname ()); fail_exit (E_GRP_UPDATE); } #ifdef WITH_AUDIT audit_logger (AUDIT_DEL_GROUP, Prog, "deleting group", - grp->gr_name, AUDIT_NO_ID, + user_name, AUDIT_NO_ID, SHADOW_AUDIT_SUCCESS); #endif /* WITH_AUDIT */ SYSLOG ((LOG_INFO, "removed group '%s' owned by '%s'\n", - grp->gr_name, user_name)); + user_name, user_name)); #ifdef SHADOWGRP if (sgr_locate (user_name) != NULL) { @@ -361,12 +361,12 @@ static void remove_usergroup (void) #ifdef WITH_AUDIT audit_logger (AUDIT_DEL_GROUP, Prog, "deleting shadow group", - grp->gr_name, AUDIT_NO_ID, + user_name, AUDIT_NO_ID, SHADOW_AUDIT_SUCCESS); #endif /* WITH_AUDIT */ SYSLOG ((LOG_INFO, "removed shadow group '%s' owned by '%s'\n", - grp->gr_name, user_name)); + user_name, user_name)); } #endif /* SHADOWGRP */ |