diff options
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 24 | ||||
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 6f1c40c472..f9a914326f 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -71,19 +71,19 @@ static void popt_common_credentials_callback(poptContext con, switch(opt->val) { case 'U': - { - char *lp; - - cli_credentials_parse_string(cmdline_credentials, arg, CRED_SPECIFIED); - /* This breaks the abstraction, including the const above */ - if ((lp=strchr_m(arg,'%'))) { - lp[0]='\0'; - lp++; - /* Try to prevent this showing up in ps */ - memset(lp,0,strlen(lp)); - } + { + char *lp; + + cli_credentials_parse_string(cmdline_credentials, arg, CRED_SPECIFIED); + /* This breaks the abstraction, including the const above */ + if ((lp=strchr_m(arg,'%'))) { + lp[0]='\0'; + lp++; + /* Try to prevent this showing up in ps */ + memset(lp,0,strlen(lp)); } - break; + } + break; case OPT_PASSWORD: cli_credentials_set_password(cmdline_credentials, arg, CRED_SPECIFIED); diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 185e9a3438..c0311ec94f 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -186,7 +186,7 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, DEBUG(5, ("CIFS backend: Using delegated credentials\n")); credentials = req->session_info->credentials; } else { - DEBUG(1,("CIFS backend: You must supply server, user and password and or have delegated credentials\n")); + DEBUG(1,("CIFS backend: NO delegated credentials found: You must supply server, user and password or the client must supply delegated credentials\n")); return NT_STATUS_INVALID_PARAMETER; } |