Skip to contentSkip to conversation

Don't look for 'stdin' file when using --auth-user-pass

PATCH In review David Sommerseth 3 participants 3 messages Dec 2, 2011 – Dec 8, 2011

lore
Share & tools
lore

David Sommerseth

author
#0 lore raw

PATCH 1/1 Don't look for 'stdin' file when using --auth-user-pass

This argument allows the keyword 'stdin' to indicate that the input is to be read from the stdin. Don't check for file existence if the file name is set to 'stdin'

Signed-off-by David Sommerseth <[email protected]...>
---
 options.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
options.c +3 -2
index 28296a5..3a819c9 100644
@@ -2688,8 +2688,9 @@ options_postprocess_filechecks (struct options *options)
   errs |= check_file_access (CHKACC_FILE, options->management_user_pass, R_OK,
                              "--management user/password file");
 #endif /* ENABLE_MANAGEMENT */
-  errs |= check_file_access (CHKACC_FILE, options->auth_user_pass_file, R_OK,
-                             "--auth-user-pass");
+  if( options->auth_user_pass_file && strcmp(options->auth_user_pass_file, "stdin") != 0 )
+    errs |= check_file_access (CHKACC_FILE, options->auth_user_pass_file, R_OK,
+                               "--auth-user-pass");
 
 
   /* ** System related ** */
Signature · 1 line
1.7.4.4
#1 lore raw

Hi,

Quoted 3 lines · David Sommerseth

This argument allows the keyword 'stdin' to indicate that the input is to be read from the stdin. Don't check for file existence if the file name is set to 'stdin'

ACK.

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...
#2 lore raw
In reply to David Sommerseth

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 7 lines · David Sommerseth

This argument allows the keyword 'stdin' to indicate that the input is to be read from the stdin. Don't check for file existence if the file name is set to 'stdin'

Signed-off-by David Sommerseth <[email protected]...> --- options.c |

5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

Applied and pushed out to -testing and -stable master branches.

commit 870cf166add7ea0aa15c9d12b7916e669a9f441f

Author: David Sommerseth <[email protected]...>
Date:   Fri Dec 2 16:32:56 2011 +0100
    Signed-off-by: David Sommerseth <[email protected]...>
    Acked-by: Gert Doering <[email protected]...>

Kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk7gAzoACgkQDC186MBRfrrEZACfdekwNa5Vkxx68fMvnLD75+v0 FkQAn0FjLR5Pihduhva/oPuVzQhratnL
=Zui4
-----END PGP SIGNATURE-----