emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Re-indent, reformat #ifndef blocks.

Browse Source
This commit is contained in:
nekral-guest 2009-04-28 20:55:10 +00:00
parent 59e1947950
commit 1db4402dbb
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/passwd.c
View File

@ -46,7 +46,7 @@
#include <selinux/flask.h> #include <selinux/flask.h>
#include <selinux/av_permissions.h> #include <selinux/av_permissions.h>
#include <selinux/context.h> #include <selinux/context.h>
#endif #endif /* WITH_SELINUX */
#include <time.h> #include <time.h>
#include "defines.h" #include "defines.h"
#include "getdef.h" #include "getdef.h"
@ -101,7 +101,7 @@ static long inact = 0; /* Days without change before locked */
#ifndef USE_PAM #ifndef USE_PAM
static bool do_update_age = false; static bool do_update_age = false;
#endif #endif /* ! USE_PAM */
static bool pw_locked = false; static bool pw_locked = false;
static bool spw_locked = false; static bool spw_locked = false;
@ -122,7 +122,7 @@ static bool spw_locked = false;
*/ */
static char crypt_passwd[256]; static char crypt_passwd[256];
static bool do_update_pwd = false; static bool do_update_pwd = false;
#endif #endif /* !USE_PAM */
/* /*
* External identifiers * External identifiers
@ -151,7 +151,7 @@ static void update_shadow (void);
static int check_selinux_access (const char *changed_user, static int check_selinux_access (const char *changed_user,
uid_t changed_uid, uid_t changed_uid,
access_vector_t requested_access); access_vector_t requested_access);
#endif #endif /* WITH_SELINUX */
/* /*
* usage - print command usage and exit * usage - print command usage and exit
@ -192,16 +192,16 @@ static int reuse (const char *pass, const struct passwd *pw)
const char *FascistHistoryPw (const char *, const struct passwd *); const char *FascistHistoryPw (const char *, const struct passwd *);
reason = FascistHistory (pass, pw); reason = FascistHistory (pass, pw);
#else #else /* !HAVE_LIBCRACK_PW */
const char *FascistHistory (const char *, int); const char *FascistHistory (const char *, int);
reason = FascistHistory (pass, pw->pw_uid); reason = FascistHistory (pass, pw->pw_uid);
#endif #endif /* !HAVE_LIBCRACK_PW */
if (NULL != reason) { if (NULL != reason) {
printf (_("Bad password: %s. "), reason); printf (_("Bad password: %s. "), reason);
return 1; return 1;
} }
#endif #endif /* HAVE_LIBCRACK_HIST */
return 0; return 0;
} }
@ -223,7 +223,7 @@ static int new_password (const struct passwd *pw)
#ifdef HAVE_LIBCRACK_HIST #ifdef HAVE_LIBCRACK_HIST
int HistUpdate (const char *, const char *); int HistUpdate (const char *, const char *);
#endif #endif /* HAVE_LIBCRACK_HIST */
/* /*
* Authenticate the user. The user will be prompted for their own * Authenticate the user. The user will be prompted for their own
@ -268,7 +268,7 @@ static int new_password (const struct passwd *pw)
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
|| (strcmp (method, "SHA256") == 0) || (strcmp (method, "SHA256") == 0)
|| (strcmp (method, "SHA512") == 0) || (strcmp (method, "SHA512") == 0)
#endif #endif /* USE_SHA_CRYPT */
) { ) {
pass_max_len = -1; pass_max_len = -1;
} else { } else {
@ -345,7 +345,7 @@ static int new_password (const struct passwd *pw)
#ifdef HAVE_LIBCRACK_HIST #ifdef HAVE_LIBCRACK_HIST
HistUpdate (pw->pw_name, crypt_passwd); HistUpdate (pw->pw_name, crypt_passwd);
#endif #endif /* HAVE_LIBCRACK_HIST */
STRFCPY (crypt_passwd, cp); STRFCPY (crypt_passwd, cp);
return 0; return 0;
} }
@ -434,10 +434,10 @@ static char *date_to_str (time_t t)
tm = gmtime (&t); tm = gmtime (&t);
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
strftime (buf, sizeof buf, "%m/%d/%Y", tm); strftime (buf, sizeof buf, "%m/%d/%Y", tm);
#else #else /* !HAVE_STRFTIME */
snprintf (buf, sizeof buf, "%02d/%02d/%04d", snprintf (buf, sizeof buf, "%02d/%02d/%04d",
tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900); tm->tm_mon + 1, tm->tm_mday, tm->tm_year + 1900);
#endif #endif /* !HAVE_STRFTIME */
return buf; return buf;
} }
@ -508,7 +508,7 @@ static char *update_crypt_pw (char *cp)
if (do_update_pwd) { if (do_update_pwd) {
cp = insert_crypt_passwd (cp, crypt_passwd); cp = insert_crypt_passwd (cp, crypt_passwd);
} }
#endif #endif /* !USE_PAM */
if (dflg) { if (dflg) {
*cp = '\0'; *cp = '\0';
@ -644,7 +644,7 @@ static void update_shadow (void)
nsp->sp_lstchg = -1; nsp->sp_lstchg = -1;
} }
} }
#endif #endif /* !USE_PAM */
/* /*
* Force change on next login, like SunOS 4.x passwd -e or Solaris * Force change on next login, like SunOS 4.x passwd -e or Solaris
@ -723,7 +723,7 @@ static int check_selinux_access (const char *changed_user,
return status; return status;
} }
#endif #endif /* WITH_SELINUX */
/* /*
* passwd - change a user's password file information * passwd - change a user's password file information
@ -762,7 +762,7 @@ int main (int argc, char **argv)
char *cp; /* Miscellaneous character pointing */ char *cp; /* Miscellaneous character pointing */
const struct spwd *sp; /* Shadow file entry for user */ const struct spwd *sp; /* Shadow file entry for user */
#endif #endif /* !USE_PAM */
(void) setlocale (LC_ALL, ""); (void) setlocale (LC_ALL, "");
(void) bindtextdomain (PACKAGE, LOCALEDIR); (void) bindtextdomain (PACKAGE, LOCALEDIR);
@ -808,8 +808,7 @@ int main (int argc, char **argv)
{NULL, 0, NULL, '\0'} {NULL, 0, NULL, '\0'}
}; };
while ((c = while ((c = getopt_long (argc, argv, "adei:kln:qr:Suw:x:",
getopt_long (argc, argv, "adei:kln:qr:Suw:x:",
long_options, &option_index)) != -1) { long_options, &option_index)) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
@ -1113,6 +1112,6 @@ int main (int argc, char **argv)
} }
} }
exit (E_SUCCESS); exit (E_SUCCESS);
/* NOT REACHED */ /*@notreached@*/
} }