From 97f412627d3751438d952a797c957770a0402ff2 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 24 Aug 2009 20:16:11 +0200 Subject: [PATCH 06/17] In main(), rename salt to salt_size and don't bother reading info.salt which we don't use anyway. --- src/crypt.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/crypt.c b/src/crypt.c index e7e872d..a9b71d2 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -394,7 +394,7 @@ main (int argc, char **argv) { gaainfo info; const char *passwd; - int salt, ret; + int salt_size, ret; struct passwd *pwd; set_program_name (argv[0]); @@ -413,8 +413,6 @@ main (int argc, char **argv) return -1; } - salt = info.salt; - if (info.create_conf != NULL) { return generate_create_conf (info.create_conf); @@ -443,7 +441,7 @@ main (int argc, char **argv) #endif } - salt = 16; + salt_size = 16; passwd = getpass ("Enter password: "); if (passwd == NULL) @@ -460,7 +458,7 @@ main (int argc, char **argv) } - return crypt_int (info.username, passwd, salt, + return crypt_int (info.username, passwd, salt_size, info.passwd_conf, info.passwd, info.index); } -- 1.6.4.1