compile problems on various platforms

SCCS-vsn: usr.sbin/sendmail/src/main.c 8.69
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.112
SCCS-vsn: usr.sbin/sendmail/src/map.c 8.34

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 412f5c1..5b665d9 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.111 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.112 (Berkeley) %G%";

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


@@ -2668,7 +2668,7 @@ ni_propval(keydir, keyprop, keyval, valprop, sepchar)
        **      an alternate search property.
        */
 
        **      an alternate search property.
        */
 

-       i = strlen(keydir) + strlen(keyval) + 2)
+       i = strlen(keydir) + strlen(keyval) + 2;

        if (keyprop != NULL)
                i += strlen(keyprop) + 1;
        if (i > sizeof keybuf)
        if (keyprop != NULL)
                i += strlen(keyprop) + 1;
        if (i > sizeof keybuf)

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index f501836..d918d3e 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.68 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.69 (Berkeley) %G%";

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


@@ -242,9 +242,6 @@ main(argc, argv, envp)
 #if defined(ultrix)
 # define OPTIONS       "B:b:C:cd:e:F:f:h:IiM:mnO:o:p:q:r:sTtvX:"
 #endif
 #if defined(ultrix)
 # define OPTIONS       "B:b:C:cd:e:F:f:h:IiM:mnO:o:p:q:r:sTtvX:"
 #endif

-#if defined(NeXT)
-# define OPTIONS       "B:b:C:cd:e:F:f:h:IimnO:o:p:q:r:sTtvX:"
-#endif

 #ifndef OPTIONS
 # define OPTIONS       "B:b:C:cd:e:F:f:h:IimnO:o:p:q:r:sTtvX:"
 #endif
 #ifndef OPTIONS
 # define OPTIONS       "B:b:C:cd:e:F:f:h:IimnO:o:p:q:r:sTtvX:"
 #endif


@@ -596,10 +593,6 @@ main(argc, argv, envp)
                  case 'x':     /* random flag that OSF/1 & AIX mailx passes */
                        break;
 # endif
                  case 'x':     /* random flag that OSF/1 & AIX mailx passes */
                        break;
 # endif

-# if defined(NeXT)
-                 case 'O':     /* random flag that NeXT Mail.app passes */
-                       break;
-# endif

 
                  default:
                        ExitStat = EX_USAGE;
 
                  default:
                        ExitStat = EX_USAGE;

diff --git a/usr/src/usr.sbin/sendmail/src/map.c b/usr/src/usr.sbin/sendmail/src/map.c
index 265fd7f..3449e8a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/map.c
+++ b/usr/src/usr.sbin/sendmail/src/map.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)map.c      8.33 (Berkeley) %G%";
+static char sccsid[] = "@(#)map.c      8.34 (Berkeley) %G%";

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


@@ -1474,8 +1474,8 @@ ni_map_open(map, mode)
        if (map->map_domain == NULL)
                map->map_domain = NETINFO_DEFAULT_PROPERTY;
 
        if (map->map_domain == NULL)
                map->map_domain = NETINFO_DEFAULT_PROPERTY;
 

-       if (map->map_sepchar == '\0' && bitset(MF_ALIAS, map->map_mflags))
-               map->map_sepchar = ',';
+       if (map->map_coldelim == '\0' && bitset(MF_ALIAS, map->map_mflags))
+               map->map_coldelim = ',';

 
        return TRUE;
 }
 
        return TRUE;
 }