NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3ad2afc

committed

Define LDAPS_PORT if it's missing and disable implicit LDAPS on Windows

Some versions of Windows don't define LDAPS_PORT.Also, Windows' ldap_sslinit() is documented to use LDAPS even if yousaid secure=0 when the port number happens to be 636 or 3269. Let'savoid using the port number to imply that you want LDAPS, so thatconnection strings have the same meaning on Windows and Unix.Author: Thomas MunroDiscussion:https://postgr.es/m/CAEepm%3D23B7GV4AUz3MYH1TKpTv030VHxD2Sn%2BLYWDv8d-qWxww%40mail.gmail.com

1 parentc759395 commit3ad2afcCopy full SHA for 3ad2afc

File tree

1 file changed

-3

lines changed

src/backend/libpq
- auth.c

1 file changed

-3

lines changed

`‎src/backend/libpq/auth.c`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2363,9 +2363,10 @@ InitializeLDAPConnection(Port port, LDAP *ldap)`
`2363`	`2363`	`if (scheme==NULL)`
`2364`	`2364`	`scheme="ldap";`
`2365`	`2365`	`#ifdefWIN32`
`2366`		`-*ldap=ldap_sslinit(port->hba->ldapserver,`
`2367`		`-port->hba->ldapport,`
`2368`		`-strcmp(scheme,"ldaps")==0);`
	`2366`	`+if (strcmp(scheme,"ldaps")==0)`
	`2367`	`+*ldap=ldap_sslinit(port->hba->ldapserver,port->hba->ldapport,1);`
	`2368`	`+else`
	`2369`	`+*ldap=ldap_init(port->hba->ldapserver,port->hba->ldapport);`
`2369`	`2370`	`if (!*ldap)`
`2370`	`2371`	`{`
`2371`	`2372`	`ereport(LOG,`
`@@ -2489,6 +2490,11 @@ InitializeLDAPConnection(Port port, LDAP *ldap)`
`2489`	`2490`	`#defineLDAP_NO_ATTRS "1.1"`
`2490`	`2491`	`#endif`
`2491`	`2492`
	`2493`	`+/* Not all LDAP implementations define this. */`
	`2494`	`+#ifndefLDAPS_PORT`
	`2495`	`+#defineLDAPS_PORT 636`
	`2496`	`+#endif`
	`2497`	`+`
`2492`	`2498`	`/*`
`2493`	`2499`	`* Return a newly allocated C string copied from "pattern" with all`
`2494`	`2500`	`* occurrences of the placeholder "$username" replaced with "user_name".`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3ad2afc

File tree

1 file changed

1 file changed

`‎src/backend/libpq/auth.c`

0 commit comments