Page MenuHomeFreeBSD
Files F108321777

D45096.diff
No OneTemporary
Actions

D45096.diff
View Options

diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h
--- a/usr.sbin/pw/pw.h
+++ b/usr.sbin/pw/pw.h
@@ -36,14 +36,14 @@
enum _mode
{
- M_ADD,
- M_DELETE,
- M_UPDATE,
- M_PRINT,
+ M_ADD,
+ M_DELETE,
+ M_MODIFY,
+ M_SHOW,
M_NEXT,
M_LOCK,
M_UNLOCK,
- M_NUM
+ M_NUM
};
enum _passmode
@@ -56,13 +56,13 @@
enum _which
{
- W_USER,
- W_GROUP,
- W_NUM
+ W_USER,
+ W_GROUP,
+ W_NUM
};
-#define _DEF_DIRMODE (S_IRWXU | S_IRWXG | S_IRWXO)
-#define _PW_CONF "pw.conf"
+#define _DEF_DIRMODE (S_IRWXU | S_IRWXG | S_IRWXO)
+#define _PW_CONF "pw.conf"
#define _UC_MAXLINE 1024
#define _UC_MAXSHELLS 32
diff --git a/usr.sbin/pw/pw_group.c b/usr.sbin/pw/pw_group.c
--- a/usr.sbin/pw/pw_group.c
+++ b/usr.sbin/pw/pw_group.c
@@ -697,11 +697,11 @@
if ((grp = GETGRNAM(name)) == NULL)
errx(EX_SOFTWARE, "group disappeared during update");
- pw_log(cnf, M_UPDATE, W_GROUP, "%s(%ju)", grp->gr_name,
+ pw_log(cnf, M_MODIFY, W_GROUP, "%s(%ju)", grp->gr_name,
(uintmax_t)grp->gr_gid);
if (nis && nis_update() == 0)
- pw_log(cnf, M_UPDATE, W_GROUP, "NIS maps updated");
+ pw_log(cnf, M_MODIFY, W_GROUP, "NIS maps updated");
return (EXIT_SUCCESS);
}
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -146,7 +146,7 @@
copymkdir(conf.rootfd, pwd->pw_dir, skelfd, homemode, pwd->pw_uid,
pwd->pw_gid, 0);
- pw_log(cnf, update ? M_UPDATE : M_ADD, W_USER, "%s(%ju) home %s made",
+ pw_log(cnf, update ? M_MODIFY : M_ADD, W_USER, "%s(%ju) home %s made",
pwd->pw_name, (uintmax_t)pwd->pw_uid, pwd->pw_dir);
}
@@ -1787,7 +1787,7 @@
if (pwd == NULL)
errx(EX_NOUSER, "user '%s' disappeared during update", name);
grp = GETGRGID(pwd->pw_gid);
- pw_log(cnf, M_UPDATE, W_USER, "%s(%ju):%s(%ju):%s:%s:%s",
+ pw_log(cnf, M_MODIFY, W_USER, "%s(%ju):%s(%ju):%s:%s:%s",
pwd->pw_name, (uintmax_t)pwd->pw_uid,
grp ? grp->gr_name : "unknown",
(uintmax_t)(grp ? grp->gr_gid : (uid_t)-1),
@@ -1808,7 +1808,7 @@
}
if (nis && nis_update() == 0)
- pw_log(cnf, M_UPDATE, W_USER, "NIS maps updated");
+ pw_log(cnf, M_MODIFY, W_USER, "NIS maps updated");
return (EXIT_SUCCESS);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 24, 8:43 PM (20 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16102632
Default Alt Text
D45096.diff (2 KB)

Event Timeline