Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34da5d33a7 | ||
|
|
7cb002740e | ||
|
|
722aa4fe5d | ||
|
|
fedc2a1b0e | ||
|
|
2c8a615de8 | ||
|
|
dd6b3aef42 | ||
|
|
96217bc397 | ||
|
|
c4a5471eb4 | ||
|
|
fedf403593 | ||
|
|
25cc566bb6 | ||
|
|
10ecbe5f7b |
3 changed files with 4 additions and 69 deletions
|
|
@ -1,63 +0,0 @@
|
|||
From 56d8c64eef9f5bfa5d9fd683718c9d13acaaa25c Mon Sep 17 00:00:00 2001
|
||||
From: Michael Tokarev <mjt@tls.msk.ru>
|
||||
Date: Wed, 21 Jan 2026 10:35:15 +0530
|
||||
Subject: [PATCH] printing: Fix compilation error for native 32-bit time_t
|
||||
|
||||
commit#e9a7dce599eb12d broke samba compilation for 32-bit time_t.
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15976
|
||||
Used correct pointer type to fix the warning to fix compialtion.
|
||||
|
||||
Pair-Programmed-With: Vinit Agnihotri <vagnihot@redhat.com>
|
||||
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||||
Signed-off-by: Vinit Agnihotri <vagnihot@redhat.com>
|
||||
---
|
||||
source3/printing/printing.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
|
||||
index a9e8422efab..bcfd893456b 100644
|
||||
--- a/source3/printing/printing.c
|
||||
+++ b/source3/printing/printing.c
|
||||
@@ -59,6 +59,7 @@ static int fetch_share_cache_time(const char *key_name,
|
||||
time_t *curr_time)
|
||||
{
|
||||
char *key = NULL;
|
||||
+ int64_t curr_time64 = -1;
|
||||
|
||||
key = talloc_asprintf(NULL, "%s/%s", key_name, sharename);
|
||||
if (key == NULL) {
|
||||
@@ -66,11 +67,12 @@ static int fetch_share_cache_time(const char *key_name,
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if (tdb_fetch_int64(tdb, key, curr_time) != 0) {
|
||||
+ if (tdb_fetch_int64(tdb, key, &curr_time64) != 0) {
|
||||
DBG_ERR("No timing record found for[%s]!\n", sharename);
|
||||
TALLOC_FREE(key);
|
||||
return -1;
|
||||
}
|
||||
+ *curr_time = curr_time64;
|
||||
|
||||
TALLOC_FREE(key);
|
||||
return 0;
|
||||
@@ -82,6 +84,7 @@ static int update_share_cache_time(const char *key_name,
|
||||
time_t curr_time)
|
||||
{
|
||||
char *key = NULL;
|
||||
+ int64_t curr_time64 = curr_time;
|
||||
|
||||
key = talloc_asprintf(NULL, "%s/%s", key_name, sharename);
|
||||
if (key == NULL) {
|
||||
@@ -89,7 +92,7 @@ static int update_share_cache_time(const char *key_name,
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if (tdb_store_int64(tdb, key, (int64_t)curr_time) != 0) {
|
||||
+ if (tdb_store_int64(tdb, key, curr_time64) != 0) {
|
||||
DBG_ERR("Unable to update print cache for %s\n", sharename);
|
||||
TALLOC_FREE(key);
|
||||
return -1;
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
%bcond varlink 0
|
||||
%endif
|
||||
|
||||
%global samba_version 4.24.0
|
||||
%global samba_version 4.24.7
|
||||
|
||||
# The release field is extended:
|
||||
# <pkgrel>[.<extraver>][.<snapinfo>]%%{?dist}[.<minorbump>]
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
# default is 1).
|
||||
%global samba_release %autorelease
|
||||
|
||||
%global pre_release rc1
|
||||
%global pre_release %nil
|
||||
%if "x%{?pre_release}" != "x"
|
||||
%global samba_release %autorelease -p -e %pre_release
|
||||
%endif
|
||||
|
|
@ -239,8 +239,6 @@ Source18: samba-winbind-systemd-sysusers.conf
|
|||
Source201: README.downgrade
|
||||
Source202: samba.abignore
|
||||
|
||||
Patch0: 0001-printing-Fix-compilation-error-for-native-32-bit-tim.patch
|
||||
|
||||
Requires(pre): %{name}-common = %{samba_depver}
|
||||
Requires: %{name}-common = %{samba_depver}
|
||||
Requires: %{name}-ndr-libs = %{samba_depver}
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (samba-4.24.0rc1.tar.xz) = 05109431874e70fc110626a8233df70f84cb2b61a594227d2327b516f25e1865dda6ecf5830fac2489fc43e8fbbf629f6cf7ec88763e73702b1edc257b78f086
|
||||
SHA512 (samba-4.24.0rc1.tar.asc) = edbaeb47dcceaedf6eac28c44fade6534d580f647fde15cb9ff2b6ffb3bede991803fb8c61d75d0c06f7051a150a5a18bbabd963cdfb7fe4fa91ad3c8ce501ab
|
||||
SHA512 (samba-4.24.7.tar.xz) = dc76aae77de0231894de6a5fa09e0caeb3825affa726784da0da6cf72463986c1761ea0e399897bbd09fecc26fb7839b4b37b8fea7f8c227194471b293e1f85b
|
||||
SHA512 (samba-4.24.7.tar.asc) = d623f9b549f60c8f93705c4875db4b66f914bba0ce5b0e9f718d623ec206d9c738ad51da012b48cec55281ec180e9fae44dc3eda16455933141767e5309fcc32
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue