3882 Remove xmod & friends

Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>

11 files changed, 7 insertions, 152 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index 3ad19659c5..f732a03576 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -26,14 +26,10 @@
 SYNCPROG=	syncinit syncloop syncstat
 DHCPPROG=	dhcpconfig dhtadm pntadm
 
-# EXPORT DELETE START
-XMODPROG=	wanbootutil
-# EXPORT DELETE END
-
 PROG=		6to4relay arp gettable if_mpadm \
 		in.comsat in.fingerd in.rarpd in.rexecd in.rlogind \
 		in.rshd in.rwhod in.telnetd in.tftpd ipaddrsel \
-		ndd $(SYNCPROG) $(DHCPPROG) $(XMODPROG)
+		ndd $(SYNCPROG) $(DHCPPROG) wanbootutil
 
 MANIFEST=	rarp.xml telnet.xml comsat.xml finger.xml \
 		login.xml shell.xml rexec.xml socket-filter-kssl.xml
@@ -272,13 +268,3 @@ lint: $(LINTSUBDIRS)
 	    -lsocket -lnsl
 	$(LINT.c) in.tftpd.c ../usr.bin/tftp/tftpsubs.c $(LDLIBS) \
 	    -lsocket -lnsl
-
-# EXPORT DELETE START
-EXPORT_SRC:
-	$(RM) Makefile+
-	sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
-		< Makefile > Makefile+
-	$(RM) Makefile
-	$(MV) Makefile+ Makefile
-	$(CHMOD) 444 Makefile
-# EXPORT DELETE END
diff --git a/usr/src/cmd/crypt/Makefile b/usr/src/cmd/crypt/Makefile
index 2db525cb12..90cdcde4ce 100644
--- a/usr/src/cmd/crypt/Makefile
+++ b/usr/src/cmd/crypt/Makefile
@@ -20,8 +20,6 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -43,17 +41,3 @@ clean:
 lint:	lint_PROG
 
 include ../Makefile.targ
-
-# EXPORT DELETE START
-EXPORT_SRC:
-	$(RM) $(PROG).c+ Makefile+
-	sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \
-		< $(PROG).c > $(PROG).c+
-	$(MV) $(PROG).c+ $(PROG).c
-	sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
-		< Makefile > Makefile+
-	$(RM) Makefile
-	$(MV) Makefile+ Makefile
-	$(CHMOD) 444 Makefile $(PROG).c
-
-# EXPORT DELETE END
diff --git a/usr/src/cmd/crypt/crypt.c b/usr/src/cmd/crypt/crypt.c
index 0edc2eb771..b936d908d1 100644
--- a/usr/src/cmd/crypt/crypt.c
+++ b/usr/src/cmd/crypt/crypt.c
@@ -33,7 +33,6 @@
  *	but considerably trivialized.
  */
 
-/* EXPORT DELETE START */
 #define	ECHO 010
 #include <stdio.h>
 #include <stdlib.h>
@@ -96,12 +95,10 @@ char *pw;
 	for (i = 0; i < ROTORSZ; i++)
 		t2[t1[i]&MASK] = i;
 }
-/* EXPORT DELETE END */
 
 int
 main(int argc, char **argv)
 {
-/* EXPORT DELETE START */
 	extern int optind;
 	char *p1;
 	int i, n1, n2, nchar;
@@ -199,5 +196,4 @@ main(int argc, char **argv)
 		}
 	}
 	return (0);
-/* EXPORT DELETE END */
 }
diff --git a/usr/src/cmd/gss/gssd/Makefile b/usr/src/cmd/gss/gssd/Makefile
index 16bac17941..11d1a23494 100644
--- a/usr/src/cmd/gss/gssd/Makefile
+++ b/usr/src/cmd/gss/gssd/Makefile
@@ -148,30 +148,6 @@ check:	$(CHKMANIFEST)
 
 include ../../Makefile.targ
 
-# EXPORT DELETE START
-# Special targets to clean up the source tree for export distribution
-# The WS target modifies the SCCS files as well, so a working workspace
-# can be shipped.
-# Warning: These targets change the source tree, the first only at the
-#		plain source level, but the second changes the guts!
-EXPORT_SRC:
-	$(RM) Makefile+ gssd_clnt_stubs.c+ gssd_proc.c+ gssdtest.c+
-	sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
-		< Makefile > Makefile+
-	$(MV) Makefile+ Makefile
-	sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \
-		< gssd_clnt_stubs.c > gssd_clnt_stubs.c+
-	$(MV) gssd_clnt_stubs.c+ gssd_clnt_stubs.c
-	sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \
-		< gssd_proc.c > gssd_proc.c+
-	$(MV) gssd_proc.c+ gssd_proc.c
-	sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \
-		< gssdtest.c > gssdtest.c+
-	$(MV) gssdtest.c+ gssdtest.c
-	$(CHMOD) 444  Makefile gssd_clnt_stubs.c gssd_proc.c gssdtest.c
-
-# EXPORT DELETE END
-
 $(POFILE): $(DERIVED_FILES) .WAIT $(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
diff --git a/usr/src/cmd/gss/gssd/gssd_clnt_stubs.c b/usr/src/cmd/gss/gssd/gssd_clnt_stubs.c
index 86b77fd9ff..8be41c666d 100644
--- a/usr/src/cmd/gss/gssd/gssd_clnt_stubs.c
+++ b/usr/src/cmd/gss/gssd/gssd_clnt_stubs.c
@@ -1434,8 +1434,6 @@ kgss_verify(OM_uint32 *minor_status,
 }
 
 
-/* EXPORT DELETE START */
-
 OM_uint32
 kgss_seal_wrapped(
 	minor_status,
@@ -1658,8 +1656,6 @@ kgss_unseal(OM_uint32 *minor_status,
 		    conf_state, qop_state));
 }
 
-/* EXPORT DELETE END */
-
 OM_uint32
 kgss_display_status(minor_status,
 		status_value,
diff --git a/usr/src/cmd/gss/gssd/gssd_proc.c b/usr/src/cmd/gss/gssd/gssd_proc.c
index a393247f32..7a7ee951c2 100644
--- a/usr/src/cmd/gss/gssd/gssd_proc.c
+++ b/usr/src/cmd/gss/gssd/gssd_proc.c
@@ -1906,8 +1906,6 @@ struct svc_req *rqstp;
 	return (TRUE);
 }
 
-/* EXPORT DELETE START */
-
 bool_t
 gss_seal_1_svc(argp, res, rqstp)
 gss_seal_arg *argp;
@@ -2072,8 +2070,6 @@ struct svc_req *rqstp;
 	return (TRUE);
 }
 
-/* EXPORT DELETE END */
-
 bool_t
 gss_display_status_1_svc(argp, res, rqstp)
 gss_display_status_arg *argp;
diff --git a/usr/src/cmd/gss/gssd/gssdtest.c b/usr/src/cmd/gss/gssd/gssdtest.c
index 95959cf033..d4f68fca14 100644
--- a/usr/src/cmd/gss/gssd/gssdtest.c
+++ b/usr/src/cmd/gss/gssd/gssdtest.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Test client for gssd.  This program is not shipped on the binary
  * release.
@@ -104,10 +102,8 @@ static void _gss_process_context_token(int, char **);
 static void _gss_delete_sec_context(int, char **);
 static void _gss_context_time(int, char **);
 static void _gss_verify(int, char **);
-/* EXPORT DELETE START */
 static void _gss_seal(int, char **);
 static void _gss_unseal(int, char **);
-/* EXPORT DELETE END */
 static void _gss_display_status(int, char **);
 static void _gss_indicate_mechs(int, char **);
 static void _gss_inquire_cred(int, char **);
@@ -220,7 +216,7 @@ do_gssdtest(char *buf)
 			_gss_init_sec_context(argc, argv);
 			_gss_accept_sec_context(0, argv);
 			_gss_init_sec_context(argc, argv);
