From cf5f37509e0215de9fb0bd169d49c701a65de769 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 15 Mar 2010 17:57:27 +0100
Subject: Fix segfault in the locator plugin

---
 src/krb5_plugin/sssd_krb5_locator_plugin.c | 51 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'src/krb5_plugin')

diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c
index eb8666e4..626960a2 100644
--- a/src/krb5_plugin/sssd_krb5_locator_plugin.c
+++ b/src/krb5_plugin/sssd_krb5_locator_plugin.c
@@ -153,34 +153,35 @@ static int get_krb5info(const char *realm, struct sssd_ctx *ctx,
     port_str = strrchr((char *) buf, ':');
     if (port_str == NULL) {
         port = 0;
-    }
-    *port_str = '\0';
-    ++port_str;
-
-    if (isdigit(*port_str)) {
-        errno = 0;
-        port = strtol(port_str, &endptr, 10);
-        if (errno != 0) {
-            ret = errno;
-            PLUGIN_DEBUG(("strtol failed on [%s]: [%d][%s], "
-                          "assuming default.\n", port_str, ret, strerror(ret)));
-            port = 0;
-        }
-        if (*endptr != '\0') {
-            PLUGIN_DEBUG(("Found additional characters [%s] in port number "
-                          "[%s], assuming default.\n", endptr, port_str));
-            port = 0;
-        }
+    } else {
+        *port_str = '\0';
+        ++port_str;
+
+        if (isdigit(*port_str)) {
+            errno = 0;
+            port = strtol(port_str, &endptr, 10);
+            if (errno != 0) {
+                ret = errno;
+                PLUGIN_DEBUG(("strtol failed on [%s]: [%d][%s], "
+                            "assuming default.\n", port_str, ret, strerror(ret)));
+                port = 0;
+            }
+            if (*endptr != '\0') {
+                PLUGIN_DEBUG(("Found additional characters [%s] in port number "
+                            "[%s], assuming default.\n", endptr, port_str));
+                port = 0;
+            }
 
-        if (port < 0 || port > 65535) {
-            PLUGIN_DEBUG(("Illegal port number [%d], assuming default.\n",
-                          port));
+            if (port < 0 || port > 65535) {
+                PLUGIN_DEBUG(("Illegal port number [%d], assuming default.\n",
+                            port));
+                port = 0;
+            }
+        } else {
+            PLUGIN_DEBUG(("Illegal port number [%s], assuming default.\n",
+                        port_str));
             port = 0;
         }
-    } else {
-        PLUGIN_DEBUG(("Illegal port number [%s], assuming default.\n",
-                      port_str));
-        port = 0;
     }
 
     switch (svc) {
-- 
cgit