From 60455145053c3e62edfff7f14d80d523bfabd94b0e764fe2e2fb961df92d3427 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 8 Apr 2016 12:39:18 +0000 Subject: [PATCH] Accepting request 385260 from home:kukuk:branches:network - openssh-6.6p1-ldap.patch: replace TRUE/FALSE with 1/0, since this defines did come via an indirect header inclusion and are not everywhere defined. OBS-URL: https://build.opensuse.org/request/show/385260 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=99 --- openssh-6.6p1-ldap.patch | 10 +++++----- openssh.changes | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/openssh-6.6p1-ldap.patch b/openssh-6.6p1-ldap.patch index a91ff94..6d6d6c7 100644 --- a/openssh-6.6p1-ldap.patch +++ b/openssh-6.6p1-ldap.patch @@ -798,7 +798,7 @@ new file mode 100644 + timeout.tv_sec = options.bind_timelimit; + timeout.tv_usec = 0; + result = NULL; -+ if ((rc = ldap_result (ld, msgid, FALSE, &timeout, &result)) < 1) { ++ if ((rc = ldap_result (ld, msgid, 0, &timeout, &result)) < 1) { + error ("ldap_result %s", ldap_err2string (ldap_get_lderrno (ld, 0, 0))); + ldap_msgfree (result); + return LDAP_OPERATIONS_ERROR; @@ -899,7 +899,7 @@ new file mode 100644 + } + + if (options.ssl_on != SSL_OFF) { -+ if ((ld = ldapssl_init (options.host, options.port, TRUE)) == NULL) ++ if ((ld = ldapssl_init (options.host, options.port, 1)) == NULL) + fatal ("ldapssl_init failed"); + debug3 ("LDAPssl init"); + } @@ -1103,7 +1103,7 @@ new file mode 100644 + + timeout.tv_sec = options.bind_timelimit; + timeout.tv_usec = 0; -+ if ((rc = ldap_result (ld, msgid, FALSE, &timeout, &result)) < 1) { ++ if ((rc = ldap_result (ld, msgid, 0, &timeout, &result)) < 1) { + ld_errno = ldap_get_lderrno (ld, 0, 0); + + error ("ldap_result %s", ldap_err2string (ld_errno)); @@ -1114,7 +1114,7 @@ new file mode 100644 + +#if defined(HAVE_LDAP_PARSE_RESULT) && defined(HAVE_LDAP_CONTROLS_FREE) + controls = NULL; -+ if ((parserc = ldap_parse_result (ld, result, &rc, 0, 0, 0, &controls, TRUE)) != LDAP_SUCCESS) ++ if ((parserc = ldap_parse_result (ld, result, &rc, 0, 0, 0, &controls, 1)) != LDAP_SUCCESS) + fatal ("ldap_parse_result %s", ldap_err2string (parserc)); + debug3 ("LDAP parse result OK"); + @@ -1122,7 +1122,7 @@ new file mode 100644 + ldap_controls_free (controls); + } +#else -+ rc = ldap_result2error (session->ld, result, TRUE); ++ rc = ldap_result2error (session->ld, result, 1); +#endif + if (rc != LDAP_SUCCESS) + fatal ("error trying to bind as user \"%s\" (%s)", diff --git a/openssh.changes b/openssh.changes index 74240a0..b001797 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 6 11:42:35 UTC 2016 - kukuk@suse.com + +- openssh-6.6p1-ldap.patch: replace TRUE/FALSE with 1/0, since + this defines did come via an indirect header inclusion and are + not everywhere defined. + ------------------------------------------------------------------- Thu Jan 14 15:35:55 UTC 2016 - astieger@suse.com