-/* EXPORT DELETE START */
+
 			seal_argc = 2;
 			_gss_seal(seal_argc, seal_ini_array);
 			seal_argc = 1;
@@ -229,7 +225,6 @@ do_gssdtest(char *buf)
 			_gss_seal(seal_argc, seal_acc_array);
 			seal_argc = 1;
 			_gss_unseal(seal_argc, unseal_ini_array);
-/* EXPORT DELETE END */
 			seal_argc = 2;
 			_gss_sign(seal_argc, seal_ini_array);
 			seal_argc = 1;
@@ -248,7 +243,7 @@ do_gssdtest(char *buf)
 		_gss_init_sec_context(argc, argv);
 		_gss_accept_sec_context(0, argv);
 		_gss_init_sec_context(argc, argv);
-/* EXPORT DELETE START */
+
 		seal_argc = 2;
 		_gss_seal(seal_argc, seal_acc_array);
 		seal_argc = 1;
@@ -257,7 +252,6 @@ do_gssdtest(char *buf)
 		_gss_seal(seal_argc, seal_ini_array);
 		seal_argc = 1;
 		_gss_unseal(seal_argc, unseal_acc_array);
-/* EXPORT DELETE END */
 		seal_argc = 2;
 		_gss_sign(seal_argc, seal_ini_array);
 		seal_argc = 1;
@@ -299,14 +293,12 @@ do_gssdtest(char *buf)
 	else if (strcmp(cmd, "gss_verify") == 0 ||
 		strcmp(cmd, "verify") == 0)
 		_gss_verify(argc, argv);
-/* EXPORT DELETE START */
 	else if (strcmp(cmd, "gss_seal") == 0 ||
 		strcmp(cmd, "seal") == 0)
 		_gss_seal(argc, argv);
 	else if (strcmp(cmd, "gss_unseal") == 0 ||
 		strcmp(cmd, "unseal") == 0)
 		_gss_unseal(argc, argv);
-/* EXPORT DELETE END */
 	else if (strcmp(cmd, "gss_display_status") == 0||
 		strcmp(cmd, "status") == 0)
 		_gss_display_status(argc, argv);
@@ -1520,7 +1512,6 @@ char **argv;
 	}
 }
 
-/* EXPORT DELETE START */
 static void
 _gss_seal(argc, argv)
 int argc;
@@ -1688,7 +1679,6 @@ char **argv;
 
 	gss_release_buffer(&minor_status, &message_buffer);
 }
-/* EXPORT DELETE END */
 
 static void
 _gss_display_status(argc, argv)
diff --git a/usr/src/cmd/krb5/kadmin/Makefile b/usr/src/cmd/krb5/kadmin/Makefile
index 22a8259cc5..de893f05a4 100644
--- a/usr/src/cmd/krb5/kadmin/Makefile
+++ b/usr/src/cmd/krb5/kadmin/Makefile
@@ -25,10 +25,7 @@
 
 include ../../Makefile.cmd
 
