Changeset 164352e for unix.c

Timestamp:

2011-12-24T18:02:39Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• unix.c (modified) (2 diffs)

unix.c

@@ -41 +41 @@
 #include <pwd.h>
 #include <locale.h>
+#include <grp.h>
 
 #if defined(OTR_BI) || defined(OTR_PI)
@@ -152 +153 @@
                 if( pw )
                 {
+                        initgroups( global.conf->user, pw->pw_gid );
                         setgid( pw->pw_gid );
                         setuid( pw->pw_uid );
+                }
+                else
+                {
+                        log_message( LOGLVL_WARNING, "Failed to look up user %s.", global.conf->user );
                 }
         }