[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu May 20 12:02:01 UTC 2021
The branch, master has been updated
via 170d2f85a19 gitlab-ci: Install devel files for tracker-sparql (spotlight backend)
via 73e68c38e74 s3:smbd: Initialize command for spools printer control
from 09fed102c58 s3:utils: Migrate tevent_glib_tracker to new cmdline option parser
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 170d2f85a19bb97d59be83c28d3304e6fb6b48df
Author: Andreas Schneider <asn at samba.org>
Date: Tue May 18 09:14:09 2021 +0200
gitlab-ci: Install devel files for tracker-sparql (spotlight backend)
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu May 20 12:01:06 UTC 2021 on sn-devel-184
commit 73e68c38e74a423f03a1f0c7e6a5bf47d5bdb01e
Author: Andreas Schneider <asn at samba.org>
Date: Wed May 19 18:32:27 2021 +0200
s3:smbd: Initialize command for spools printer control
./../source3/smbd/lanman.c: In function ‘api_WPrintQueueCtrl’:
../../source3/smbd/lanman.c:3342:9: error: ‘command’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 2 +-
bootstrap/config.py | 6 ++++++
bootstrap/generated-dists/centos8/bootstrap.sh | 1 +
bootstrap/generated-dists/centos8/packages.yml | 1 +
bootstrap/generated-dists/debian10/bootstrap.sh | 1 +
bootstrap/generated-dists/debian10/packages.yml | 1 +
bootstrap/generated-dists/fedora33/bootstrap.sh | 1 +
bootstrap/generated-dists/fedora33/packages.yml | 1 +
bootstrap/generated-dists/fedora34/bootstrap.sh | 1 +
bootstrap/generated-dists/fedora34/packages.yml | 1 +
bootstrap/generated-dists/opensuse151/bootstrap.sh | 1 +
bootstrap/generated-dists/opensuse151/packages.yml | 1 +
bootstrap/generated-dists/opensuse152/bootstrap.sh | 1 +
bootstrap/generated-dists/opensuse152/packages.yml | 1 +
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu1804/packages.yml | 1 +
bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu2004/packages.yml | 1 +
bootstrap/sha1sum.txt | 2 +-
source3/smbd/lanman.c | 2 +-
20 files changed, 25 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index af51a233561..1aee591b068 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: 66bfd3037078ebaa3395adfd563e8cc78d49d4d3
+ SAMBA_CI_CONTAINER_TAG: fa3eeb92fb5447524a057a4c377e6960dff626ce
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index bfd5b947d07..b5d04d4e371 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -163,6 +163,9 @@ PKGS = [
('glusterfs-common', 'glusterfs-devel'),
('libcephfs-dev', 'libcephfs-devel'),
+ # spotlight
+ ('libtracker-sparql-2.0-dev', 'tracker-devel'),
+
# misc
# @ means group for rpm, use fedora as rpm default
('build-essential', '@development-tools'),
@@ -401,6 +404,7 @@ DEB_DISTS = {
'glusterfs-common': '',
'libcephfs-dev': '',
'liburing-dev': '', # not available
+ 'libtracker-sparql-2.0-dev': '', # not available
}
},
'ubuntu1804': {
@@ -454,6 +458,7 @@ RPM_DISTS = {
'gnutls-devel': 'compat-gnutls34-devel',
'liburing-devel': '', # not available
'python3-setproctitle': 'python36-setproctitle',
+ 'tracker-devel': '', # do not install
}
},
'centos8': {
@@ -491,6 +496,7 @@ RPM_DISTS = {
'libsemanage-python': 'python3-libsemanage',
'policycoreutils-python': 'python3-policycoreutils',
'perl-FindBin': '',
+ 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
}
},
'opensuse151': {
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 131a62fa6a9..a3079982dda 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -111,6 +111,7 @@ yum install -y \
sudo \
systemd-devel \
tar \
+ tracker-devel \
tree \
wget \
which \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 54c80b53107..2994e81640a 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -91,6 +91,7 @@ packages:
- sudo
- systemd-devel
- tar
+ - tracker-devel
- tree
- wget
- which
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index 0bf5f6b50d2..84f5f6855b7 100755
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -68,6 +68,7 @@ apt-get -y install \
libsystemd-dev \
libtasn1-bin \
libtasn1-dev \
+ libtracker-sparql-2.0-dev \
libunwind-dev \
lmdb-utils \
locales \
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index f302831ee9a..32f37eeb013 100644
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -57,6 +57,7 @@ packages:
- libsystemd-dev
- libtasn1-bin
- libtasn1-dev
+ - libtracker-sparql-2.0-dev
- libunwind-dev
- lmdb-utils
- locales
diff --git a/bootstrap/generated-dists/fedora33/bootstrap.sh b/bootstrap/generated-dists/fedora33/bootstrap.sh
index 5d5e31aa534..106bd09ede8 100755
--- a/bootstrap/generated-dists/fedora33/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora33/bootstrap.sh
@@ -106,6 +106,7 @@ dnf install -y \
sudo \
systemd-devel \
tar \
+ tracker-devel \
tree \
wget \
which \
diff --git a/bootstrap/generated-dists/fedora33/packages.yml b/bootstrap/generated-dists/fedora33/packages.yml
index 1a291ab1ff6..9fa48ad4502 100644
--- a/bootstrap/generated-dists/fedora33/packages.yml
+++ b/bootstrap/generated-dists/fedora33/packages.yml
@@ -95,6 +95,7 @@ packages:
- sudo
- systemd-devel
- tar
+ - tracker-devel
- tree
- wget
- which
diff --git a/bootstrap/generated-dists/fedora34/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh
index 104aaa6c444..6686ab19250 100755
--- a/bootstrap/generated-dists/fedora34/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora34/bootstrap.sh
@@ -105,6 +105,7 @@ dnf install -y \
sudo \
systemd-devel \
tar \
+ tracker-devel \
tree \
wget \
which \
diff --git a/bootstrap/generated-dists/fedora34/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml
index a5b4e3dd544..1e488823dda 100644
--- a/bootstrap/generated-dists/fedora34/packages.yml
+++ b/bootstrap/generated-dists/fedora34/packages.yml
@@ -94,6 +94,7 @@ packages:
- sudo
- systemd-devel
- tar
+ - tracker-devel
- tree
- wget
- which
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index cc8aa11c95f..2271e2ea8b2 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -97,6 +97,7 @@ zypper --non-interactive install \
sudo \
systemd-devel \
tar \
+ tracker-devel \
tree \
wget \
which \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index b0f78414437..5710c60bd8b 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -85,6 +85,7 @@ packages:
- sudo
- systemd-devel
- tar
+ - tracker-devel
- tree
- wget
- which
diff --git a/bootstrap/generated-dists/opensuse152/bootstrap.sh b/bootstrap/generated-dists/opensuse152/bootstrap.sh
index e71d8157f82..ae766095a4d 100755
--- a/bootstrap/generated-dists/opensuse152/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh
@@ -99,6 +99,7 @@ zypper --non-interactive install \
sudo \
systemd-devel \
tar \
+ tracker-devel \
tree \
wget \
which \
diff --git a/bootstrap/generated-dists/opensuse152/packages.yml b/bootstrap/generated-dists/opensuse152/packages.yml
index 0010d0b415d..6bc1a137ca7 100644
--- a/bootstrap/generated-dists/opensuse152/packages.yml
+++ b/bootstrap/generated-dists/opensuse152/packages.yml
@@ -87,6 +87,7 @@ packages:
- sudo
- systemd-devel
- tar
+ - tracker-devel
- tree
- wget
- which
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 7f42512c2b8..f35c8fa90ea 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -69,6 +69,7 @@ apt-get -y install \
libsystemd-dev \
libtasn1-bin \
libtasn1-dev \
+ libtracker-sparql-2.0-dev \
libunwind-dev \
lmdb-utils \
locales \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 4711b7ce996..bff014dbb7e 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -58,6 +58,7 @@ packages:
- libsystemd-dev
- libtasn1-bin
- libtasn1-dev
+ - libtracker-sparql-2.0-dev
- libunwind-dev
- lmdb-utils
- locales
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 7f42512c2b8..f35c8fa90ea 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -69,6 +69,7 @@ apt-get -y install \
libsystemd-dev \
libtasn1-bin \
libtasn1-dev \
+ libtracker-sparql-2.0-dev \
libunwind-dev \
lmdb-utils \
locales \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 4711b7ce996..bff014dbb7e 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -58,6 +58,7 @@ packages:
- libsystemd-dev
- libtasn1-bin
- libtasn1-dev
+ - libtracker-sparql-2.0-dev
- libunwind-dev
- lmdb-utils
- locales
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index e2800636e59..e198e6b80ae 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-66bfd3037078ebaa3395adfd563e8cc78d49d4d3
+fa3eeb92fb5447524a057a4c377e6960dff626ce
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 92239273c15..9194113e768 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -3260,7 +3260,7 @@ static bool api_WPrintQueueCtrl(struct smbd_server_connection *sconn,
struct spoolss_SetPrinterInfoCtr info_ctr;
struct spoolss_DevmodeContainer devmode_ctr;
struct sec_desc_buf secdesc_ctr;
- enum spoolss_PrinterControl command;
+ enum spoolss_PrinterControl command = SPOOLSS_PRINTER_CONTROL_UNPAUSE;
if (!str1 || !str2 || !QueueName) {
return False;
--
Samba Shared Repository
More information about the samba-cvs
mailing list