Commit258c76e

committed

backport handling of expired passwords in mysqlnd to 5.4

1 parentbcd278a commit258c76eCopy full SHA for 258c76e

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2286,7 +2286,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c`
`2286`	`2286`	`break;`
`2287`	`2287`	`#endif`
`2288`	`2288`	`caseMYSQL_OPT_LOCAL_INFILE:`
`2289`		`-if (!value\|\| ((unsignedint)value) ?1 :0) {`
	`2289`	`+if (value&& ((unsignedint)value) ?1 :0) {`
`2290`	`2290`	`conn->options->flags \|=CLIENT_LOCAL_FILES;`
`2291`	`2291`	`}else {`
`2292`	`2292`	`conn->options->flags &= ~CLIENT_LOCAL_FILES;`
`@@ -2370,6 +2370,13 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c`
`2370`	`2370`	`DBG_INF_FMT("auth_protocol=%s",conn->options->auth_protocol);`
`2371`	`2371`	`break;`
`2372`	`2372`	`}`
	`2373`	`+caseMYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:`
	`2374`	`+if (value&& ((unsignedint)value) ?1 :0) {`
	`2375`	`+conn->options->flags \|=CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;`
	`2376`	`+}else {`
	`2377`	`+conn->options->flags &= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS;`
	`2378`	`+}`
	`2379`	`+break;`
`2373`	`2380`	`#ifdefWHEN_SUPPORTED_BY_MYSQLI`
`2374`	`2381`	`caseMYSQL_SHARED_MEMORY_BASE_NAME:`
`2375`	`2382`	`caseMYSQL_OPT_USE_RESULT:`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,9 @@`
`95`	`95`	`#defineCLIENT_MULTI_RESULTS(1UL << 17)/* Enable/disable multi-results */`
`96`	`96`	`#defineCLIENT_PS_MULTI_RESULTS(1UL << 18)/* Multi-results in PS-protocol */`
`97`	`97`	`#defineCLIENT_PLUGIN_AUTH(1UL << 19)/* Client supports plugin authentication */`
`98`		`-`
	`98`	`+#defineCLIENT_CONNECT_ATTRS(1UL << 20)/* Client supports connection attributes */`
	`99`	`+#defineCLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA(1UL << 21)/* Enable authentication response packet to be larger than 255 bytes. */`
	`100`	`+#defineCLIENT_CAN_HANDLE_EXPIRED_PASSWORDS(1UL << 22)/* Don't close the connection for a connection with expired password. */`
`99`	`101`	`#defineCLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)`
`100`	`102`
`101`	`103`	`#defineMYSQLND_CAPABILITIES (CLIENT_LONG_PASSWORD \| CLIENT_LONG_FLAG \| CLIENT_TRANSACTIONS \| \`
`@@ -164,6 +166,9 @@ typedef enum mysqlnd_option`
`164`	`166`	`MYSQL_OPT_SSL_VERIFY_SERVER_CERT,`
`165`	`167`	`MYSQL_PLUGIN_DIR,`
`166`	`168`	`MYSQL_DEFAULT_AUTH,`
	`169`	`+MYSQL_SERVER_PUBLIC_KEY,`
	`170`	`+MYSQL_ENABLE_CLEARTEXT_PLUGIN,`
	`171`	`+MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,`
`167`	`172`	`#ifMYSQLND_UNICODE`
`168`	`173`	`MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE=200,`
`169`	`174`	`#endif`

Comments

(0)