9e4e3e42554fc6344a0b20b42aafb48011e9b2c9.patch · ocs-commit/pam

代码拉取完成,页面将自动刷新

richgiteeai

Watch

不关注关注所有动态仅关注版本发行动态关注但不提醒动态

14 Star 0 Fork 9

ocs-commit/pam

forked from OpenCloudOS Stream/pam

代码 Issues 0 Pull Requests 0 Wiki 统计流水线

服务

加入 Gitee

与超过 1400万开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)

免费加入

已有帐号? 立即登录

文件

master

分支 (1)

标签 (1)

管理

master

ocs-2309

该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。

项目仓库所选许可证以仓库主分支所使用许可证为准

克隆/下载

HTTPS SSH SVN SVN+SSH 下载ZIP

提示

下载代码请复制以下命令到终端执行

为确保你提交的代码身份被 Gitee 正确识别,请执行以下命令完成配置

git config --global user.name userName 
git config --global user.email userEmail

初次使用 SSH 协议进行代码克隆、推送等操作时,需按下述提示完成 SSH 配置

1 生成 RSA 密钥

2 获取 RSA 公钥内容,并配置到 SSH公钥中

在 Gitee 上使用 SVN,请访问使用指南

使用 HTTPS 协议时,命令行会出现如下账号密码验证步骤。基于安全考虑,Gitee 建议配置并使用私人令牌替代登录密码进行克隆、推送等操作

Username for 'https://gitee.com': userName

Password for 'https://userName@gitee.com': # 私人令牌

分支 1

标签 1

pam

9e4e3e42554fc6344a0b20b42aafb48011e9b...

9e4e3e42554fc6344a0b20b42aafb48011e9b2c9.patch 1.75 KB

From 9e4e3e42554fc6344a0b20b42aafb48011e9b2c9 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: 2024年1月18日 20:25:20 +0100
Subject: [PATCH] pam_env: remove escaped newlines from econf lines

The libeconf routines do not remove escaped newlines the way we want to
process them later on. Manually remove them from values.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Resolves: https://github.com/linux-pam/linux-pam/issues/738
Fixes: 6135c45347b6 ("pam_env: Use vendor specific pam_env.conf and environment as fallback")
---
 modules/pam_env/pam_env.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
index 8b40b6a5a..6bece0f81 100644
--- a/modules/pam_env/pam_env.c
+++ b/modules/pam_env/pam_env.c
@@ -160,6 +160,28 @@ isDirectory(const char *path) {
 return S_ISDIR(statbuf.st_mode);
 }
 
+/*
+ * Remove escaped newline from string.
+ *
+ * All occurrences of "\\n" will be removed from string.
+ */
+static void
+econf_unescnl(char *val)
+{
+ char *dest, *p;
+
+ dest = p = val;
+
+ while (*p != '0円') {
+ if (p[0] == '\\' && p[1] == '\n') {
+	p += 2;
+ } else {
+	*dest++ = *p++;
+ }
+ }
+ *dest = '0円';
+}
+
 static int
 econf_read_file(const pam_handle_t *pamh, const char *filename, const char *delim,
 			 const char *name, const char *suffix, const char *subpath,
@@ -270,6 +292,7 @@ econf_read_file(const pam_handle_t *pamh, const char *filename, const char *deli
 		 keys[i],
 		 econf_errString(error));
 } else {
+ econf_unescnl(val);
 if (asprintf(&(*lines)[i],"%s%c%s", keys[i], delim[0], val) < 0) {
 	 pam_syslog(pamh, LOG_ERR, "Cannot allocate memory.");
 econf_free(keys);

一键复制编辑原始数据按行查看历史

ocs-bot 提交于 2024年12月26日 16:26 +08:00 . - Apply patches from rpm-tracker

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56

From 9e4e3e42554fc6344a0b20b42aafb48011e9b2c9 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: 2024年1月18日 20:25:20 +0100
Subject: [PATCH] pam_env: remove escaped newlines from econf lines

The libeconf routines do not remove escaped newlines the way we want to
process them later on. Manually remove them from values.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Resolves: https://github.com/linux-pam/linux-pam/issues/738
Fixes: 6135c45347b6 ("pam_env: Use vendor specific pam_env.conf and environment as fallback")
---
 modules/pam_env/pam_env.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
index 8b40b6a5a..6bece0f81 100644
--- a/modules/pam_env/pam_env.c
+++ b/modules/pam_env/pam_env.c
@@ -160,6 +160,28 @@ isDirectory(const char *path) {
 return S_ISDIR(statbuf.st_mode);
 }
 
+/*
+ * Remove escaped newline from string.
+ *
+ * All occurrences of "\\n" will be removed from string.
+ */
+static void
+econf_unescnl(char *val)
+{
+ char *dest, *p;
+
+ dest = p = val;
+
+ while (*p != '0円') {
+ if (p[0] == '\\' && p[1] == '\n') {
+	p += 2;
+ } else {
+	*dest++ = *p++;
+ }
+ }
+ *dest = '0円';
+}
+
 static int
 econf_read_file(const pam_handle_t *pamh, const char *filename, const char *delim,
 			 const char *name, const char *suffix, const char *subpath,
@@ -270,6 +292,7 @@ econf_read_file(const pam_handle_t *pamh, const char *filename, const char *deli
 		 keys[i],
 		 econf_errString(error));
 } else {
+ econf_unescnl(val);
 if (asprintf(&(*lines)[i],"%s%c%s", keys[i], delim[0], val) < 0) {
 	 pam_syslog(pamh, LOG_ERR, "Cannot allocate memory.");
 econf_free(keys);