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

Rename mdfind to mdsearch

Browse Source 
GNUstep as an mdfind binary, and both should be co-instalable.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14431

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Björn Baumbach <bb@sernet.de>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Mon Mar 29 16:18:54 UTC 2021 on sn-devel-184
This commit is contained in:
Mathieu Parent 2020-07-04 23:16:40 +02:00 committed by Ralph Boehme
parent 942c0d2128
commit 359c6bd210
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs-xml/manpages/mdfind.1.xml → docs-xml/manpages/mdsearch.1.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
<refentry id="mdfind.1">
<refentry id="mdsearch.1">
<refmeta>
<refentrytitle>mdfind</refentrytitle>
<refentrytitle>mdsearch</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">User Commands</refmiscinfo>
@ -11,7 +11,7 @@
</refmeta>
<refnamediv>
<refname>mdfind</refname>
<refname>mdsearch</refname>
<refpurpose>Run Spotlight searches against an SMB server</refpurpose>
</refnamediv>
@ -32,7 +32,7 @@
<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> suite.</para>
<para>mdfind is a simple utility to run Spotlight searches against an SMB server
<para>mdsearch is a simple utility to run Spotlight searches against an SMB server
that runs the Spotlight <emphasis>mdssvc</emphasis> RPC service.</para>
</refsect1>
@ -143,6 +143,6 @@
Andrew Tridgell. Samba is now developed by the Samba Team as an Open
Source project similar to the way the Linux kernel is developed.</para>
<para>The mdfind manpage was written by Ralph Boehme.</para>
<para>The mdsearch manpage was written by Ralph Boehme.</para>
</refsect1>
</refentry>

2
docs-xml/wscript_build
View File

@ -19,7 +19,7 @@ manpages='''
manpages/libsmbclient.7
manpages/lmhosts.5
manpages/log2pcap.1
manpages/mdfind.1
manpages/mdsearch.1
manpages/mvxattr.1
manpages/net.8
manpages/nmbd.8

10
python/samba/tests/blackbox/mdfind.py → python/samba/tests/blackbox/mdsearch.py
View File

@ -1,5 +1,5 @@
#
# Blackbox tests for mdfind
# Blackbox tests for mdsearch
#
# Copyright (C) Ralph Boehme 2019
#
@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
"""Blackbox test for mdfind"""
"""Blackbox test for mdsearch"""
import os
import time
@ -95,8 +95,8 @@ class MdfindBlackboxTests(BlackboxTestCase):
self.server.server_activate()
self.server.serve_forever()
def test_mdfind(self):
"""Simple blackbox test for mdfind"""
def test_mdsearch(self):
"""Simple blackbox test for mdsearch"""
username = os.environ["USERNAME"]
password = os.environ["PASSWORD"]
@ -123,7 +123,7 @@ class MdfindBlackboxTests(BlackboxTestCase):
self.server.json_in = json_in.replace("%BASEPATH%", self.sharepath)
self.server.json_out = json_out.replace("%BASEPATH%", self.sharepath)
output = self.check_output("mdfind -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
output = self.check_output("mdsearch -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
actual = output.decode('utf-8').splitlines()
expected = ["%s/%s" % (self.sharepath, file) for file in testfiles]

2
source3/utils/mdfind.c → source3/utils/mdsearch.c
View File

@ -90,7 +90,7 @@ int main(int argc, char **argv)
long_options,
POPT_CONTEXT_KEEP_FIRST);
poptSetOtherOptionHelp(pc, "mdfind [OPTIONS] <server> <share> <query>\n");
poptSetOtherOptionHelp(pc, "mdsearch [OPTIONS] <server> <share> <query>\n");
while ((opt = poptGetNextOpt(pc)) != -1) {
DBG_ERR("Invalid option %s: %s\n",

4
source3/utils/wscript_build
View File

@ -313,8 +313,8 @@ bld.SAMBA3_BINARY('smbstatus',
CONN_TDB
''')
bld.SAMBA3_BINARY('mdfind',
source='mdfind.c',
bld.SAMBA3_BINARY('mdsearch',
source='mdsearch.c',
deps='''
talloc
tevent

2
source4/selftest/tests.py
View File

@ -959,7 +959,7 @@ planoldpythontestsuite("ad_dc_ntvfs",
extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("none", "samba.tests.loadparm")
planoldpythontestsuite("fileserver",
"samba.tests.blackbox.mdfind",
"samba.tests.blackbox.mdsearch",
extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("fileserver",
"samba.tests.blackbox.smbcacls_basic")