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

* src/newusers.c: Make sure the SHA related variables are not

Browse Source 
compiled when disabled at configuration time.
	* src/newusers.c: Added FIXME
This commit is contained in:
nekral-guest 2009-03-13 22:26:35 +00:00
parent f2c8017df4
commit e3e64317e8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-03-13 Nicolas François <nicolas.francois@centraliens.net>
* src/newusers.c: Make sure the SHA related variables are not
compiled when disabled at configuration time.
* src/newusers.c: Added FIXME
2009-03-13 Nicolas François <nicolas.francois@centraliens.net> 2009-03-13 Nicolas François <nicolas.francois@centraliens.net>
* src/gpasswd.c: Remove the documentation of options from the * src/gpasswd.c: Remove the documentation of options from the

14
src/newusers.c
View File

@ -71,10 +71,14 @@ char *Prog;
static bool cflg = false; static bool cflg = false;
static bool rflg = false; /* create a system account */ static bool rflg = false; /* create a system account */
#ifdef USE_SHA_CRYPT
static bool sflg = false; static bool sflg = false;
#endif
static char *crypt_method = NULL; static char *crypt_method = NULL;
#ifdef USE_SHA_CRYPT
static long sha_rounds = 5000; static long sha_rounds = 5000;
#endif
static bool is_shadow; static bool is_shadow;
#ifdef SHADOWGRP #ifdef SHADOWGRP
@ -236,6 +240,7 @@ static int add_group (const char *name, const char *gid, gid_t *ngid, uid_t uid)
grent.gr_name = xstrdup (gid); grent.gr_name = xstrdup (gid);
} else { } else {
grent.gr_name = xstrdup (name); grent.gr_name = xstrdup (name);
/* FIXME: check if the group exist */
} }
/* Check if this is a valid group name */ /* Check if this is a valid group name */
@ -364,9 +369,11 @@ static void update_passwd (struct passwd *pwd, const char *password)
{ {
void *crypt_arg = NULL; void *crypt_arg = NULL;
if (crypt_method != NULL) { if (crypt_method != NULL) {
#ifdef USE_SHA_CRYPT
if (sflg) { if (sflg) {
crypt_arg = &sha_rounds; crypt_arg = &sha_rounds;
} }
#endif
} }
if ((crypt_method != NULL) && (0 == strcmp(crypt_method, "NONE"))) { if ((crypt_method != NULL) && (0 == strcmp(crypt_method, "NONE"))) {
@ -387,9 +394,11 @@ static int add_passwd (struct passwd *pwd, const char *password)
struct spwd spent; struct spwd spent;
void *crypt_arg = NULL; void *crypt_arg = NULL;
if (crypt_method != NULL) { if (crypt_method != NULL) {
#ifdef USE_SHA_CRYPT
if (sflg) { if (sflg) {
crypt_arg = &sha_rounds; crypt_arg = &sha_rounds;
} }
#endif
} }
/* /*
@ -494,7 +503,7 @@ static void process_flags (int argc, char **argv)
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
case 's': case 's':
sflg = true; sflg = true;
if (!getlong(optarg, &sha_rounds)) { if (getlong(optarg, &sha_rounds) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: invalid numeric argument '%s'\n"), _("%s: invalid numeric argument '%s'\n"),
Prog, optarg); Prog, optarg);
@ -531,12 +540,14 @@ static void process_flags (int argc, char **argv)
*/ */
static void check_flags (void) static void check_flags (void)
{ {
#ifdef USE_SHA_CRYPT
if (sflg && !cflg) { if (sflg && !cflg) {
fprintf (stderr, fprintf (stderr,
_("%s: %s flag is only allowed with the %s flag\n"), _("%s: %s flag is only allowed with the %s flag\n"),
Prog, "-s", "-c"); Prog, "-s", "-c");
usage (); usage ();
} }
#endif
if (cflg) { if (cflg) {
if ( (0 != strcmp (crypt_method, "DES")) if ( (0 != strcmp (crypt_method, "DES"))
@ -908,6 +919,7 @@ int main (int argc, char **argv)
if ( ('\0' != newpw.pw_dir[0]) if ( ('\0' != newpw.pw_dir[0])
&& (access (newpw.pw_dir, F_OK) != 0)) { && (access (newpw.pw_dir, F_OK) != 0)) {
/* FIXME: should check for directory */
mode_t msk = 0777 & ~getdef_num ("UMASK", mode_t msk = 0777 & ~getdef_num ("UMASK",
GETDEF_DEFAULT_UMASK); GETDEF_DEFAULT_UMASK);
if (mkdir (newpw.pw_dir, msk) != 0) { if (mkdir (newpw.pw_dir, msk) != 0) {