From 62199f62555c408e9cb306606a1733b16fe6c5ac Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Fri, 7 May 2021 17:01:32 -0700
Subject: [PATCH 1/2] Manually re-add support for Label Logos in Labels (#9552)

---
 resources/views/hardware/labels.blade.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index 52c06aad9..beef71847 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -56,6 +56,13 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
         padding-top: .11in;
         width: 100%;
     }
+    div.label-logo {
+        float: right;
+        display: inline-block;
+    }
+    img.label-logo {
+        height: 0.5in;
+    }
     .qr_text {
         width: {{ $settings->labels_width }}in;
         height: {{ $settings->labels_height }}in;
@@ -111,6 +118,11 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
         @endif
 
         <div class="qr_text">
+            @if ($settings->label_logo)
+                <div class="label-logo">
+                    <img class="label-logo" src="{{ Storage::disk('public')->url('').e($snipeSettings->label_logo) }}">
+                </div>
+            @endif
             @if ($settings->qr_text!='')
                 <div class="pull-left">
                     <strong>{{ $settings->qr_text }}</strong>

From ded61614d1cc2557c83a8bfce49e36e56dfe5315 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 7 May 2021 18:13:04 -0700
Subject: [PATCH 2/2] Attempt to fix transient LDAP bug

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Services/LdapAd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/LdapAd.php b/app/Services/LdapAd.php
index 925927d1f..4bfef3d3e 100644
--- a/app/Services/LdapAd.php
+++ b/app/Services/LdapAd.php
@@ -135,7 +135,7 @@ class LdapAd extends LdapAdConfiguration
             $bind_as_user = true;
         }
 
-        if ($this->ldap->auth()->attempt($login_username, $password, $bind_as_user) === false) {
+        if (($this->ldap) && ($this->ldap->auth()->attempt($login_username, $password, $bind_as_user) === false)) {
             throw new Exception('Unable to validate user credentials!');
         }