Changeset 4a74b5b in code for icbd.c

Timestamp:

Apr 17, 2025, 11:33:16 PM (7 weeks ago)

Author:

Izuru Yakumo <eternal-servant@…>

Branches:

master

Parents:

2be3612

Message:

Nitori Engineering

File:

• icbd.c (modified) (7 diffs)

icbd.c

@@ -2 +2 @@
  * Copyright (c) 2009 Mike Belopuhov
  * Copyright (c) 2007 Oleg Safiullin
+ * Copyright (c) 2024 Nishi
+ * Copyright (C) 2025 Izuru Yakumo
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -175 +177 @@
                 hints.ai_socktype = SOCK_STREAM;
                 hints.ai_flags = AI_PASSIVE;
+#ifdef __OpenBSD__
+                /* Apparently OpenBSD is the only one that has icb on /etc/services */
+                /* Sure, it could be easily added to any other system, but I'm personally against it */
+                /* ~Izuru Yakumo */
                 if ((error = getaddrinfo(addr, port ? port : "icb", &hints,
                     &res0)) != 0) {
@@ -180 +186 @@
                         return (EX_UNAVAILABLE);
                 }
-
+#else
+                if ((error = getaddrinfo(addr, port ? port : "7326", &hints, &res0)) != 0) {
+                        syslog(LOG_ERR, "%s", gai_strerror(error));
+                        return (EX_UNAVAILABLE);
+                }
+#endif
                 for (res = res0; res != NULL; res = res->ai_next) {
                         if ((s = socket(res->ai_family, res->ai_socktype,
@@ -476 +487 @@
                 exit(EX_NOPERM);
         }
-
+#ifdef __OpenBSD__
         if (sb.st_uid != 0 || (sb.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
                 syslog(LOG_ERR, "bad directory permissions");
                 exit(EX_NOPERM);
         }
-
         if (chroot(pw->pw_dir) < 0) {
                 syslog(LOG_ERR, "%s: %m", pw->pw_dir);
@@ -493 +503 @@
 
         chdir(ICBD_HOME);
-
+#endif
         if (setuid(pw->pw_uid) < 0) {
                 syslog(LOG_ERR, "%d: %m", pw->pw_uid);
@@ -499 +509 @@
         }
 
+#ifdef __OpenBSD__
         if (dodns) {
                 if (pledge("stdio inet rpath dns", NULL) == -1) {
@@ -510 +521 @@
                 }
         }
+#endif
 
         (void)setproctitle("icbd");