Module: xenomai-3
Branch: next
Commit: ff1e3666c8079b67d9676f0caf14d8563e44de55
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=ff1e3666c8079b67d9676f0caf14d8563e44de55
Author: Philippe Gerum <r...@xenomai.org>
Date: Tue Mar 24 10:08:05 2015 +0100
copperplate/registry: move anon sessions under the user tree
---
lib/copperplate/init.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/lib/copperplate/init.c b/lib/copperplate/init.c
index b5b7a36..f6e06d3 100644
--- a/lib/copperplate/init.c
+++ b/lib/copperplate/init.c
@@ -513,28 +513,24 @@ static int get_session_root(int *regflags_r)
struct passwd *pw;
int ret;
+ pw = getpwuid(geteuid());
+ if (pw == NULL)
+ return -errno;
+
if (__node_info.session_label == NULL) {
ret = asprintf(&session, "anon@%d", __node_id);
if (ret < 0)
return -ENOMEM;
__node_info.session_label = session;
- ret = asprintf(&sessdir, "%s/%s",
- __node_info.registry_root, session);
- if (ret < 0)
- return -ENOMEM;
*regflags_r |= REGISTRY_ANON;
- } else {
- pw = getpwuid(geteuid());
- if (pw == NULL)
- return -errno;
-
- ret = asprintf(&sessdir, "%s/%s/%s",
- __node_info.registry_root,
- pw->pw_name, __node_info.session_label);
- if (ret < 0)
- return -ENOMEM;
}
+ ret = asprintf(&sessdir, "%s/%s/%s",
+ __node_info.registry_root,
+ pw->pw_name, __node_info.session_label);
+ if (ret < 0)
+ return -ENOMEM;
+
__node_info.session_root = sessdir;
return 0;
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
