Changeset e54f151 in code

Timestamp:

Mar 5, 2014, 9:48:17 PM (11 years ago)

Author:

Stuart Henderson <stu@…>

Branches:

master

Children:

87dc6ac

Parents:

3dba97d

Message:

chdir(/) immediately after chroot

Files:

• dns.c (modified) (2 diffs)
• icbd.c (modified) (1 diff)
• logger.c (modified) (1 diff)

dns.c

@@ -90 +90 @@
         }
 
+        if (chdir("/") < 0) {
+                syslog(LOG_ERR, "chdir: %m");
+                exit(EX_UNAVAILABLE);
+        }
+
         if (setusercontext(NULL, pw, pw->pw_uid,
             LOGIN_SETALL & ~LOGIN_SETUSER) < 0)
@@ -97 +102 @@
                 syslog(LOG_ERR, "%d: %m", pw->pw_uid);
                 exit(EX_NOPERM);
-        }
-
-        if (chdir("/") < 0) {
-                syslog(LOG_ERR, "chdir: %m");
-                exit(EX_UNAVAILABLE);
         }
 

icbd.c

@@ -450 +450 @@
         }
 
+        if (chdir("/") < 0) {
+                syslog(LOG_ERR, "/: %m");
+                exit(EX_UNAVAILABLE);
+        }
+
         if (setuid(pw->pw_uid) < 0) {
                 syslog(LOG_ERR, "%d: %m", pw->pw_uid);
                 exit(EX_NOPERM);
-        }
-
-        if (chdir("/") < 0) {
-                syslog(LOG_ERR, "/: %m");
-                exit(EX_UNAVAILABLE);
         }
 

logger.c

@@ -106 +106 @@
         }
 
+        if (chdir("/") < 0) {
+                syslog(LOG_ERR, "chdir: %m");
+                exit(EX_UNAVAILABLE);
+        }
+
         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");
-                exit(EX_UNAVAILABLE);
         }