pool/openssh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 386262 from network

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/386262
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2016-04-12 16:59:51 +00:00 committed by Git OBS Bridge
commit 7f9fe1884f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openssh-6.6p1-ldap.patch
View File

@ -798,7 +798,7 @@ new file mode 100644
+ timeout.tv_sec = options.bind_timelimit; + timeout.tv_sec = options.bind_timelimit;
+ timeout.tv_usec = 0; + timeout.tv_usec = 0;
+ result = NULL; + 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))); + error ("ldap_result %s", ldap_err2string (ldap_get_lderrno (ld, 0, 0)));
+ ldap_msgfree (result); + ldap_msgfree (result);
+ return LDAP_OPERATIONS_ERROR; + return LDAP_OPERATIONS_ERROR;
@ -899,7 +899,7 @@ new file mode 100644
+ } + }
+ +
+ if (options.ssl_on != SSL_OFF) { + 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"); + fatal ("ldapssl_init failed");
+ debug3 ("LDAPssl init"); + debug3 ("LDAPssl init");
+ } + }
@ -1103,7 +1103,7 @@ new file mode 100644
+ +
+ timeout.tv_sec = options.bind_timelimit; + timeout.tv_sec = options.bind_timelimit;
+ timeout.tv_usec = 0; + 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); + ld_errno = ldap_get_lderrno (ld, 0, 0);
+ +
+ error ("ldap_result %s", ldap_err2string (ld_errno)); + 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) +#if defined(HAVE_LDAP_PARSE_RESULT) && defined(HAVE_LDAP_CONTROLS_FREE)
+ controls = NULL; + 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)); + fatal ("ldap_parse_result %s", ldap_err2string (parserc));
+ debug3 ("LDAP parse result OK"); + debug3 ("LDAP parse result OK");
+ +
@ -1122,7 +1122,7 @@ new file mode 100644
+ ldap_controls_free (controls); + ldap_controls_free (controls);
+ } + }
+#else +#else
+ rc = ldap_result2error (session->ld, result, TRUE); + rc = ldap_result2error (session->ld, result, 1);
+#endif +#endif
+ if (rc != LDAP_SUCCESS) + if (rc != LDAP_SUCCESS)
+ fatal ("error trying to bind as user \"%s\" (%s)", + fatal ("error trying to bind as user \"%s\" (%s)",

7
openssh.changes
View File

@ -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 Thu Jan 14 15:35:55 UTC 2016 - astieger@suse.com