From 5f304ee29a37c78cae0990e91fe2e004ff490bf8 Mon Sep 17 00:00:00 2001
From: Phil Jaenke <prj@rootwyrm.com>
Date: Mon, 22 Aug 2022 20:40:17 -0400
Subject: [PATCH 1/2] Update to python-ldap 3.4.2

Minor version bump. This is necessary to resolve build issues on Alpine 3.16+ without impacts for any other distributions.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index cef0a76..1fc2864 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ mysqlclient==2.0.1
 configobj==5.0.6
 bcrypt>=3.1.7
 requests==2.24.0
-python-ldap==3.4.0
+python-ldap==3.4.2
 pyotp==2.4.0
 qrcode==6.1
 dnspython>=1.16.0

From 9bf74a6baf1cb6d375fd1cb08a68a472243e5892 Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pascal.debruijn@dustin.nl>
Date: Tue, 6 Sep 2022 15:25:28 +0200
Subject: [PATCH 2/2] admin_edit_key: default to User role for new api keys

hopefully this will prevent accidental administator api keys from being created
---
 powerdnsadmin/templates/admin_edit_key.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/powerdnsadmin/templates/admin_edit_key.html b/powerdnsadmin/templates/admin_edit_key.html
index 7c8ca17..6a94340 100644
--- a/powerdnsadmin/templates/admin_edit_key.html
+++ b/powerdnsadmin/templates/admin_edit_key.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% set active_page = "admin_keys" %}
-{% if create or (key is not none and key.role.name != "User") %}{% set hide_opts = True %}{%else %}{% set hide_opts = False %}{% endif %}
+{% if (key is not none and key.role.name != "User") %}{% set hide_opts = True %}{%else %}{% set hide_opts = False %}{% endif %}
 {% block title %}
 <title>Edit Key - {{ SITE_NAME }}</title>
 {% endblock %}
@@ -39,7 +39,9 @@
                             <select class="key_role form-control" id="key_role" name="key_role">
                                 {% for role in roles %}
                                 <option value="{{ role.name }}"
-                                {% if (key is not none) and (role.id==key.role.id) %}selected{% endif %}>{{ role.name }}</option>
+                                {% if (key is not none) and (role.id==key.role.id) %}selected{% endif %}
+                                {% if (key is none) and (role.name=="User") %}selected{% endif %}
+                                >{{ role.name }}</option>
                                 {% endfor %}
                             </select>
                         </div>