debugging patches; minor long class name patches

SCCS-vsn: usr.sbin/sendmail/src/readcf.c 8.113
SCCS-vsn: usr.sbin/sendmail/src/main.c 8.139

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 0b73245..0040a18 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.138 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.139 (Berkeley) %G%";

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


@@ -1699,7 +1699,9 @@ testmodeline(line, e)
                        break;
 
                  case 'C':
                        break;
 
                  case 'C':

-                       setclass(line[2], &line[3]);
+                       mid = macid(&line[2], &delimptr);
+                       if (mid != '\0')
+                               setclass(mid, &line[3]);

                        break;
 
                  case 'S':             /* dump rule set */
                        break;
 
                  case 'S':             /* dump rule set */

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index be6c185..912270b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   8.112 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   8.113 (Berkeley) %G%";

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


@@ -506,6 +506,9 @@ readcf(cfname)
                                p = macvalue('w', e);
                                if (p != NULL && (p = strchr(p, '.')) != NULL)
                                        *p = '\0';
                                p = macvalue('w', e);
                                if (p != NULL && (p = strchr(p, '.')) != NULL)
                                        *p = '\0';

+                               if (tTd(35, 9))
+                                       printf("redefine('w' as %s)\n",
+                                               macvalue('w', e));

                        }
                        if (ConfigLevel >= 6)
                        {
                        }
                        if (ConfigLevel >= 6)
                        {


@@ -2094,7 +2097,7 @@ setclass(class, str)
        register STAB *s;
 
        if (tTd(37, 8))
        register STAB *s;
 
        if (tTd(37, 8))

-               printf("setclass(%c, %s)\n", class, str);
+               printf("setclass(%s, %s)\n", macname(class), str);

        s = stab(str, ST_CLASS, ST_ENTER);
        setbitn(class, s->s_class);
 }
        s = stab(str, ST_CLASS, ST_ENTER);
        setbitn(class, s->s_class);
 }