print OS compile flags (sigh)

SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.189
SCCS-vsn: usr.sbin/sendmail/src/main.c 8.122

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 0a42c0e..47fd5af 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.188 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.189 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -3634,3 +3634,52 @@ char     *CompileOptions[] =
 #endif
        NULL
 };
 #endif
        NULL
 };

+
+
+/*
+**  OS compile options.
+*/
+
+char   *OsCompileOptions[] =
+{
+#if HASFLOCK
+       "HASFLOCK",
+#endif
+#if HASGETUSERSHELL
+       "HASGETUSERSHELL",
+#endif
+#if HASINITGROUPS
+       "HASINITGROUPS",
+#endif
+#if HASLSTAT
+       "HASLSTAT",
+#endif
+#if HASSETREUID
+       "HASSETREUID",
+#endif
+#if HASSETSID
+       "HASSETSID",
+#endif
+#if HASSETVBUF
+       "HASSETVBUF",
+#endif
+#if HASUNAME
+       "HASUNAME",
+#endif
+#if IDENTPROTO
+       "IDENTPROTO",
+#endif
+#if IP_SRCROUTE
+       "IP_SRCROUTE",
+#endif
+#if SYS5SETPGRP
+       "SYS5SETPGRP",
+#endif
+#if SYSTEM5
+       "SYSTEM5",
+#endif
+#if USESETEUID
+       "USESETEUID",
+#endif
+       NULL
+};

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 19a01ba..385efbb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     8.121 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.122 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 #endif /* not lint */
 
 #define        _DEFINE


@@ -286,6 +286,37 @@ main(argc, argv, envp)
                }
                putchar('\n');
        }
                }
                putchar('\n');
        }

+       if (tTd(0, 10))
+       {
+               int ll;
+               extern char *OsCompileOptions[];
+
+               printf("OS Defines:\t", Version);
+               av = OsCompileOptions;
+               ll = 7;
+               while (*av != NULL)
+               {
+                       if (ll + strlen(*av) > 63)
+                       {
+                               putchar('\n');
+                               ll = 0;
+                       }
+                       if (ll == 0)
+                       {
+                               putchar('\t');
+                               putchar('\t');
+                       }
+                       putchar(' ');
+                       printf("%s", *av);
+                       ll += strlen(*av++) + 1;
+               }
+               putchar('\n');
+#ifdef _PATH_UNIX
+               printf("Unix path:\t  %s\n", _PATH_UNIX);
+#endif
+               printf("Config file:\t  %s\n", getcfname());
+               printf("Proc Id file:\t  %s\n", PidFile);
+       }

 
        InChannel = stdin;
        OutChannel = stdout;
 
        InChannel = stdin;
        OutChannel = stdout;


@@ -1000,7 +1031,7 @@ main(argc, argv, envp)
        {
                char dtype[200];
 
        {
                char dtype[200];
 

-               if (!tTd(0, 1))
+               if (!tTd(52, 100))

                {
                        /* put us in background */
                        i = fork();
                {
                        /* put us in background */
                        i = fork();


@@ -1328,7 +1359,7 @@ disconnect(droplev, e)
        if (tTd(52, 1))
                printf("disconnect: In %d Out %d, e=%x\n",
                        fileno(InChannel), fileno(OutChannel), e);
        if (tTd(52, 1))
                printf("disconnect: In %d Out %d, e=%x\n",
                        fileno(InChannel), fileno(OutChannel), e);

-       if (tTd(52, 5))
+       if (tTd(52, 100))

        {
                printf("don't\n");
                return;
        {
                printf("don't\n");
                return;