diff options
Diffstat (limited to 'usr/src/lib/libzonecfg')
| -rw-r--r-- | usr/src/lib/libzonecfg/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/libzonecfg/amd64/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzonecfg/common/libzonecfg.c | 9 | ||||
| -rw-r--r-- | usr/src/lib/libzonecfg/i386/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzonecfg/sparc/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzonecfg/sparcv9/Makefile | 4 |
6 files changed, 13 insertions, 15 deletions
diff --git a/usr/src/lib/libzonecfg/Makefile b/usr/src/lib/libzonecfg/Makefile index 794f477cdc..c7b30a5189 100644 --- a/usr/src/lib/libzonecfg/Makefile +++ b/usr/src/lib/libzonecfg/Makefile @@ -32,7 +32,6 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint # # Definitions for message catalog @@ -54,7 +53,7 @@ $(DTDDIR)/%: % .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(POFILE): pofile_MSGFILES diff --git a/usr/src/lib/libzonecfg/amd64/Makefile b/usr/src/lib/libzonecfg/amd64/Makefile index dd68231e26..010d484a50 100644 --- a/usr/src/lib/libzonecfg/amd64/Makefile +++ b/usr/src/lib/libzonecfg/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzonecfg/common/libzonecfg.c b/usr/src/lib/libzonecfg/common/libzonecfg.c index e709b7dba8..7dc3f9ccb8 100644 --- a/usr/src/lib/libzonecfg/common/libzonecfg.c +++ b/usr/src/lib/libzonecfg/common/libzonecfg.c @@ -6066,9 +6066,16 @@ new_zone_did() int len; int val; struct flock lck; + char pathbuf[PATH_MAX]; char buf[80]; - if ((fd = open(DEBUGID_FILE, O_RDWR | O_CREAT, + if (snprintf(pathbuf, sizeof (pathbuf), "%s%s", zonecfg_get_root(), + DEBUGID_FILE) >= sizeof (pathbuf)) { + printf(gettext("alternate root path is too long")); + return (-1); + } + + if ((fd = open(pathbuf, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0) { perror("new_zone_did open failed"); return (-1); diff --git a/usr/src/lib/libzonecfg/i386/Makefile b/usr/src/lib/libzonecfg/i386/Makefile index 87230ec4fa..e129d9ceb8 100644 --- a/usr/src/lib/libzonecfg/i386/Makefile +++ b/usr/src/lib/libzonecfg/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonecfg/sparc/Makefile b/usr/src/lib/libzonecfg/sparc/Makefile index 87230ec4fa..e129d9ceb8 100644 --- a/usr/src/lib/libzonecfg/sparc/Makefile +++ b/usr/src/lib/libzonecfg/sparc/Makefile @@ -23,9 +23,7 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzonecfg/sparcv9/Makefile b/usr/src/lib/libzonecfg/sparcv9/Makefile index fab7f868b5..9728f9ee8e 100644 --- a/usr/src/lib/libzonecfg/sparcv9/Makefile +++ b/usr/src/lib/libzonecfg/sparcv9/Makefile @@ -23,10 +23,8 @@ # Copyright 2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) |