From 234f9365b93b267f5a42dcc75512f08ccfb840c8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 30 Nov 2012 12:07:39 +0100 Subject: [PATCH] s3:popt_common: Fix password processing. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Fri Nov 30 14:01:08 CET 2012 on sn-devel-104 --- source3/lib/popt_common.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index c07283925b8..1ec861906c4 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -515,15 +515,6 @@ static void popt_common_credentials_callback(poptContext con, exit(ENOMEM); } set_cmdline_auth_info_username(auth_info, puser); - - if ((p = strchr_m(puser,'%'))) { - size_t len; - *p = 0; - len = strlen(p+1); - set_cmdline_auth_info_password(auth_info, p+1); - memset(strchr_m(getenv("USER"),'%')+1,'X',len); - } - SAFE_FREE(puser); } if (getenv("PASSWD")) { @@ -546,13 +537,13 @@ static void popt_common_credentials_callback(poptContext con, if ((lp=strchr_m(puser,'%'))) { size_t len; - *lp = 0; + *lp = '\0'; set_cmdline_auth_info_username(auth_info, puser); set_cmdline_auth_info_password(auth_info, lp+1); len = strlen(lp+1); - memset(strchr_m(arg,'%')+1,'X',len); + memset(lp + 1, '\0', len); } else { set_cmdline_auth_info_username(auth_info, puser); -- 2.11.4.GIT