From: SanjayKumar J <vjsanjay@gmail.com>

Consistent Error checking  for group_admin_perm

Signed-off-by: SanjayKumar J <vjsanjay@gmail.com>
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
[Balbir - change prefix in Makefile to /usr, so that make install does sensible
things]

git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@226 4f4bb910-9a46-0410-90c8-c897d4f1cd53

diff --git a/Makefile b/Makefile
index 1721cc917c4a7a1d162ff65cb7676ca0ce000c7d..ffc6fdcbfc6e6f91204c75acd2e4b087a8f91b7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ bindir=${exec_prefix}/bin
 sbindir=${exec_prefix}/sbin
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
-prefix=/usr/local
+prefix=/usr/
 exec_prefix=${prefix}
 INSTALL=install
 INSTALL_DATA=install -m 644

diff --git a/config.c b/config.c
index 6897442514680ca353dcdd0cfb48e231b109d730..154ebadf5bf0b726a2766c82f33804defb2720c6 100644 (file)
--- a/config.c
+++ b/config.c
@@ -237,7 +237,7 @@ int cgroup_config_group_admin_perm(char *perm_type, char *value)
 
                        error = getpwnam_r(value, pw, buffer, CGROUP_BUFFER_LEN,
                                                                &pw_buffer);
-                       if (error) {
+                       if (pw_buffer == NULL) {
                                free(pw);
                                goto admin_error;
                        }
@@ -258,7 +258,7 @@ int cgroup_config_group_admin_perm(char *perm_type, char *value)
                        error = getgrnam_r(value, group, buffer,
                                        CGROUP_BUFFER_LEN, &group_buffer);
 
-                       if (error) {
+                       if (group_buffer == NULL) {
                                free(group);
                                goto admin_error;
                        }