[Pkg-shadow-commits] r1567 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Mon Dec 31 04:57:54 UTC 2007
Author: nekral-guest
Date: 2007-12-31 04:57:54 +0000 (Mon, 31 Dec 2007)
New Revision: 1567
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/chgpasswd.c
upstream/trunk/src/chpasswd.c
upstream/trunk/src/newusers.c
Log:
* src/newusers.c: Compilation fix for PAM support (pamh needs to be
global since the function split).
* src/chpasswd.c: Likewise.
* src/chgpasswd.c: Likewise.
* src/chpasswd.c: Avoid implicit conversions to booleans.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2007-12-31 04:34:10 UTC (rev 1566)
+++ upstream/trunk/ChangeLog 2007-12-31 04:57:54 UTC (rev 1567)
@@ -1,5 +1,13 @@
2007-12-31 Nicolas François <nicolas.francois at centraliens.net>
+ * src/newusers.c: Compilation fix for PAM support (pamh needs to be
+ global since the function split).
+ * src/chpasswd.c: Likewise.
+ * src/chgpasswd.c: Likewise.
+ * src/chpasswd.c: Avoid implicit conversions to booleans.
+
+2007-12-31 Nicolas François <nicolas.francois at centraliens.net>
+
* src/chage.c: Fix typo: s/maximim/maximum/
* src/chage.c: New function: fail_exit(). Change most of the exit()
to a fail_exit, which makes sure the files are unlocked (new global
Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c 2007-12-31 04:34:10 UTC (rev 1566)
+++ upstream/trunk/src/chgpasswd.c 2007-12-31 04:57:54 UTC (rev 1567)
@@ -62,6 +62,10 @@
static int is_shadow_grp;
#endif
+#ifdef USE_PAM
+static pam_handle_t *pamh = NULL;
+#endif
+
/* local function prototypes */
static void usage (void);
static void process_flags (int argc, char **argv);
@@ -214,10 +218,9 @@
static void check_perms (void)
{
#ifdef USE_PAM
- pam_handle_t *pamh = NULL;
int retval = PAM_SUCCESS;
+ struct passwd *pampw;
- struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (pampw == NULL) {
retval = PAM_USER_UNKNOWN;
Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c 2007-12-31 04:34:10 UTC (rev 1566)
+++ upstream/trunk/src/chpasswd.c 2007-12-31 04:57:54 UTC (rev 1567)
@@ -59,6 +59,10 @@
static int is_shadow_pwd;
+#ifdef USE_PAM
+static pam_handle_t *pamh = NULL;
+#endif
+
/* local function prototypes */
static void usage (void);
static void process_flags (int argc, char **argv);
@@ -164,7 +168,7 @@
*
* It will not return if an error is encountered.
*/
-static void check_flags ()
+static void check_flags (void)
{
if (sflg && !cflg) {
fprintf (stderr,
@@ -211,7 +215,6 @@
static void check_perms (void)
{
#ifdef USE_PAM
- pam_handle_t *pamh = NULL;
int retval = PAM_SUCCESS;
struct passwd *pampw;
@@ -254,11 +257,11 @@
* Lock the password file and open it for reading and writing. This
* will bring all of the entries into memory where they may be updated.
*/
- if (!pw_lock ()) {
+ if (pw_lock () == 0) {
fprintf (stderr, _("%s: can't lock password file\n"), Prog);
exit (1);
}
- if (!pw_open (O_RDWR)) {
+ if (pw_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: can't open password file\n"), Prog);
pw_unlock ();
exit (1);
@@ -266,13 +269,13 @@
/* Do the same for the shadowed database, if it exist */
if (is_shadow_pwd) {
- if (!spw_lock ()) {
+ if (spw_lock () == 0) {
fprintf (stderr, _("%s: can't lock shadow file\n"),
Prog);
pw_unlock ();
exit (1);
}
- if (!spw_open (O_RDWR)) {
+ if (spw_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: can't open shadow file\n"),
Prog);
pw_unlock ();
@@ -288,7 +291,7 @@
static void close_files (void)
{
if (is_shadow_pwd) {
- if (!spw_close ()) {
+ if (spw_close () == 0) {
fprintf (stderr,
_("%s: error updating shadow file\n"), Prog);
pw_unlock ();
@@ -297,12 +300,11 @@
spw_unlock ();
}
- if (!pw_close ()) {
+ if (pw_close () == 0) {
fprintf (stderr, _("%s: error updating password file\n"), Prog);
exit (1);
}
pw_unlock ();
-
}
int main (int argc, char **argv)
@@ -400,7 +402,7 @@
* already exist.
*/
pw = pw_locate (name);
- if (!pw) {
+ if (NULL == pw) {
fprintf (stderr,
_("%s: line %d: unknown user %s\n"), Prog,
line, name);
@@ -418,7 +420,7 @@
* user's password file entry and the last password change
* date is set to the current date.
*/
- if (sp) {
+ if (NULL != sp) {
newsp = *sp;
newsp.sp_pwdp = cp;
newsp.sp_lstchg = now;
@@ -432,7 +434,7 @@
* be written to the password file later, after all the
* other entries have been updated as well.
*/
- if (sp) {
+ if (NULL != sp) {
ok = spw_update (&newsp);
} else {
ok = pw_update (&newpw);
Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c 2007-12-31 04:34:10 UTC (rev 1566)
+++ upstream/trunk/src/newusers.c 2007-12-31 04:57:54 UTC (rev 1567)
@@ -70,6 +70,10 @@
static int is_shadow_grp;
#endif
+#ifdef USE_PAM
+static pam_handle_t *pamh = NULL;
+#endif
+
/* local function prototypes */
static void usage (void);
static int add_group (const char *, const char *, gid_t *);
@@ -484,7 +488,6 @@
static void check_perms (void)
{
#ifdef USE_PAM
- pam_handle_t *pamh = NULL;
int retval = PAM_SUCCESS;
struct passwd *pampw;
More information about the Pkg-shadow-commits
mailing list