packages/dbus-broker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix enable-dbus-broker-to-reexecute.patch

Browse Source 
(cherry picked from commit 91e0ecf55f40b40a7e70eefaada2ee03290bc053)
This commit is contained in:
h30032433 2024-05-24 16:41:01 +08:00 committed by openeuler-sync-bot
parent c7cd3001b9
commit b4c33f4909
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbus-broker.spec
View File

@ -1,6 +1,6 @@
Name: dbus-broker Name: dbus-broker
Version: 35 Version: 35
Release: 1 Release: 2
Summary: Linux D-Bus Message Broker Summary: Linux D-Bus Message Broker
License: Apache-2.0 License: Apache-2.0
URL: https://github.com/bus1/dbus-broker URL: https://github.com/bus1/dbus-broker
@ -88,6 +88,9 @@ fi
%{_userunitdir}/dbus-broker.service %{_userunitdir}/dbus-broker.service
%changelog %changelog
* Fri May 24 2024 huyubiao<huyubiao@huawei.com> - 35-2
- fix enable-dbus-broker-to-reexecute.patch
* Tue Feb 27 2024 hongjinghao<hongjinghao@huawei.com> - 35-1 * Tue Feb 27 2024 hongjinghao<hongjinghao@huawei.com> - 35-1
- upgrade to 35 - upgrade to 35

4
enable-dbus-broker-to-reexecute.patch
View File

@ -1917,7 +1917,7 @@ index 0000000..c027999
+ r = log_commitf(&broker->log, "NameOwner string %s is invalid, skipping.\n", + r = log_commitf(&broker->log, "NameOwner string %s is invalid, skipping.\n",
+ nameowner_ship_str); + nameowner_ship_str);
+ if (r < 0) + if (r < 0)
+ return error_fold(r); + return error_fold(r);
+ close(peeri->connection.socket.fd); + close(peeri->connection.socket.fd);
+ continue; + continue;
+ } + }
@ -1932,7 +1932,6 @@ index 0000000..c027999
+ if (arg0 && !strncmp(arg0 + strlen("arg0"), "=':1", strlen("=':1"))) { + if (arg0 && !strncmp(arg0 + strlen("arg0"), "=':1", strlen("=':1"))) {
+ continue; + continue;
+ } + }
+ rule_str_list_cur = stpcpy(rule_str_list_cur, rule_str);
+ left_length -= strlen(rule_str); + left_length -= strlen(rule_str);
+ /* Besides the next rule_str, we should also keep MATCH_RULE_LENGTH_MAX + /* Besides the next rule_str, we should also keep MATCH_RULE_LENGTH_MAX
+ * bytes for sasl_str. sasl_str usually doesn't need that much space, + * bytes for sasl_str. sasl_str usually doesn't need that much space,
@ -1941,6 +1940,7 @@ index 0000000..c027999
+ skip_this_peer = true; + skip_this_peer = true;
+ break; + break;
+ } + }
+ rule_str_list_cur = stpcpy(rule_str_list_cur, rule_str);
+ } + }
+ +
+ if (skip_this_peer) { + if (skip_this_peer) {