6835279 multiple races building idmap_prot.h

--HG--
rename : usr/src/head/rpcsvc/idmap_prot.x => usr/src/uts/common/rpcsvc/idmap_prot.x

6 files changed, 10 insertions, 24 deletions

diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index bb724b95db..2010d731ca 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -40,10 +40,6 @@ clobber :=	TARGET = clobber
 LIBSQLITE =	$(ROOT)/usr/lib/libsqlite.o
 SQLITELINT =	$(ROOT)/usr/lib/llib-lsqlite.ln
 
-IDMAP_PROT_DIR =        $(SRC)/head/rpcsvc
-IDMAP_PROT_X =          $(IDMAP_PROT_DIR)/idmap_prot.x
-IDMAP_PROT_H =          $(IDMAP_PROT_DIR)/idmap_prot.h
-
 include ../../Makefile.cmd
 
 POFILE =	$(PROG)_all.po
@@ -51,13 +47,12 @@ POFILE =	$(PROG)_all.po
 ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
 $(ROOTMANIFEST) := FILEMODE= 444
 
-INCS += -I. -I../../../lib/libidmap/common -I$(IDMAP_PROT_DIR)\
+INCS += -I. -I../../../lib/libidmap/common\
 	 -I../../../lib/libsldap/common\
 	 -I../../../lib/libadutils/common
 
 $(OBJS) := CPPFLAGS += $(INCS) -D_REENTRANT
 $(POFILE) := CPPFLAGS += $(INCS)
-CLOBBERFILES += $(IDMAP_PROT_H)
 
 CFLAGS += -v
 LDLIBS += -lsecdb -lsocket -lnsl -lidmap -lscf -lsldap -lldap -luuid -ladutils
@@ -79,10 +74,7 @@ lint := LDLIBS += $(SQLITELINT)
 
 all: $(PROG)
 
-$(IDMAP_PROT_H):	$(IDMAP_PROT_X)
-	$(RM) $@; $(RPCGEN) -CMNh -o $@ $(IDMAP_PROT_X)
-
-$(PROG): $(IDMAP_PROT_H) $(OBJS) $$(MAPFILES)
+$(PROG): $(OBJS) $$(MAPFILES)
 	$(LINK.c) -o $@ $(OBJS) $(LIBSQLITE) $(LDLIBS)
 	$(POST_PROCESS)
 
diff --git a/usr/src/cmd/idmap/idmapd/adutils.h b/usr/src/cmd/idmap/idmapd/adutils.h
index 6b722749ac..a6195bf035 100644
--- a/usr/src/cmd/idmap/idmapd/adutils.h
+++ b/usr/src/cmd/idmap/idmapd/adutils.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -48,7 +48,7 @@ extern "C" {
 #include <time.h>
 #include <thread.h>
 #include <synch.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "libadutils.h"
 #include <sys/idmap.h>
 
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.h b/usr/src/cmd/idmap/idmapd/idmapd.h
index c225c3f47e..404facea9d 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.h
+++ b/usr/src/cmd/idmap/idmapd/idmapd.h
@@ -37,7 +37,7 @@
 #include <sqlite/sqlite.h>
 #include <syslog.h>
 #include <inttypes.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "adutils.h"
 #include "idmap_priv.h"
 #include "idmap_config.h"
diff --git a/usr/src/cmd/idmap/idmapd/nldaputils.h b/usr/src/cmd/idmap/idmapd/nldaputils.h
index bdd17fe2af..7ec05d8f6f 100644
--- a/usr/src/cmd/idmap/idmapd/nldaputils.h
+++ b/usr/src/cmd/idmap/idmapd/nldaputils.h
@@ -34,7 +34,7 @@
 #include <libintl.h>
 #include <strings.h>
 #include <inttypes.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "idmapd.h"
 #include "idmap_config.h"
 
diff --git a/usr/src/cmd/idmap/idmapd/rpc_svc.c b/usr/src/cmd/idmap/idmapd/rpc_svc.c
index cc75053740..44cb9f2471 100644
--- a/usr/src/cmd/idmap/idmapd/rpc_svc.c
+++ b/usr/src/cmd/idmap/idmapd/rpc_svc.c
@@ -19,19 +19,17 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * RPC service routines
  * It was initially generated using rpcgen.
  */
 
 #include "idmapd.h"
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <rpc/xdr.h>
diff --git a/usr/src/cmd/idmap/req.flg b/usr/src/cmd/idmap/req.flg
index 1b5d312e4f..98a8a62122 100644
--- a/usr/src/cmd/idmap/req.flg
+++ b/usr/src/cmd/idmap/req.flg
@@ -19,12 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-echo_file usr/src/head/Makefile
-echo_file usr/src/head/rpcsvc/idmap_prot.x
 echo_file usr/src/lib/libidmap/Makefile