It would help if trimdomain.c was actually committed. This is a stopgap

world-unbreaker until Brian Somers commits the one he intended to.

Pointy Hat to: brian

1 files changed, 105 insertions, 0 deletions

diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
new file mode 100644
index 0000000..a3b3439
--- /dev/null
+++ b/lib/libutil/trimdomain.c
@@ -0,0 +1,105 @@
+/*-
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <libutil.h>
+#include <netdb.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <utmp.h>
+#include <stdio.h>
+
+void
+trimdomain(char *fullhost, int hostsize)
+{
+    static char domain[MAXHOSTNAMELEN];
+    static int first = 1;
+    static size_t dlen;
+    char *s, *end;
+    int spn, ok;
+
+    if (first) {
+        first = 0;
+        if (gethostname(domain, sizeof(domain) - 1) == 0 &&
+            (s = strchr(domain, '.')))
+            memmove(domain, s + 1, strlen(s + 1) + 1);
+        else
+            domain[0] = '\0';
+        dlen = strlen(domain);
+    }
+
+    if (domain[0] != '\0') {
+	s = fullhost;
+        end = s + hostsize + 1;
+	for (; (s = memchr(s, '.', end - s)) != NULL; s++)
+            if (!strncasecmp(s + 1, domain, dlen)) {
+                if (s[dlen + 1] == '\0') {
+               	    *s = '\0';    /* Found - lose the domain */
+                    break;
+                } else if (s[dlen + 1] == ':') {	/* $DISPLAY ? */
+                    ok = dlen + 2;
+                    spn = strspn(s + ok, "0123456789");
+                    if (spn > 0 && ok + spn - dlen <= end - s) {
+                        ok += spn;
+                        if (s[ok] == '\0') {
+                            /* host.domain:nn */
+                            memmove(s, s + dlen + 1, ok - dlen);
+                            break;
+                        } else if (s[ok] == '.') {
+                            ok++;
+                            spn = strspn(s + ok, "0123456789");
+                            if (spn > 0 && s[ok + spn] == '\0' &&
+                                ok + spn - dlen <= end - s) {
+                                /* host.domain:nn.nn */
+                                memmove(s, s + dlen + 1, ok + spn - dlen);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+    }
+}