jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Avoid undefined TRUE/FALSE in ldap patch to build in rawhide

Browse Source
This commit is contained in:
Jakub Jelen 2018-01-17 10:49:32 +01:00
parent 4d97279349
commit 38b67ad605
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openssh-6.7p1-ldap.patch
View File

@ -736,7 +736,7 @@ diff -up openssh-6.8p1/ldapbody.c.ldap openssh-6.8p1/ldapbody.c
+ 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;
@ -837,7 +837,7 @@ diff -up openssh-6.8p1/ldapbody.c.ldap openssh-6.8p1/ldapbody.c
+ } + }
+ +
+ 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");
+ } + }
@ -1041,7 +1041,7 @@ diff -up openssh-6.8p1/ldapbody.c.ldap openssh-6.8p1/ldapbody.c
+ +
+ 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));
@ -1052,7 +1052,7 @@ diff -up openssh-6.8p1/ldapbody.c.ldap openssh-6.8p1/ldapbody.c
+ +
+#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");
+ +
@ -1060,7 +1060,7 @@ diff -up openssh-6.8p1/ldapbody.c.ldap openssh-6.8p1/ldapbody.c
+ 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)",

2
openssh.spec
View File

@ -73,7 +73,7 @@
Summary: An open source implementation of SSH protocol version 2 Summary: An open source implementation of SSH protocol version 2
Name: openssh Name: openssh
Version: %{openssh_ver} Version: %{openssh_ver}
Release: %{openssh_rel}%{?dist}%{?rescue_rel} Release: %{openssh_rel}.1%{?dist}%{?rescue_rel}
URL: http://www.openssh.com/portable.html URL: http://www.openssh.com/portable.html
#URL1: http://pamsshagentauth.sourceforge.net #URL1: http://pamsshagentauth.sourceforge.net
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz