From b944e5233bc30e71fa642373feb1756cbef314d7 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Mon, 10 Jul 2023 14:19:22 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .do-not-sync-with-fedora           |  1 +
 .gitignore                         | 18 ++++++++++++++++++
 sudo-1.8.23-ldapsearchuidfix.patch | 27 +++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 .do-not-sync-with-fedora
 create mode 100644 sudo-1.8.23-ldapsearchuidfix.patch

diff --git a/.do-not-sync-with-fedora b/.do-not-sync-with-fedora
new file mode 100644
index 0000000..9af7e61
--- /dev/null
+++ b/.do-not-sync-with-fedora
@@ -0,0 +1 @@
+dkopecek: imported RHEL 7 packaging state which is different from Fedora
diff --git a/.gitignore b/.gitignore
index fe6e474..306885f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,19 @@
+/sudo-1.8.16.tar.gz
+/sudo-1.8.17p1.tar.gz
+/sudo-1.8.18b2.tar.gz
+/sudo-1.8.18rc2.tar.gz
+/sudo-1.8.18rc4.tar.gz
+/sudo-1.8.18.tar.gz
+/sudo-90e4538c001fbe1b791a11d6a2c37607472fafe5.tar.gz
+/sudo-738c3cbf3e8400bf4a5aeab8966427ff6d630cd2.tar.gz
+/sudo-1.8.19p2.tar.gz
+/sudo-1.8.20b1.tar.gz
+/sudo-1.8.20p1.tar.gz
+/sudo-1.8.20p2.tar.gz
+/sudo-1.8.21p2.tar.gz
+/sudo-1.8.22b1.tar.gz
+/sudo-1.8.23.tar.gz
+/sudo-1.8.25p1.tar.gz
+/sudo-1.8.28.tar.gz
+/sudo-1.8.28p1.tar.gz
 /sudo-1.8.29.tar.gz
diff --git a/sudo-1.8.23-ldapsearchuidfix.patch b/sudo-1.8.23-ldapsearchuidfix.patch
new file mode 100644
index 0000000..9698d23
--- /dev/null
+++ b/sudo-1.8.23-ldapsearchuidfix.patch
@@ -0,0 +1,27 @@
+diff -up sudo-1.8.23/plugins/sudoers/ldap.c.ldapsearchuidfix sudo-1.8.23/plugins/sudoers/ldap.c
+--- sudo-1.8.23/plugins/sudoers/ldap.c.ldapsearchuidfix	2018-04-29 21:59:31.000000000 +0200
++++ sudo-1.8.23/plugins/sudoers/ldap.c	2018-06-18 08:34:01.202686941 +0200
+@@ -1189,8 +1189,8 @@ sudo_ldap_build_pass1(LDAP *ld, struct p
+     if (ldap_conf.search_filter)
+ 	sz += strlen(ldap_conf.search_filter);
+ 
+-    /* Then add (|(sudoUser=USERNAME)(sudoUser=ALL)) + NUL */
+-    sz += 29 + sudo_ldap_value_len(pw->pw_name);
++    /* Then add (|(sudoUser=USERNAME)(sudoUser=#uid)(sudoUser=ALL)) + NUL */
++    sz += 29 + (12 + MAX_UID_T_LEN) + sudo_ldap_value_len(pw->pw_name);
+ 
+     /* Add space for primary and supplementary groups and gids */
+     if ((grp = sudo_getgrgid(pw->pw_gid)) != NULL) {
+@@ -1253,6 +1253,12 @@ sudo_ldap_build_pass1(LDAP *ld, struct p
+     CHECK_LDAP_VCAT(buf, pw->pw_name, sz);
+     CHECK_STRLCAT(buf, ")", sz);
+ 
++    /* Append user uid */
++    (void) snprintf(gidbuf, sizeof(gidbuf), "%u", (unsigned int)pw->pw_uid);
++    (void) strlcat(buf, "(sudoUser=#", sz);
++    (void) strlcat(buf, gidbuf, sz);
++    (void) strlcat(buf, ")", sz);
++
+     /* Append primary group and gid */
+     if (grp != NULL) {
+ 	CHECK_STRLCAT(buf, "(sudoUser=%", sz);