Changeset d554223 in code

Timestamp:

Mar 2, 2014, 1:50:57 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

1d2125a

Parents:

2e37e9f

git-author:

Mike Belopuhov <mike@…> (03/02/14 01:47:36)

git-committer:

Mike Belopuhov <mike@…> (03/02/14 01:50:57)

Message:

setusercontext(3) does it's own syslogging

Files:

• dns.c (modified) (1 diff)
• icbd.c (modified) (1 diff)

dns.c

@@ -69 +69 @@
                 exit(EX_NOUSER);
         }
+
         if (setusercontext(NULL, pw, pw->pw_uid,
-            LOGIN_SETALL & ~LOGIN_SETUSER) < 0) {
-                syslog(LOG_ERR, "%s:%m", pw->pw_name);
+            LOGIN_SETALL & ~LOGIN_SETUSER) < 0)
+                exit(EX_NOPERM);
+
+        if (setuid(pw->pw_uid) < 0) {
+                syslog(LOG_ERR, "%d: %m", pw->pw_uid);
                 exit(EX_NOPERM);
         }
-        if (setuid(pw->pw_uid) < 0) {
-                syslog(LOG_ERR, "%d:%m", pw->pw_uid);
-                exit(EX_NOPERM);
-        }
+
         if (chdir("/") < 0) {
                 syslog(LOG_ERR, "chdir: %m");

icbd.c

@@ -396 +396 @@
 
         if (setusercontext(NULL, pw, pw->pw_uid,
-            LOGIN_SETALL & ~LOGIN_SETUSER) < 0) {
-                syslog(LOG_ERR, "%s: %m", pw->pw_name);
+            LOGIN_SETALL & ~LOGIN_SETUSER) < 0)
                 exit(EX_NOPERM);
-        }
 
         if (stat(pw->pw_dir, &sb) == -1) {