Fix smbclient -N failures in container setups
Guenther
This commit is contained in:
parent
af2d47413b
commit
2eedc4de19
58
samba-4.15.2-smbclient_anonymous.patch
Normal file
58
samba-4.15.2-smbclient_anonymous.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
From 61fd63d70578043de9f3bff1c3267c499dbf50a0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Schneider <asn@samba.org>
|
||||||
|
Date: Wed, 10 Nov 2021 12:06:51 +0100
|
||||||
|
Subject: [PATCH] auth:creds: Guess the username first via getpwuid(my_id)
|
||||||
|
|
||||||
|
If we have a container, we often don't have USER or LOGNAME set.
|
||||||
|
|
||||||
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14883
|
||||||
|
|
||||||
|
Tested-by: Anoop C S <anoopcs@samba.org>
|
||||||
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
||||||
|
Reviewed-by: Stefan Metzmacher <metze@samba.org>
|
||||||
|
(cherry picked from commit c28be4067463e582e378df402f812e510883d606)
|
||||||
|
---
|
||||||
|
auth/credentials/credentials.c | 13 +++++++++++++
|
||||||
|
1 file changed, 13 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
|
||||||
|
index 02a3cf3b354..c5a6ba6940c 100644
|
||||||
|
--- a/auth/credentials/credentials.c
|
||||||
|
+++ b/auth/credentials/credentials.c
|
||||||
|
@@ -30,6 +30,7 @@
|
||||||
|
#include "tevent.h"
|
||||||
|
#include "param/param.h"
|
||||||
|
#include "system/filesys.h"
|
||||||
|
+#include "system/passwd.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new credentials structure
|
||||||
|
@@ -1159,6 +1160,7 @@ _PUBLIC_ bool cli_credentials_guess(struct cli_credentials *cred,
|
||||||
|
{
|
||||||
|
const char *error_string;
|
||||||
|
const char *env = NULL;
|
||||||
|
+ struct passwd *pwd = NULL;
|
||||||
|
bool ok;
|
||||||
|
|
||||||
|
if (lp_ctx != NULL) {
|
||||||
|
@@ -1168,6 +1170,17 @@ _PUBLIC_ bool cli_credentials_guess(struct cli_credentials *cred,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ pwd = getpwuid(getuid());
|
||||||
|
+ if (pwd != NULL) {
|
||||||
|
+ size_t len = strlen(pwd->pw_name);
|
||||||
|
+
|
||||||
|
+ if (len > 0 && len <= 1024) {
|
||||||
|
+ (void)cli_credentials_parse_string(cred,
|
||||||
|
+ pwd->pw_name,
|
||||||
|
+ CRED_GUESS_ENV);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
env = getenv("LOGNAME");
|
||||||
|
if (env != NULL) {
|
||||||
|
size_t len = strlen(env);
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
@ -129,7 +129,7 @@
|
|||||||
|
|
||||||
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
|
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
|
||||||
|
|
||||||
%global baserelease 1
|
%global baserelease 2
|
||||||
|
|
||||||
%global samba_version 4.15.2
|
%global samba_version 4.15.2
|
||||||
%global talloc_version 2.3.3
|
%global talloc_version 2.3.3
|
||||||
@ -203,6 +203,7 @@ Patch1: samba-ctdb-etcd-reclock.patch
|
|||||||
Patch2: samba-4.15.1-winexe.patch
|
Patch2: samba-4.15.1-winexe.patch
|
||||||
Patch3: samba-4.15-fix-winbind-no-trusted-domain.patch
|
Patch3: samba-4.15-fix-winbind-no-trusted-domain.patch
|
||||||
Patch4: samba-4.15-logfile.patch
|
Patch4: samba-4.15-logfile.patch
|
||||||
|
Patch5: samba-4.15.2-smbclient_anonymous.patch
|
||||||
|
|
||||||
Requires(pre): /usr/sbin/groupadd
|
Requires(pre): /usr/sbin/groupadd
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
@ -4094,10 +4095,11 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Nov 11 2021 Guenther Deschner <gdeschner@redhat.com> - 4.15.2-1
|
* Thu Nov 11 2021 Guenther Deschner <gdeschner@redhat.com> - 4.15.2-2
|
||||||
- Fix winbind trusted domain regression
|
- Fix winbind trusted domain regression
|
||||||
- related: #2021716
|
- related: #2021716
|
||||||
- Fix logfile handling
|
- Fix logfile handling
|
||||||
|
- Fix smbclient -N failures in container setups
|
||||||
|
|
||||||
* Tue Nov 09 2021 Guenther Deschner <gdeschner@redhat.com> - 4.15.2-0
|
* Tue Nov 09 2021 Guenther Deschner <gdeschner@redhat.com> - 4.15.2-0
|
||||||
- Update to Samba 4.15.2
|
- Update to Samba 4.15.2
|
||||||
|
Loading…
Reference in New Issue
Block a user