* lib/groupio.c, lib/groupio.h, lib/pwio.c, lib/pwio.h,
lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h: Added *_dbname() functions to retrieve the name of the databases. * lib/groupio.c, lib/groupio.h, lib/pwio.c, lib/pwio.h, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h: *_name() functions renamed *setname(). * src/grpck.c, src/pwck.c: Likewise. * lib/groupio.h, lib/pwio.h, lib/sgroupio.h, lib/shadowio.h: Added the name of the arguments to the prototypes. * src/chage, src/chfn.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/useradd.c, src/userdel.c, src/usermod.c: Harmonize the erro & syslog messages in case of failure of the *_lock(), *_open(), *_close(), *_unlock(), *_remove() functions. * src/chgpasswd.c, src/chpasswd.c, src/usermod.c: Avoid capitalized messages. * src/chpasswd.c, src/useradd.c, src/usermod.c: Harmonize messages in case of inexistent entries. * src/usermod.c: Harmonize messages in case of already existing entries. * src/newusers.c, src/useradd.c: Simplify PAM error handling. * src/useradd.c: Report failures to unlock files (stderr, syslog, and audit). But do not fail (continue). * src/useradd.c (open_files): Do not report to syslog & audit failures to lock or open the databases. This might be harmless, and the logs were not already informed that a change was requested. * src/usermod.c: It's not the account which is unlocked, but its password.
This commit is contained in:
@ -126,11 +126,16 @@ static struct commonio_db group_db = {
|
||||
false /* readonly */
|
||||
};
|
||||
|
||||
int gr_name (const char *filename)
|
||||
int gr_setdbname (const char *filename)
|
||||
{
|
||||
return commonio_setname (&group_db, filename);
|
||||
}
|
||||
|
||||
const char *gr_dbname (void)
|
||||
{
|
||||
return group_db.filename;
|
||||
}
|
||||
|
||||
int gr_lock (void)
|
||||
{
|
||||
return commonio_lock (&group_db);
|
||||
|
@ -38,16 +38,17 @@
|
||||
#include <grp.h>
|
||||
|
||||
extern int gr_close (void);
|
||||
extern const struct group *gr_locate (const char *);
|
||||
extern const struct group *gr_locate (const char *name);
|
||||
extern const struct group *gr_locate_gid (gid_t gid);
|
||||
extern int gr_lock (void);
|
||||
extern int gr_name (const char *);
|
||||
extern int gr_setdbname (const char *filename);
|
||||
extern const char *gr_dbname (void);
|
||||
extern const struct group *gr_next (void);
|
||||
extern int gr_open (int);
|
||||
extern int gr_remove (const char *);
|
||||
extern int gr_open (int mode);
|
||||
extern int gr_remove (const char *name);
|
||||
extern int gr_rewind (void);
|
||||
extern int gr_unlock (void);
|
||||
extern int gr_update (const struct group *);
|
||||
extern int gr_update (const struct group *gr);
|
||||
extern int gr_sort (void);
|
||||
|
||||
#endif
|
||||
|
@ -108,11 +108,16 @@ static struct commonio_db passwd_db = {
|
||||
false /* readonly */
|
||||
};
|
||||
|
||||
int pw_name (const char *filename)
|
||||
int pw_setdbname (const char *filename)
|
||||
{
|
||||
return commonio_setname (&passwd_db, filename);
|
||||
}
|
||||
|
||||
const char *pw_dbname (void)
|
||||
{
|
||||
return passwd_db.filename;
|
||||
}
|
||||
|
||||
int pw_lock (void)
|
||||
{
|
||||
return commonio_lock (&passwd_db);
|
||||
|
11
lib/pwio.h
11
lib/pwio.h
@ -37,16 +37,17 @@
|
||||
|
||||
#include <pwd.h>
|
||||
extern int pw_close (void);
|
||||
extern const struct passwd *pw_locate (const char *);
|
||||
extern const struct passwd *pw_locate (const char *name);
|
||||
extern const struct passwd *pw_locate_uid (uid_t uid);
|
||||
extern int pw_lock (void);
|
||||
extern int pw_name (const char *);
|
||||
extern int pw_setdbname (const char *filename);
|
||||
extern const char *pw_dbname (void);
|
||||
extern const struct passwd *pw_next (void);
|
||||
extern int pw_open (int);
|
||||
extern int pw_remove (const char *);
|
||||
extern int pw_open (int mode);
|
||||
extern int pw_remove (const char *name);
|
||||
extern int pw_rewind (void);
|
||||
extern int pw_unlock (void);
|
||||
extern int pw_update (const struct passwd *);
|
||||
extern int pw_update (const struct passwd *pw);
|
||||
extern int pw_sort (void);
|
||||
|
||||
#endif
|
||||
|
@ -161,11 +161,16 @@ static struct commonio_db gshadow_db = {
|
||||
false /* readonly */
|
||||
};
|
||||
|
||||
int sgr_name (const char *filename)
|
||||
int sgr_setdbname (const char *filename)
|
||||
{
|
||||
return commonio_setname (&gshadow_db, filename);
|
||||
}
|
||||
|
||||
const char *sgr_dbname (void)
|
||||
{
|
||||
return gshadow_db.filename;
|
||||
}
|
||||
|
||||
bool sgr_file_present (void)
|
||||
{
|
||||
return commonio_present (&gshadow_db);
|
||||
|
@ -37,15 +37,16 @@
|
||||
|
||||
extern int sgr_close (void);
|
||||
extern bool sgr_file_present (void);
|
||||
extern const struct sgrp *sgr_locate (const char *);
|
||||
extern const struct sgrp *sgr_locate (const char *name);
|
||||
extern int sgr_lock (void);
|
||||
extern int sgr_name (const char *);
|
||||
extern int sgr_setdbname (const char *filename);
|
||||
extern const char *sgr_dbname (void);
|
||||
extern const struct sgrp *sgr_next (void);
|
||||
extern int sgr_open (int);
|
||||
extern int sgr_remove (const char *);
|
||||
extern int sgr_open (int mode);
|
||||
extern int sgr_remove (const char *name);
|
||||
extern int sgr_rewind (void);
|
||||
extern int sgr_unlock (void);
|
||||
extern int sgr_update (const struct sgrp *);
|
||||
extern int sgr_update (const struct sgrp *sg);
|
||||
extern int sgr_sort (void);
|
||||
|
||||
#endif
|
||||
|
@ -105,11 +105,16 @@ static struct commonio_db shadow_db = {
|
||||
false /* readonly */
|
||||
};
|
||||
|
||||
int spw_name (const char *filename)
|
||||
int spw_setdbname (const char *filename)
|
||||
{
|
||||
return commonio_setname (&shadow_db, filename);
|
||||
}
|
||||
|
||||
const char *spw_dbname (void)
|
||||
{
|
||||
return shadow_db.filename;
|
||||
}
|
||||
|
||||
bool spw_file_present (void)
|
||||
{
|
||||
return commonio_present (&shadow_db);
|
||||
|
@ -38,15 +38,16 @@
|
||||
|
||||
extern int spw_close (void);
|
||||
extern bool spw_file_present (void);
|
||||
extern const struct spwd *spw_locate (const char *);
|
||||
extern const struct spwd *spw_locate (const char *name);
|
||||
extern int spw_lock (void);
|
||||
extern int spw_name (const char *);
|
||||
extern int spw_setdbname (const char *filename);
|
||||
extern const char *spw_dbname (void);
|
||||
extern const struct spwd *spw_next (void);
|
||||
extern int spw_open (int);
|
||||
extern int spw_remove (const char *);
|
||||
extern int spw_open (int mode);
|
||||
extern int spw_remove (const char *name);
|
||||
extern int spw_rewind (void);
|
||||
extern int spw_unlock (void);
|
||||
extern int spw_update (const struct spwd *);
|
||||
extern int spw_update (const struct spwd *sp);
|
||||
extern int spw_sort (void);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user