-SUBDIRS= cli dbutil ktutil kpasswd server kclient kdcmgr
-# EXPORT DELETE START
-SUBDIRS += gui
-# EXPORT DELETE END
+SUBDIRS= cli dbutil ktutil kpasswd server kclient kdcmgr gui
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -56,13 +53,3 @@ $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
-
-# EXPORT DELETE START
-EXPORT_SRC:
-	$(RM) -r gui
-	$(RM) Makefile+
-	$(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
-                < Makefile > Makefile+
-	$(MV) Makefile+ Makefile
-	$(CHMOD) 444 Makefile
-# EXPORT DELETE END
diff --git a/usr/src/cmd/login/Makefile b/usr/src/cmd/login/Makefile
index d4962f4fd1..450bd6d926 100644
--- a/usr/src/cmd/login/Makefile
+++ b/usr/src/cmd/login/Makefile
@@ -26,7 +26,6 @@
 PROG= login
 OBJS= login.o login_audit.o
 SRCS= $(OBJS:%.o=%.c)
-ONC_SRCS=$(SRCS:%.c=%.c_onc_plus)
 
 DEFAULTFILES= login.dfl
 
@@ -39,7 +38,7 @@ ROOTLOGINDEVPERM= $(LOGINDEVPERM:%=$(ROOTETC)/%)
 $(ROOTLOGINDEVPERM) := FILEMODE = 644
 FILEMODE= 4555
 
-CLOBBERFILES +=	$(LOGINDEVPERM) $(ONC_SRCS)
+CLOBBERFILES +=	$(LOGINDEVPERM)
 
 CPPFLAGS +=	-DSYSV -DCONSOLE='"/dev/console"' -DSECURITY \
 		-D_FILE_OFFSET_BITS=64 -I$(SRC)/lib/pam_modules/krb5
@@ -68,8 +67,3 @@ clean:
 lint:	lint_SRCS
 
 include ../Makefile.targ
-
-# make ONC_PLUS using suffix rule
-#
-
-ONC_PLUS: $(ONC_SRCS)
diff --git a/usr/src/cmd/login/login.c b/usr/src/cmd/login/login.c
index 758e60bcb3..50fa5c05b9 100644
--- a/usr/src/cmd/login/login.c
+++ b/usr/src/cmd/login/login.c
@@ -24,7 +24,6 @@
  * Use is subject to license terms.
  */
 
-/* ONC_PLUS EXTRACT START */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
@@ -41,8 +40,6 @@
 /*	Copyright (c) 1987, 1988 Microsoft Corporation	*/
 /*	  All Rights Reserved	*/
 
-/* ONC_PLUS EXTRACT END */
-
 /*
  * For a complete reference to login(1), see the manual page.  However,
  * login has accreted some intentionally undocumented options, which are
@@ -166,12 +163,10 @@ static int	retry = MAXTRYS;
 #define	PROG_NAME	"login"
 #define	HUSHLOGIN	".hushlogin"
 
-/* ONC_PLUS EXTRACT START */
 /*
  * Array and Buffer sizes
  */
 #define	PBUFSIZE 8	/* max significant characters in a password */
-/* ONC_PLUS EXTRACT END */
 #define	MAXARGS 63	/* change value below if changing this */
 #define	MAXARGSWIDTH 2	/* log10(MAXARGS) */
 #define	MAXENV 1024
@@ -202,9 +197,7 @@ static int	audit_error = 0;
 /*
  * Externs a plenty
  */
-/* ONC_PLUS EXTRACT START */
 extern	int	getsecretkey();
-/* ONC_PLUS EXTRACT START */
 
 /*
  * The current user name
@@ -264,7 +257,6 @@ static	char	loginmsg[] = "login: ";
 static	char	passwdmsg[] = "Password:";
 static	char	incorrectmsg[] = "Login incorrect\n";
 
-/* ONC_PLUS EXTRACT START */
 /*
  * Password file support
  */
@@ -276,7 +268,6 @@ static	char	zone_name[ZONENAME_MAX];
  * Illegal passwd entries.
  */
 static	struct	passwd nouser = { "", "no:password", (uid_t)-1 };
-/* ONC_PLUS EXTRACT END */
 
 /*
  * Log file support
@@ -343,7 +334,6 @@ static  boolean_t zflag = B_FALSE;
 static	char	rusername[NMAX+1], lusername[NMAX+1];
 static	char	terminal[MAXPATHLEN];
 
-/* ONC_PLUS EXTRACT START */
 /*
  * Pre-authentication flag support
  */
@@ -356,7 +346,6 @@ static int login_conv(int, struct pam_message **,
 
 static struct pam_conv pam_conv = {login_conv, NULL};
 static pam_handle_t *pamh;	/* Authentication handle */
-/* ONC_PLUS EXTRACT END */
 
 /*
  * Function declarations
@@ -365,10 +354,8 @@ static	void	turn_on_logging(void);
 static	void	defaults(void);
 static	void	usage(void);
 static	void	process_rlogin(void);
-/* ONC_PLUS EXTRACT START */
 static	void	login_authenticate();
 static	void	setup_credentials(void);
-/* ONC_PLUS EXTRACT END */
 static	void	adjust_nice(void);
 static	void	update_utmpx_entry(int);
 static	void	establish_user_environment(char **);
@@ -392,7 +379,6 @@ static	int	logins_disabled(char *);
 static	void	log_bad_attempts(void);
 static	int	is_number(char *);
 
-/* ONC_PLUS EXTRACT START */
 /*
  *			*** main ***
  *
@@ -407,7 +393,6 @@ static	int	is_number(char *);
 int
 main(int argc, char *argv[], char **renvp)
 {
-/* ONC_PLUS EXTRACT END */
 	int sublogin;
 	int pam_rc;
 
@@ -469,7 +454,6 @@ main(int argc, char *argv[], char **renvp)
 			ttyn = "/dev/???";
 	}
 
-/* ONC_PLUS EXTRACT START */
 	/*
 	 * Call pam_start to initiate a PAM authentication operation
 	 */
@@ -508,7 +492,6 @@ main(int argc, char *argv[], char **renvp)
 		(void) pam_set_item(pamh, PAM_REPOSITORY,
 		    (void *)&pam_rep_data);
 	}
