From: Michael Tremer Date: Thu, 27 Apr 2023 18:22:52 +0000 (+0000) Subject: hub: Don't use a default keytab X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6258da2b0f0316554e5afc547c0e25c289258cc;p=people%2Fstevee%2Fpakfire.git hub: Don't use a default keytab This might overwrite when a user is logged in. Signed-off-by: Michael Tremer --- diff --git a/contrib/config/daemon.conf b/contrib/config/daemon.conf index 70990a1a..e15eeaa0 100644 --- a/contrib/config/daemon.conf +++ b/contrib/config/daemon.conf @@ -6,4 +6,4 @@ # server = https://pakfire.ipfire.org/ # The keytab file that is being used to authenticate against the Hub -# keytab = /etc/krb5.keytab +keytab = /etc/krb5.keytab diff --git a/src/pakfire/hub.py b/src/pakfire/hub.py index a3b3c751..4dba7867 100644 --- a/src/pakfire/hub.py +++ b/src/pakfire/hub.py @@ -44,8 +44,6 @@ from .i18n import _ # Setup logging log = logging.getLogger("pakfire.hub") -DEFAULT_KEYTAB = "/etc/krb5.keytab" - # Configure some useful defaults for all requests tornado.httpclient.AsyncHTTPClient.configure( None, defaults = { @@ -65,7 +63,7 @@ class Hub(object): self.url = url # Store path to keytab - self.keytab = keytab or DEFAULT_KEYTAB + self.keytab = keytab # Initialise the HTTP client self.client = tornado.httpclient.AsyncHTTPClient()