sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

BUG 1088: patch from SATOH Fumiyasu <fumiya@miraclinux.com> -- use strchr_m() for query_host (smbclient -L)

Browse Source 
(This used to be commit bc6992c4bf)
This commit is contained in:
Gerald Carter 2004-03-11 14:39:32 +00:00
parent f2efeca274
commit 929b0b72d5
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source3/client/client.c
View File

@ -2846,27 +2846,6 @@ static int do_message_op(void)
}
/**
* Process "-L hostname" option.
*
* We don't actually do anything yet -- we just stash the name in a
* global variable and do the query when all options have been read.
**/
static void remember_query_host(const char *arg,
pstring query_host)
{
char *slash;
while (*arg == '\\' || *arg == '/')
arg++;
pstrcpy(query_host, arg);
if ((slash = strchr(query_host, '/'))
|| (slash = strchr(query_host, '\\'))) {
*slash = 0;
}
}
/****************************************************************************
main program
****************************************************************************/
@ -2961,7 +2940,7 @@ static void remember_query_host(const char *arg,
break;
case 'L':
remember_query_host(poptGetOptArg(pc), query_host);
pstrcpy(query_host, poptGetOptArg(pc));
break;
case 't':
pstrcpy(term_code, poptGetOptArg(pc));
@ -3069,14 +3048,25 @@ static void remember_query_host(const char *arg,
return do_tar_op(base_directory);
}
if ((p=strchr_m(query_host,'#'))) {
*p = 0;
p++;
sscanf(p, "%x", &name_type);
}
if (*query_host) {
return do_host_query(query_host);
char *qhost = query_host;
char *slash;
while (*qhost == '\\' || *qhost == '/')
qhost++;
if ((slash = strchr_m(qhost, '/'))
|| (slash = strchr_m(qhost, '\\'))) {
*slash = 0;
}
if ((p=strchr_m(qhost, '#'))) {
*p = 0;
p++;
sscanf(p, "%x", &name_type);
}
return do_host_query(qhost);
}
if (message) {