-/* ONC_PLUS EXTRACT END */
 
 	/*
 	 * Open the log file which contains a record of successful and failed
@@ -527,13 +510,11 @@ main(int argc, char *argv[], char **renvp)
 	if (rflag)
 		process_rlogin();
 
-/* ONC_PLUS EXTRACT START */
 	/*
 	 * validate user
 	 */
 	/* we are already authenticated. fill in what we must, then continue */
 	if (fflag) {
-/* ONC_PLUS EXTRACT END */
 		if ((pwd = getpwnam(user_name)) == NULL) {
 			audit_error = ADT_FAIL_VALUE_USERNAME;
 
@@ -542,14 +523,12 @@ main(int argc, char *argv[], char **renvp)
 			    user_name);
 			login_exit(1);
 		}
-/* ONC_PLUS EXTRACT START */
 	} else {
 		/*
 		 * Perform the primary login authentication activity.
 		 */
 		login_authenticate();
 	}
-/* ONC_PLUS EXTRACT END */
 
 	/* change root login, then we exec another login and try again */
 	if (process_chroot_logins() != OK)
@@ -602,7 +581,6 @@ main(int argc, char *argv[], char **renvp)
 
 	adjust_nice();		/* passwd file can specify nice value */
 
-/* ONC_PLUS EXTRACT START */
 	setup_credentials();	/* Set user credentials  - exits on failure */
 
 	/*
@@ -628,7 +606,6 @@ main(int argc, char *argv[], char **renvp)
 
 	(void) pam_end(pamh, PAM_SUCCESS);	/* Done using PAM */
 	pamh = NULL;
-/* ONC_PLUS EXTRACT END */
 
 	if (pwd->pw_uid == 0) {
 		if (dosyslog) {
@@ -682,7 +659,6 @@ main(int argc, char *argv[], char **renvp)
 
 
 
-/* ONC_PLUS EXTRACT START */
 /*
  * donothing & catch	- Signal catching functions
  */
@@ -694,7 +670,6 @@ donothing(int sig)
 	if (pamh)
 		(void) pam_end(pamh, PAM_ABORT);
 }
-/* ONC_PLUS EXTRACT END */
 
 #ifdef notdef
 static	int	intrupt;
@@ -815,7 +790,6 @@ turn_on_logging(void)
 }
 
 
-/* ONC_PLUS EXTRACT START */
 /*
  * login_conv():
  *	This is the conv (conversation) function called from
@@ -981,7 +955,6 @@ verify_passwd(void)
 
 	return (error);
 }
-/* ONC_PLUS EXTRACT END */
 
 /*
  * quotec		- Called by getargs
@@ -1788,7 +1761,6 @@ chdir_to_dir_user(void)
 }
 
 
-/* ONC_PLUS EXTRACT START */
 /*
  * login_authenticate	- Performs the main authentication work
  *			  1. Prints the login prompt
@@ -1967,7 +1939,6 @@ setup_credentials(void)
 	 */
 	audit_success(get_audit_id(), pwd, zone_name);
 }
