Revert "WL#12671 Change named_pipe_full_access_group default on Windows"

Daniel Blanchard · Daniel Blanchard · commit fffa1baafb51 · 2020-11-24T12:30:10.000+01:00
This reverts commit 7c123f3d5222cadb33581da8dea7276be9a32725.
erroneously pushed prior to QA approval.

Reviewed by: Erlend Dahl &lt;erlend.dahl@oracle.com&gt;
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
@@ -1187,7 +1187,7 @@ myisam-sort-buffer-size 8388608
 myisam-stats-method nulls_unequal
 myisam-use-mmap FALSE
 named-pipe FALSE
-named-pipe-full-access-group 
+named-pipe-full-access-group *everyone*
 net-buffer-length 16384
 net-read-timeout 30
 net-retry-count 10
diff --git a/mysql-test/suite/sys_vars/r/named_pipe_full_access_group_basic.result b/mysql-test/suite/sys_vars/r/named_pipe_full_access_group_basic.result
@@ -1,14 +1,14 @@
 select @@global.named_pipe_full_access_group;
 @@global.named_pipe_full_access_group
-
+*everyone*
 select @@session.named_pipe_full_access_group;
 ERROR HY000: Variable 'named_pipe_full_access_group' is a GLOBAL variable
 show global variables like 'named_pipe_full_access_group';
 Variable_name	Value
-named_pipe_full_access_group	
+named_pipe_full_access_group	*everyone*
 show session variables like 'named_pipe_full_access_group';
 Variable_name	Value
-named_pipe_full_access_group	
+named_pipe_full_access_group	*everyone*
 set global named_pipe_full_access_group = NULL;
 show session variables like 'named_pipe_full_access_group';
 Variable_name	Value
@@ -22,4 +22,3 @@ NAMED_PIPE_FULL_ACCESS_GROUP	*everyone*
 select * from information_schema.session_variables where variable_name='named_pipe_full_access_group';
 VARIABLE_NAME	VARIABLE_VALUE
 NAMED_PIPE_FULL_ACCESS_GROUP	*everyone*
-set global named_pipe_full_access_group = default;
diff --git a/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic.test b/mysql-test/suite/sys_vars/t/named_pipe_full_access_group_basic.test
@@ -15,6 +15,4 @@ set global named_pipe_full_access_group = '*everyone*';
 select * from information_schema.global_variables where variable_name='named_pipe_full_access_group';
 select * from information_schema.session_variables where variable_name='named_pipe_full_access_group';
 --enable_warnings
-# Restore initial state
-set global named_pipe_full_access_group = default;
 
diff --git a/sql/named_pipe.cc b/sql/named_pipe.cc
@@ -69,7 +69,7 @@ static bool check_windows_group_for_everyone(const char *group_name,
     return false;
   }
 
-  if (strcmp(group_name, NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE) == 0)
+  if (strcmp(group_name, DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP) == 0)
   {
     *is_everyone_group= true;
     return false;
@@ -160,9 +160,9 @@ bool my_security_attr_add_rights_to_group(SECURITY_ATTRIBUTES *psa,
     }
   }
 
-  // Treat the NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE value
+  // Treat the DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP value
   // as a special case: we  convert it to the "world" SID
-  if (strcmp(group_name, NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE) == 0)
+  if (strcmp(group_name, DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP) == 0)
   {
     if (!CreateWellKnownSid(WinWorldSid, NULL, soughtSID, &size_sid))
     {
diff --git a/sql/named_pipe.h b/sql/named_pipe.h
@@ -41,6 +41,5 @@ bool is_valid_named_pipe_full_access_group(const char *group_name);
 bool my_security_attr_add_rights_to_group(SECURITY_ATTRIBUTES *psa,
                                           const char *group_name,
                                           DWORD group_rights);
-#define DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP ""
-#define NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE "*everyone*"
+#define DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP "*everyone*"
 #endif /* NAMED_PIPE_INCLUDED */

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ static bool check_windows_group_for_everyone(const char *group_name,`
`69`	`69`	`return false;`
`70`	`70`	`}`
`71`	`71`
`72`		`- if (strcmp(group_name, NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE) == 0)`
	`72`	`+ if (strcmp(group_name, DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP) == 0)`
`73`	`73`	`{`
`74`	`74`	`*is_everyone_group= true;`
`75`	`75`	`return false;`
`@@ -160,9 +160,9 @@ bool my_security_attr_add_rights_to_group(SECURITY_ATTRIBUTES *psa,`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`- // Treat the NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE value`
	`163`	`+ // Treat the DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP value`
`164`	`164`	`// as a special case: we convert it to the "world" SID`
`165`		`- if (strcmp(group_name, NAMED_PIPE_FULL_ACCESS_GROUP_EVERYONE) == 0)`
	`165`	`+ if (strcmp(group_name, DEFAULT_NAMED_PIPE_FULL_ACCESS_GROUP) == 0)`
`166`	`166`	`{`
`167`	`167`	`if (!CreateWellKnownSid(WinWorldSid, NULL, soughtSID, &size_sid))`
`168`	`168`	`{`