diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2010-03-15 17:57:27 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-03-15 16:14:03 -0400 |
| commit | 46c0417d7d8e36348735f03b03c35d5cd5acd3fe (patch) | |
| tree | 77a962f0bbaf0857c473cd69e8ef042b560cbed2 | |
| parent | 8fec58e70b92df90558ef11c8bebbfd3df06a6de (diff) | |
| download | sssd-46c0417d7d8e36348735f03b03c35d5cd5acd3fe.tar.gz sssd-46c0417d7d8e36348735f03b03c35d5cd5acd3fe.tar.xz sssd-46c0417d7d8e36348735f03b03c35d5cd5acd3fe.zip | |
Fix segfault in the locator plugin
| -rw-r--r-- | src/krb5_plugin/sssd_krb5_locator_plugin.c | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c index eb8666e46..626960a2e 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) { |