-/* ONC_PLUS EXTRACT END */
 
 static uint_t
 get_audit_id(void)
@@ -2027,7 +1998,6 @@ adjust_nice(void)
 	}
 }
 
-/* ONC_PLUS EXTRACT START */
 /*
  * update_utmpx_entry	- Searchs for the correct utmpx entry, making an
  *			  entry there if it finds one, otherwise exits.
@@ -2064,7 +2034,6 @@ update_utmpx_entry(int sublogin)
 		audit_error = ADT_FAIL_PAM + err;
 		login_exit(1);
 	}
-/* ONC_PLUS EXTRACT END */
 
 	(void) memset((void *)&utmpx, 0, sizeof (utmpx));
 	(void) time(&utmpx.ut_tv.tv_sec);
@@ -2132,7 +2101,6 @@ update_utmpx_entry(int sublogin)
 		/* the wtmp file exists.				   */
 		updwtmpx(WTMPX_FILE, &utmpx);
 	}
-/* ONC_PLUS EXTRACT START */
 }
 
 
@@ -2166,7 +2134,6 @@ process_chroot_logins(void)
 		 * Set the environment flag <!sublogin> so that the next login
 		 * knows that it is a sublogin.
 		 */
-/* ONC_PLUS EXTRACT END */
 		envinit[0] = SUBLOGIN;
 		envinit[1] = (char *)NULL;
 		(void) printf("Subsystem root: %s\n", pwd->pw_dir);
@@ -2180,7 +2147,6 @@ process_chroot_logins(void)
 		login_exit(1);
 	}
 	return (OK);
-/* ONC_PLUS EXTRACT START */
 }
 
 /*
@@ -2228,7 +2194,6 @@ establish_user_environment(char **renvp)
 		}
 	}
 	(void) memcpy(&envinit[basicenv], newenv, sizeof (newenv));
-/* ONC_PLUS EXTRACT END */
 
 	/* Set up environment */
 	if (rflag) {
diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile
index e171e139d3..92223ef71a 100644
--- a/usr/src/cmd/sendmail/src/Makefile
+++ b/usr/src/cmd/sendmail/src/Makefile
@@ -44,19 +44,13 @@ SRCS=	$(OBJS:%.o=%.c)
 MAPFILES =	$(MAPFILE.INT) $(MAPFILE.NGB)
 LDFLAGS +=	$(MAPFILES:%=-M%)
 
-# EXPORT DELETE START
-CRYPTOLIBS=	-lssl -lcrypto -lsasl
-# EXPORT DELETE END
 LDLIBS += 	../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \
 		-lnsl ../db/libdb.a -lldap -lsldap -lwrap -lumem \
-		$(CRYPTOLIBS)
+		-lssl -lcrypto -lsasl
 
 INCPATH=	-I. -I../include -I../db
 
-# EXPORT DELETE START
-CRYPTOENVDEF=	-DSTARTTLS -DSASL=20115
-# EXPORT DELETE END
-ENVDEF=		-DNETINET6 -DTCPWRAPPERS $(CRYPTOENVDEF)
+ENVDEF=		-DNETINET6 -DTCPWRAPPERS -DSTARTTLS -DSASL=20115
 SUNENVDEF=	-DSUN_EXTENSIONS -DVENDOR_DEFAULT=VENDOR_SUN \
 		-DSUN_INIT_DOMAIN -DSUN_SIMPLIFIED_LDAP -D_FFR_LOCAL_DAEMON \
 		-D_FFR_MAIL_MACRO
@@ -90,13 +84,4 @@ clean:
 
 lint:	lint_SRCS
 
-# EXPORT DELETE START
-EXPORT_SRC:
-	$(RM) Makefile+
-	$(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
-	    < Makefile > Makefile+
-	$(MV) Makefile+ Makefile
-	$(CHMOD) 444 Makefile
-# EXPORT DELETE END
-
 include		../../Makefile.targ