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

* src/chgpasswd.c, src/chpasswd.c, src/newusers.c: Replace cflg by

Browse Source 
a test on crypt_method.
This commit is contained in:
nekral-guest 2011-08-14 14:44:35 +00:00
parent a9c38f4902
commit 1304a3106b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-14 Nicolas François <nicolas.francois@centraliens.net>
* src/chgpasswd.c, src/chpasswd.c, src/newusers.c: Replace cflg by
a test on crypt_method.
2011-08-14 Nicolas François <nicolas.francois@centraliens.net> 2011-08-14 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/chowndir.c: Add splint annotations. * libmisc/chowndir.c: Add splint annotations.

3
src/chgpasswd.c
View File

@ -58,7 +58,6 @@
* Global variables * Global variables
*/ */
const char *Prog; const char *Prog;
static bool cflg = false;
static bool eflg = false; static bool eflg = false;
static bool md5flg = false; static bool md5flg = false;
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
@ -66,6 +65,7 @@ static bool sflg = false;
#endif #endif
static /*@null@*//*@observer@*/const char *crypt_method = NULL; static /*@null@*//*@observer@*/const char *crypt_method = NULL;
#define cflg (NULL != crypt_method)
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
static long sha_rounds = 5000; static long sha_rounds = 5000;
#endif #endif
@ -174,7 +174,6 @@ static void process_flags (int argc, char **argv)
long_options, &option_index)) != -1) { long_options, &option_index)) != -1) {
switch (c) { switch (c) {
case 'c': case 'c':
cflg = true;
crypt_method = optarg; crypt_method = optarg;
break; break;
case 'e': case 'e':

3
src/chpasswd.c
View File

@ -55,7 +55,6 @@
* Global variables * Global variables
*/ */
const char *Prog; const char *Prog;
static bool cflg = false;
static bool eflg = false; static bool eflg = false;
static bool md5flg = false; static bool md5flg = false;
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
@ -63,6 +62,7 @@ static bool sflg = false;
#endif /* USE_SHA_CRYPT */ #endif /* USE_SHA_CRYPT */
static /*@null@*//*@observer@*/const char *crypt_method = NULL; static /*@null@*//*@observer@*/const char *crypt_method = NULL;
#define cflg (NULL != crypt_method)
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
static long sha_rounds = 5000; static long sha_rounds = 5000;
#endif /* USE_SHA_CRYPT */ #endif /* USE_SHA_CRYPT */
@ -170,7 +170,6 @@ static void process_flags (int argc, char **argv)
usage (E_SUCCESS); usage (E_SUCCESS);
/*@notreached@*/break; /*@notreached@*/break;
case 'c': case 'c':
cflg = true;
crypt_method = optarg; crypt_method = optarg;
break; break;
case 'e': case 'e':

3
src/newusers.c
View File

@ -74,8 +74,8 @@ const char *Prog;
static bool rflg = false; /* create a system account */ static bool rflg = false; /* create a system account */
#ifndef USE_PAM #ifndef USE_PAM
static bool cflg = false;
static /*@null@*//*@observer@*/char *crypt_method = NULL; static /*@null@*//*@observer@*/char *crypt_method = NULL;
#define cflg (NULL != crypt_method)
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
static bool sflg = false; static bool sflg = false;
static long sha_rounds = 5000; static long sha_rounds = 5000;
@ -556,7 +556,6 @@ static void process_flags (int argc, char **argv)
break; break;
#ifndef USE_PAM #ifndef USE_PAM
case 'c': case 'c':
cflg = true;
crypt_method = optarg; crypt_method = optarg;
break; break;
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT